The Great Renamening of 2020

src/main/java/appeng/tile/networking/CableBusTESR.java

@@ -27,15 +27,15 @@ import net.minecraft.util.Direction;
 
 import appeng.api.parts.IPart;
 
-public class CableBusTESR extends TileEntityRenderer<TileCableBus> {
+public class CableBusTESR extends TileEntityRenderer<CableBusTileEntity> {
 
     public CableBusTESR(TileEntityRendererDispatcher rendererDispatcherIn) {
         super(rendererDispatcherIn);
     }
 
     @Override
-    public void render(TileCableBus te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers,
-            int combinedLightIn, int combinedOverlayIn) {
+    public void render(CableBusTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers,
+                       int combinedLightIn, int combinedOverlayIn) {
         if (!te.getCableBus().isRequiresDynamicRender()) {
             return;
         }

src/main/java/appeng/tile/networking/CableBusTileEntity.java

@@ -54,16 +54,16 @@ import appeng.client.render.cablebus.CableBusRenderState;
 import appeng.helpers.AEMultiTile;
 import appeng.hooks.TickHandler;
 import appeng.parts.CableBusContainer;
-import appeng.tile.AEBaseTile;
+import appeng.tile.AEBaseTileEntity;
 import appeng.util.Platform;
 
-public class TileCableBus extends AEBaseTile implements AEMultiTile {
+public class CableBusTileEntity extends AEBaseTileEntity implements AEMultiTile {
 
     private CableBusContainer cb = new CableBusContainer(this);
 
     private int oldLV = -1; // on re-calculate light when it changes
 
-    public TileCableBus(TileEntityType<?> tileEntityTypeIn) {
+    public CableBusTileEntity(TileEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
     }
 

src/main/java/appeng/tile/networking/ControllerTileEntity.java

@@ -39,16 +39,16 @@ import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType;
 import appeng.api.networking.pathing.ControllerState;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
-import appeng.block.networking.BlockController;
-import appeng.block.networking.BlockController.ControllerBlockState;
+import appeng.block.networking.ControllerBlock;
+import appeng.block.networking.ControllerBlock.ControllerBlockState;
 import appeng.me.GridAccessException;
-import appeng.tile.grid.AENetworkPowerTile;
+import appeng.tile.grid.AENetworkPowerTileEntity;
 import appeng.util.inv.InvOperation;
 
-public class TileController extends AENetworkPowerTile {
+public class ControllerTileEntity extends AENetworkPowerTileEntity {
     private boolean isValid = false;
 
-    public TileController(TileEntityType<?> tileEntityTypeIn) {
+    public ControllerTileEntity(TileEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
         this.setInternalMaxPower(8000);
         this.setInternalPublicPowerStorage(true);
@@ -116,9 +116,9 @@ public class TileController extends AENetworkPowerTile {
         }
 
         if (this.checkController(this.pos)
-                && this.world.getBlockState(this.pos).get(BlockController.CONTROLLER_STATE) != metaState) {
+                && this.world.getBlockState(this.pos).get(ControllerBlock.CONTROLLER_STATE) != metaState) {
             this.world.setBlockState(this.pos,
-                    this.world.getBlockState(this.pos).with(BlockController.CONTROLLER_STATE, metaState));
+                    this.world.getBlockState(this.pos).with(ControllerBlock.CONTROLLER_STATE, metaState));
         }
 
     }
@@ -184,7 +184,7 @@ public class TileController extends AENetworkPowerTile {
      */
     private boolean checkController(final BlockPos pos) {
         if (this.world.getChunkProvider().isChunkLoaded(new ChunkPos(pos.getX() >> 4, pos.getZ() >> 4))) {
-            return this.world.getTileEntity(pos) instanceof TileController;
+            return this.world.getTileEntity(pos) instanceof ControllerTileEntity;
         }
 
         return false;

src/main/java/appeng/tile/networking/CreativeEnergyCellTileEntity.java

@@ -26,11 +26,11 @@ import appeng.api.config.PowerMultiplier;
 import appeng.api.networking.energy.IAEPowerStorage;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
-import appeng.tile.grid.AENetworkTile;
+import appeng.tile.grid.AENetworkTileEntity;
 
-public class TileCreativeEnergyCell extends AENetworkTile implements IAEPowerStorage {
+public class CreativeEnergyCellTileEntity extends AENetworkTileEntity implements IAEPowerStorage {
 
-    public TileCreativeEnergyCell(TileEntityType<?> tileEntityTypeIn) {
+    public CreativeEnergyCellTileEntity(TileEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
         this.getProxy().setIdlePowerUsage(0);
     }

src/main/java/appeng/tile/networking/DenseEnergyCellTileEntity.java

@@ -20,9 +20,9 @@ package appeng.tile.networking;
 
 import net.minecraft.tileentity.TileEntityType;
 
-public class TileDenseEnergyCell extends TileEnergyCell {
+public class DenseEnergyCellTileEntity extends EnergyCellTileEntity {
 
-    public TileDenseEnergyCell(TileEntityType<?> tileEntityTypeIn) {
+    public DenseEnergyCellTileEntity(TileEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
         this.setInternalMaxPower(200000 * 8);
     }

src/main/java/appeng/tile/networking/EnergyAcceptorTileEntity.java

@@ -28,12 +28,12 @@ import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
 import appeng.me.GridAccessException;
-import appeng.tile.grid.AENetworkPowerTile;
+import appeng.tile.grid.AENetworkPowerTileEntity;
 import appeng.util.inv.InvOperation;
 
-public class TileEnergyAcceptor extends AENetworkPowerTile {
+public class EnergyAcceptorTileEntity extends AENetworkPowerTileEntity {
 
-    public TileEnergyAcceptor(TileEntityType<?> tileEntityTypeIn) {
+    public EnergyAcceptorTileEntity(TileEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
         this.getProxy().setIdlePowerUsage(0.0);
         this.setInternalMaxPower(0);

src/main/java/appeng/tile/networking/EnergyCellTileEntity.java

@@ -29,19 +29,19 @@ import appeng.api.networking.events.MENetworkPowerStorage;
 import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
-import appeng.block.networking.BlockEnergyCell;
+import appeng.block.networking.EnergyCellBlock;
 import appeng.me.GridAccessException;
-import appeng.tile.grid.AENetworkTile;
+import appeng.tile.grid.AENetworkTileEntity;
 import appeng.util.SettingsFrom;
 
-public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage {
+public class EnergyCellTileEntity extends AENetworkTileEntity implements IAEPowerStorage {
 
     private double internalCurrentPower = 0.0;
     private double internalMaxPower = 200000.0;
 
     private byte currentMeta = -1;
 
-    public TileEnergyCell(TileEntityType<?> tileEntityTypeIn) {
+    public EnergyCellTileEntity(TileEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
         this.getProxy().setIdlePowerUsage(0);
     }
@@ -54,7 +54,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage {
     @Override
     public void onReady() {
         super.onReady();
-        final int value = this.world.getBlockState(this.pos).get(BlockEnergyCell.ENERGY_STORAGE);
+        final int value = this.world.getBlockState(this.pos).get(EnergyCellBlock.ENERGY_STORAGE);
         this.currentMeta = (byte) value;
         this.changePowerLevel();
     }
@@ -85,7 +85,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage {
         if (this.currentMeta != storageLevel) {
             this.currentMeta = (byte) storageLevel;
             this.world.setBlockState(this.pos,
-                    this.world.getBlockState(this.pos).with(BlockEnergyCell.ENERGY_STORAGE, storageLevel));
+                    this.world.getBlockState(this.pos).with(EnergyCellBlock.ENERGY_STORAGE, storageLevel));
         }
     }
 

src/main/java/appeng/tile/networking/WirelessTileEntity.java

@@ -40,12 +40,12 @@ import appeng.api.util.AEPartLocation;
 import appeng.api.util.DimensionalCoord;
 import appeng.core.AEConfig;
 import appeng.me.GridAccessException;
-import appeng.tile.grid.AENetworkInvTile;
+import appeng.tile.grid.AENetworkInvTileEntity;
 import appeng.tile.inventory.AppEngInternalInventory;
 import appeng.util.inv.InvOperation;
 import appeng.util.inv.filter.AEItemDefinitionFilter;
 
-public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoint, IPowerChannelState {
+public class WirelessTileEntity extends AENetworkInvTileEntity implements IWirelessAccessPoint, IPowerChannelState {
 
     public static final int POWERED_FLAG = 1;
     public static final int CHANNEL_FLAG = 2;
@@ -54,7 +54,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
 
     private int clientFlags = 0;
 
-    public TileWireless(TileEntityType<?> tileEntityTypeIn) {
+    public WirelessTileEntity(TileEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
         this.inv.setFilter(new AEItemDefinitionFilter(AEApi.instance().definitions().materials().wirelessBooster()));
         this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);