The Great Renamening of 2020

src/main/java/appeng/debug/ChunkLoaderBlock.java

@@ -22,9 +22,9 @@ import net.minecraft.block.material.Material;
 
 import appeng.block.AEBaseTileBlock;
 
-public class BlockChunkloader extends AEBaseTileBlock<TileChunkLoader> {
+public class ChunkLoaderBlock extends AEBaseTileBlock<ChunkLoaderTileEntity> {
 
-    public BlockChunkloader() {
+    public ChunkLoaderBlock() {
         super(defaultProps(Material.IRON));
     }
 

src/main/java/appeng/debug/ChunkLoaderTileEntity.java

@@ -25,11 +25,11 @@ import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
 
 import appeng.core.AELog;
-import appeng.tile.AEBaseTile;
+import appeng.tile.AEBaseTileEntity;
 
-public class TileChunkLoader extends AEBaseTile implements ITickableTileEntity {
+public class ChunkLoaderTileEntity extends AEBaseTileEntity implements ITickableTileEntity {
 
-    public TileChunkLoader(TileEntityType<?> tileEntityTypeIn) {
+    public ChunkLoaderTileEntity(TileEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
     }
 

src/main/java/appeng/debug/CubeGeneratorBlock.java

@@ -31,16 +31,16 @@ import net.minecraft.world.World;
 
 import appeng.block.AEBaseTileBlock;
 
-public class BlockCubeGenerator extends AEBaseTileBlock<TileCubeGenerator> {
+public class CubeGeneratorBlock extends AEBaseTileBlock<CubeGeneratorTileEntity> {
 
-    public BlockCubeGenerator() {
+    public CubeGeneratorBlock() {
         super(defaultProps(Material.IRON));
     }
 
     @Override
     public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand,
             final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) {
-        final TileCubeGenerator tcg = this.getTileEntity(w, pos);
+        final CubeGeneratorTileEntity tcg = this.getTileEntity(w, pos);
         if (tcg != null) {
             tcg.click(player);
         }

src/main/java/appeng/debug/CubeGeneratorTileEntity.java

@@ -30,17 +30,17 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.StringTextComponent;
 
 import appeng.core.AppEng;
-import appeng.tile.AEBaseTile;
+import appeng.tile.AEBaseTileEntity;
 import appeng.util.Platform;
 
-public class TileCubeGenerator extends AEBaseTile implements ITickableTileEntity {
+public class CubeGeneratorTileEntity extends AEBaseTileEntity implements ITickableTileEntity {
 
     private int size = 3;
     private ItemStack is = ItemStack.EMPTY;
     private int countdown = 20 * 10;
     private PlayerEntity who = null;
 
-    public TileCubeGenerator(TileEntityType<?> tileEntityTypeIn) {
+    public CubeGeneratorTileEntity(TileEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
     }
 

src/main/java/appeng/debug/DebugCardItem.java

@@ -48,12 +48,12 @@ import appeng.items.AEBaseItem;
 import appeng.me.Grid;
 import appeng.me.GridNode;
 import appeng.me.cache.TickManagerCache;
-import appeng.parts.p2p.PartP2PTunnel;
-import appeng.tile.networking.TileController;
+import appeng.parts.p2p.P2PTunnelPart;
+import appeng.tile.networking.ControllerTileEntity;
 
-public class ToolDebugCard extends AEBaseItem {
+public class DebugCardItem extends AEBaseItem {
 
-    public ToolDebugCard(Properties properties) {
+    public DebugCardItem(Properties properties) {
         super(properties);
     }
 
@@ -108,7 +108,7 @@ public class ToolDebugCard extends AEBaseItem {
                             next = new HashSet<>();
 
                             for (final IGridNode n : current) {
-                                if (n.getMachine() instanceof TileController) {
+                                if (n.getMachine() instanceof ControllerTileEntity) {
                                     break outer;
                                 }
 
@@ -127,8 +127,8 @@ public class ToolDebugCard extends AEBaseItem {
                         this.outputMsg(player, "Cable Distance: " + length);
                     }
 
-                    if (center.getMachine() instanceof PartP2PTunnel) {
-                        this.outputMsg(player, "Freq: " + ((PartP2PTunnel<?>) center.getMachine()).getFrequency());
+                    if (center.getMachine() instanceof P2PTunnelPart) {
+                        this.outputMsg(player, "Freq: " + ((P2PTunnelPart<?>) center.getMachine()).getFrequency());
                     }
 
                     final TickManagerCache tmc = g.getCache(ITickManager.class);

src/main/java/appeng/debug/DebugPartPlacerItem.java

@@ -21,16 +21,16 @@ import appeng.api.parts.PartItemStack;
 import appeng.api.util.AEPartLocation;
 import appeng.items.AEBaseItem;
 import appeng.items.parts.ColoredPartItem;
-import appeng.items.parts.ItemPart;
+import appeng.items.parts.PartItem;
 
 /**
- * This tool will try to place anything that is registered as a {@link ItemPart}
+ * This tool will try to place anything that is registered as a {@link PartItem}
  * (and not a colored one) onto an existing cable to quickly test parts and
  * their rendering.
  */
-public class ToolDebugPartPlacer extends AEBaseItem {
+public class DebugPartPlacerItem extends AEBaseItem {
 
-    public ToolDebugPartPlacer(Properties properties) {
+    public DebugPartPlacerItem(Properties properties) {
         super(properties);
     }
 
@@ -72,7 +72,7 @@ public class ToolDebugPartPlacer extends AEBaseItem {
 
         BlockPos nextPos = pos;
         for (Item item : ForgeRegistries.ITEMS) {
-            if (!(item instanceof ItemPart)) {
+            if (!(item instanceof PartItem)) {
                 continue;
             }
 

src/main/java/appeng/debug/EnergyGeneratorBlock.java

@@ -22,9 +22,9 @@ import net.minecraft.block.material.Material;
 
 import appeng.block.AEBaseTileBlock;
 
-public class BlockEnergyGenerator extends AEBaseTileBlock<TileEnergyGenerator> {
+public class EnergyGeneratorBlock extends AEBaseTileBlock<EnergyGeneratorTileEntity> {
 
-    public BlockEnergyGenerator() {
+    public EnergyGeneratorBlock() {
         super(defaultProps(Material.IRON));
     }
 

src/main/java/appeng/debug/EnergyGeneratorTileEntity.java

@@ -32,16 +32,16 @@ import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.energy.CapabilityEnergy;
 import net.minecraftforge.energy.IEnergyStorage;
 
-import appeng.tile.AEBaseTile;
+import appeng.tile.AEBaseTileEntity;
 
-public class TileEnergyGenerator extends AEBaseTile implements ITickableTileEntity, IEnergyStorage {
+public class EnergyGeneratorTileEntity extends AEBaseTileEntity implements ITickableTileEntity, IEnergyStorage {
     /**
      * The base energy injected each tick. Adjacent TileEnergyGenerators will
      * increase it to pow(base, #generators).
      */
     private static final int BASE_ENERGY = 8;
 
-    public TileEnergyGenerator(TileEntityType<?> tileEntityTypeIn) {
+    public EnergyGeneratorTileEntity(TileEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
     }
 
@@ -56,7 +56,7 @@ public class TileEnergyGenerator extends AEBaseTile implements ITickableTileEnti
         for (Direction facing : Direction.values()) {
             final TileEntity te = world.getTileEntity(this.getPos().offset(facing));
 
-            if (te instanceof TileEnergyGenerator) {
+            if (te instanceof EnergyGeneratorTileEntity) {
                 tier++;
             }
         }

src/main/java/appeng/debug/EraserItem.java

@@ -36,13 +36,13 @@ import net.minecraft.world.World;
 import appeng.core.AELog;
 import appeng.items.AEBaseItem;
 
-public class ToolEraser extends AEBaseItem {
+public class EraserItem extends AEBaseItem {
 
     private static final int BOX_SIZE = 48;
     private static final int BLOCK_ERASE_LIMIT = BOX_SIZE * BOX_SIZE * BOX_SIZE;
     final static Set<Block> COMMON_BLOCKS = new HashSet<>();
 
-    public ToolEraser(Properties properties) {
+    public EraserItem(Properties properties) {
         super(properties);
     }
 

src/main/java/appeng/debug/ItemGenBlock.java

@@ -22,9 +22,9 @@ import net.minecraft.block.material.Material;
 
 import appeng.block.AEBaseTileBlock;
 
-public class BlockItemGen extends AEBaseTileBlock<TileItemGen> {
+public class ItemGenBlock extends AEBaseTileBlock<ItemGenTileEntity> {
 
-    public BlockItemGen() {
+    public ItemGenBlock() {
         super(defaultProps(Material.IRON));
     }
 

src/main/java/appeng/debug/ItemGenTileEntity.java

@@ -36,15 +36,15 @@ import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.registries.ForgeRegistries;
 
-import appeng.tile.AEBaseTile;
+import appeng.tile.AEBaseTileEntity;
 
-public class TileItemGen extends AEBaseTile {
+public class ItemGenTileEntity extends AEBaseTileEntity {
 
     private static final Queue<ItemStack> POSSIBLE_ITEMS = new ArrayDeque<>();
 
     private final IItemHandler handler = new QueuedItemHandler();
 
-    public TileItemGen(TileEntityType<?> tileEntityTypeIn) {
+    public ItemGenTileEntity(TileEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
         if (POSSIBLE_ITEMS.isEmpty()) {
             for (final Item mi : ForgeRegistries.ITEMS) {

src/main/java/appeng/debug/MeteoritePlacerItem.java

@@ -36,9 +36,9 @@ import appeng.worldgen.MeteoritePlacer;
 import appeng.worldgen.MeteoriteSpawner;
 import appeng.worldgen.PlacedMeteoriteSettings;
 
-public class ToolMeteoritePlacer extends AEBaseItem {
+public class MeteoritePlacerItem extends AEBaseItem {
 
-    public ToolMeteoritePlacer(Properties properties) {
+    public MeteoritePlacerItem(Properties properties) {
         super(properties);
     }
 

src/main/java/appeng/debug/PhantomNodeBlock.java

@@ -31,16 +31,16 @@ import net.minecraft.world.World;
 
 import appeng.block.AEBaseTileBlock;
 
-public class BlockPhantomNode extends AEBaseTileBlock<TilePhantomNode> {
+public class PhantomNodeBlock extends AEBaseTileBlock<PhantomNodeTileEntity> {
 
-    public BlockPhantomNode() {
+    public PhantomNodeBlock() {
         super(defaultProps(Material.IRON));
     }
 
     @Override
     public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand,
             final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) {
-        final TilePhantomNode tpn = this.getTileEntity(w, pos);
+        final PhantomNodeTileEntity tpn = this.getTileEntity(w, pos);
         tpn.triggerCrashMode();
         return ActionResultType.SUCCESS;
     }

src/main/java/appeng/debug/PhantomNodeTileEntity.java

@@ -26,14 +26,14 @@ import net.minecraft.util.Direction;
 import appeng.api.networking.IGridNode;
 import appeng.api.util.AEPartLocation;
 import appeng.me.helpers.AENetworkProxy;
-import appeng.tile.grid.AENetworkTile;
+import appeng.tile.grid.AENetworkTileEntity;
 
-public class TilePhantomNode extends AENetworkTile {
+public class PhantomNodeTileEntity extends AENetworkTileEntity {
 
     private AENetworkProxy proxy = null;
     private boolean crashMode = false;
 
-    public TilePhantomNode(TileEntityType<?> tileEntityTypeIn) {
+    public PhantomNodeTileEntity(TileEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
     }
 

src/main/java/appeng/debug/ReplicatorCardItem.java

@@ -42,9 +42,9 @@ import appeng.api.util.AEPartLocation;
 import appeng.api.util.DimensionalCoord;
 import appeng.items.AEBaseItem;
 
-public class ToolReplicatorCard extends AEBaseItem {
+public class ReplicatorCardItem extends AEBaseItem {
 
-    public ToolReplicatorCard(Properties properties) {
+    public ReplicatorCardItem(Properties properties) {
         super(properties);
     }