The Great Renamening of 2020

src/main/java/appeng/bootstrap/FeatureFactory.java

@@ -42,7 +42,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.features.AEFeature;
 import appeng.bootstrap.components.ModelOverrideComponent;
-import appeng.tile.AEBaseTile;
+import appeng.tile.AEBaseTileEntity;
 import appeng.util.Platform;
 
 public class FeatureFactory {
@@ -85,8 +85,8 @@ public class FeatureFactory {
         return new EntityBuilder<T>(this, id, factory, classification).features(this.defaultFeatures);
     }
 
-    public <T extends AEBaseTile> TileEntityBuilder<T> tileEntity(String id, Class<T> teClass,
-            Function<TileEntityType<T>, T> factory) {
+    public <T extends AEBaseTileEntity> TileEntityBuilder<T> tileEntity(String id, Class<T> teClass,
+                                                                        Function<TileEntityType<T>, T> factory) {
         return new TileEntityBuilder<>(this, id, teClass, factory).features(this.defaultFeatures);
     }
 

src/main/java/appeng/bootstrap/TileEntityBuilder.java

@@ -24,7 +24,7 @@ import appeng.bootstrap.definitions.TileEntityDefinition;
 import appeng.core.AppEng;
 import appeng.core.features.ActivityState;
 import appeng.core.features.BlockStackSrc;
-import appeng.tile.AEBaseTile;
+import appeng.tile.AEBaseTileEntity;
 import appeng.util.Platform;
 
 /**
@@ -33,7 +33,7 @@ import appeng.util.Platform;
  *
  * @param <T>
  */
-public class TileEntityBuilder<T extends AEBaseTile> {
+public class TileEntityBuilder<T extends AEBaseTileEntity> {
 
     private final FeatureFactory factory;
 
@@ -95,7 +95,7 @@ public class TileEntityBuilder<T extends AEBaseTile> {
             type.setRegistryName(AppEng.MOD_ID, registryName);
             registry.register(type);
 
-            AEBaseTile.registerTileItem(tileClass, new BlockStackSrc(blocks.get(0), ActivityState.Enabled));
+            AEBaseTileEntity.registerTileItem(tileClass, new BlockStackSrc(blocks.get(0), ActivityState.Enabled));
 
             for (Block block : blocks) {
                 if (block instanceof AEBaseTileBlock) {

src/main/java/appeng/bootstrap/TileEntityRendering.java

@@ -25,9 +25,9 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import appeng.tile.AEBaseTile;
+import appeng.tile.AEBaseTileEntity;
 
-public class TileEntityRendering<T extends AEBaseTile> {
+public class TileEntityRendering<T extends AEBaseTileEntity> {
 
     @OnlyIn(Dist.CLIENT)
     Function<TileEntityRendererDispatcher, TileEntityRenderer<T>> tileEntityRenderer;

src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java

@@ -21,14 +21,14 @@ package appeng.bootstrap;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import appeng.tile.AEBaseTile;
+import appeng.tile.AEBaseTileEntity;
 
 /**
  * A callback that allows the rendering of a tile entity to be customized. Sadly
  * this class is required and no lambdas can be used due to them not being able
  * to be annotated with @OnlyIn(CLIENT).
  */
-public abstract class TileEntityRenderingCustomizer<T extends AEBaseTile> {
+public abstract class TileEntityRenderingCustomizer<T extends AEBaseTileEntity> {
 
     @OnlyIn(Dist.CLIENT)
     public abstract void customize(TileEntityRendering<T> rendering);