fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The Great Renamening of 2020

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-22 12:14:54 +02:00
parent abe3334488
commit b4471b1abb
441 changed files with 3395 additions and 3468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java → src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java
+2 -2
View File
@@ -39,7 +39,7 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.AEColor;
import appeng.util.item.AEItemStack;
public class TileCraftingMonitorTile extends TileCraftingTile implements IColorableTile {
public class CraftingMonitorTileEntity extends CraftingTileEntity implements IColorableTile {
@OnlyIn(Dist.CLIENT)
private Integer dspList;
@@ -50,7 +50,7 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora
private IAEItemStack dspPlay;
private AEColor paintedColor = AEColor.TRANSPARENT;
public TileCraftingMonitorTile(TileEntityType<?> tileEntityTypeIn) {
public CraftingMonitorTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java → src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java
+3 -3
View File
@@ -27,17 +27,17 @@ import appeng.api.AEApi;
import appeng.api.definitions.IBlocks;
import appeng.block.crafting.AbstractCraftingUnitBlock;
public class TileCraftingStorageTile extends TileCraftingTile {
public class CraftingStorageTileEntity extends CraftingTileEntity {
private static final int KILO_SCALAR = 1024;
public TileCraftingStorageTile(TileEntityType<?> tileEntityTypeIn) {
public CraftingStorageTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@Override
protected ItemStack getItemFromTile(final Object obj) {
final IBlocks blocks = AEApi.instance().definitions().blocks();
final int storage = ((TileCraftingTile) obj).getStorageBytes() / KILO_SCALAR;
final int storage = ((CraftingTileEntity) obj).getStorageBytes() / KILO_SCALAR;
Optional<ItemStack> is;
src/main/java/appeng/tile/crafting/TileCraftingTile.java → src/main/java/appeng/tile/crafting/CraftingTileEntity.java
+4 -4
View File
@@ -58,17 +58,17 @@ import appeng.me.cluster.implementations.CraftingCPUCalculator;
import appeng.me.cluster.implementations.CraftingCPUCluster;
import appeng.me.helpers.AENetworkProxy;
import appeng.me.helpers.AENetworkProxyMultiblock;
import appeng.tile.grid.AENetworkTile;
import appeng.tile.grid.AENetworkTileEntity;
import appeng.util.Platform;
public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IPowerChannelState {
public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiBlock, IPowerChannelState {
private final CraftingCPUCalculator calc = new CraftingCPUCalculator(this);
private CompoundNBT previousState = null;
private boolean isCoreBlock = false;
private CraftingCPUCluster cluster;
public TileCraftingTile(TileEntityType<?> tileEntityTypeIn) {
public CraftingTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setFlags(GridFlags.MULTIBLOCK, GridFlags.REQUIRE_CHANNEL);
this.getProxy().setValidSides(EnumSet.noneOf(Direction.class));
@@ -83,7 +83,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
protected ItemStack getItemFromTile(final Object obj) {
Optional<ItemStack> is;
if (((TileCraftingTile) obj).isAccelerator()) {
if (((CraftingTileEntity) obj).isAccelerator()) {
is = AEApi.instance().definitions().blocks().craftingAccelerator().maybeStack(1);
} else {
is = AEApi.instance().definitions().blocks().craftingUnit().maybeStack(1);
src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java
+5 -5
View File
@@ -53,7 +53,7 @@ import appeng.core.AppEng;
* as the light strip when it's powered.
*/
@OnlyIn(Dist.CLIENT)
public class MolecularAssemblerRenderer extends TileEntityRenderer<TileMolecularAssembler> {
public class MolecularAssemblerRenderer extends TileEntityRenderer<MolecularAssemblerTileEntity> {
public static final ResourceLocation LIGHTS_MODEL = new ResourceLocation(AppEng.MOD_ID,
"block/molecular_assembler_lights");
@@ -67,8 +67,8 @@ public class MolecularAssemblerRenderer extends TileEntityRenderer<TileMolecular
}
@Override
public void render(TileMolecularAssembler molecularAssembler, float partialTicks, MatrixStack ms,
IRenderTypeBuffer bufferIn, int combinedLightIn, int combinedOverlayIn) {
public void render(MolecularAssemblerTileEntity molecularAssembler, float partialTicks, MatrixStack ms,
IRenderTypeBuffer bufferIn, int combinedLightIn, int combinedOverlayIn) {
AssemblerAnimationStatus status = molecularAssembler.getAnimationStatus();
if (status != null) {
@@ -105,8 +105,8 @@ public class MolecularAssemblerRenderer extends TileEntityRenderer<TileMolecular
lightsModel, 1, 1, 1, combinedLightIn, combinedOverlayIn, EmptyModelData.INSTANCE);
}
private void renderStatus(TileMolecularAssembler molecularAssembler, MatrixStack ms, IRenderTypeBuffer bufferIn,
int combinedLightIn, AssemblerAnimationStatus status) {
private void renderStatus(MolecularAssemblerTileEntity molecularAssembler, MatrixStack ms, IRenderTypeBuffer bufferIn,
int combinedLightIn, AssemblerAnimationStatus status) {
double centerX = molecularAssembler.getPos().getX() + 0.5f;
double centerY = molecularAssembler.getPos().getY() + 0.5f;
double centerZ = molecularAssembler.getPos().getZ() + 0.5f;
src/main/java/appeng/tile/crafting/TileMolecularAssembler.java → src/main/java/appeng/tile/crafting/MolecularAssemblerTileEntity.java
+14 -14
View File
@@ -63,12 +63,12 @@ import appeng.api.util.IConfigManager;
import appeng.container.ContainerNull;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.network.TargetPoint;
import appeng.core.sync.packets.PacketAssemblerAnimation;
import appeng.items.misc.ItemEncodedPattern;
import appeng.core.sync.packets.AssemblerAnimationPacket;
import appeng.items.misc.EncodedPatternItem;
import appeng.me.GridAccessException;
import appeng.parts.automation.DefinitionUpgradeInventory;
import appeng.parts.automation.UpgradeInventory;
import appeng.tile.grid.AENetworkInvTile;
import appeng.tile.grid.AENetworkInvTileEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
@@ -81,7 +81,7 @@ import appeng.util.inv.WrapperFilteredItemHandler;
import appeng.util.inv.filter.IAEItemFilter;
import appeng.util.item.AEItemStack;
public class TileMolecularAssembler extends AENetworkInvTile
public class MolecularAssemblerTileEntity extends AENetworkInvTileEntity
implements IUpgradeableHost, IConfigManagerHost, IGridTickable, ICraftingMachine, IPowerChannelState {
public static final String INVENTORY_MAIN = "molecular_assembler";
@@ -105,7 +105,7 @@ public class TileMolecularAssembler extends AENetworkInvTile
@OnlyIn(Dist.CLIENT)
private AssemblerAnimationStatus animationStatus;
public TileMolecularAssembler(TileEntityType<?> tileEntityTypeIn) {
public MolecularAssemblerTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
final ITileDefinition assembler = AEApi.instance().definitions().blocks().molecularAssembler();
@@ -224,9 +224,9 @@ public class TileMolecularAssembler extends AENetworkInvTile
if (data.contains("myPlan")) {
final ItemStack myPat = ItemStack.read(data.getCompound("myPlan"));
if (!myPat.isEmpty() && myPat.getItem() instanceof ItemEncodedPattern) {
if (!myPat.isEmpty() && myPat.getItem() instanceof EncodedPatternItem) {
final World w = this.getWorld();
final ItemEncodedPattern iep = (ItemEncodedPattern) myPat.getItem();
final EncodedPatternItem iep = (EncodedPatternItem) myPat.getItem();
final ICraftingPatternDetails ph = iep.getPatternForItem(myPat, w);
if (ph != null && ph.isCraftable()) {
this.forcePlan = true;
@@ -250,10 +250,10 @@ public class TileMolecularAssembler extends AENetworkInvTile
final ItemStack is = this.patternInv.getStackInSlot(0);
if (!is.isEmpty() && is.getItem() instanceof ItemEncodedPattern) {
if (!is.isEmpty() && is.getItem() instanceof EncodedPatternItem) {
if (!ItemStack.areItemsEqual(is, this.myPattern)) {
final World w = this.getWorld();
final ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem();
final EncodedPatternItem iep = (EncodedPatternItem) is.getItem();
final ICraftingPatternDetails ph = iep.getPatternForItem(is, w);
if (ph != null && ph.isCraftable()) {
@@ -429,7 +429,7 @@ public class TileMolecularAssembler extends AENetworkInvTile
final TargetPoint where = new TargetPoint(this.pos.getX(), this.pos.getY(), this.pos.getZ(), 32,
this.world.getDimension().getType());
NetworkHandler.instance()
.sendToAllAround(new PacketAssemblerAnimation(this.pos, (byte) speed, item), where);
.sendToAllAround(new AssemblerAnimationPacket(this.pos, (byte) speed, item), where);
}
this.saveChanges();
@@ -555,8 +555,8 @@ public class TileMolecularAssembler extends AENetworkInvTile
private class CraftingGridFilter implements IAEItemFilter {
private boolean hasPattern() {
return TileMolecularAssembler.this.myPlan != null
&& !ItemHandlerUtil.isEmpty(TileMolecularAssembler.this.patternInv);
return MolecularAssemblerTileEntity.this.myPlan != null
&& !ItemHandlerUtil.isEmpty(MolecularAssemblerTileEntity.this.patternInv);
}
@Override
@@ -571,8 +571,8 @@ public class TileMolecularAssembler extends AENetworkInvTile
}
if (this.hasPattern()) {
return TileMolecularAssembler.this.myPlan.isValidItemForSlot(slot, stack,
TileMolecularAssembler.this.getWorld());
return MolecularAssemblerTileEntity.this.myPlan.isValidItemForSlot(slot, stack,
MolecularAssemblerTileEntity.this.getWorld());
}
return false;
}