The Great Renamening of 2020

src/main/java/appeng/entity/AEBaseItemEntity.java

@@ -29,14 +29,14 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.network.NetworkHooks;
 
-public abstract class AEBaseEntityItem extends ItemEntity {
+public abstract class AEBaseItemEntity extends ItemEntity {
 
-    protected AEBaseEntityItem(EntityType<? extends AEBaseEntityItem> entityType, final World world) {
+    protected AEBaseItemEntity(EntityType<? extends AEBaseItemEntity> entityType, final World world) {
         super(entityType, world);
     }
 
-    protected AEBaseEntityItem(EntityType<? extends AEBaseEntityItem> entityType, final World world, final double x,
-            final double y, final double z, final ItemStack stack) {
+    protected AEBaseItemEntity(EntityType<? extends AEBaseItemEntity> entityType, final World world, final double x,
+                               final double y, final double z, final ItemStack stack) {
         this(entityType, world);
         this.setPosition(x, y, z);
         this.rotationYaw = this.rand.nextFloat() * 360.0F;

src/main/java/appeng/entity/ChargedQuartzEntity.java

@@ -40,18 +40,18 @@ import appeng.core.AEConfig;
 import appeng.core.AppEng;
 import appeng.util.Platform;
 
-public final class EntityChargedQuartz extends AEBaseEntityItem {
+public final class ChargedQuartzEntity extends AEBaseItemEntity {
 
-    public static EntityType<EntityChargedQuartz> TYPE;
+    public static EntityType<ChargedQuartzEntity> TYPE;
 
     private int delay = 0;
     private int transformTime = 0;
 
-    public EntityChargedQuartz(EntityType<? extends EntityChargedQuartz> entityType, World world) {
+    public ChargedQuartzEntity(EntityType<? extends ChargedQuartzEntity> entityType, World world) {
         super(entityType, world);
     }
 
-    public EntityChargedQuartz(final World w, final double x, final double y, final double z, final ItemStack is) {
+    public ChargedQuartzEntity(final World w, final double x, final double y, final double z, final ItemStack is) {
         super(TYPE, w, x, y, z, is);
     }
 

src/main/java/appeng/entity/GrowingCrystalEntity.java

@@ -34,20 +34,20 @@ import appeng.api.implementations.tiles.ICrystalGrowthAccelerator;
 import appeng.client.EffectType;
 import appeng.core.AEConfig;
 import appeng.core.AppEng;
-import appeng.items.misc.ItemCrystalSeed;
+import appeng.items.misc.CrystalSeedItem;
 import appeng.util.Platform;
 
-public final class EntityGrowingCrystal extends AEBaseEntityItem {
+public final class GrowingCrystalEntity extends AEBaseItemEntity {
 
-    public static EntityType<EntityGrowingCrystal> TYPE;
+    public static EntityType<GrowingCrystalEntity> TYPE;
 
     private int progress_1000 = 0;
 
-    public EntityGrowingCrystal(EntityType<? extends EntityGrowingCrystal> type, World world) {
+    public GrowingCrystalEntity(EntityType<? extends GrowingCrystalEntity> type, World world) {
         super(type, world);
     }
 
-    public EntityGrowingCrystal(final World w, final double x, final double y, final double z, final ItemStack is) {
+    public GrowingCrystalEntity(final World w, final double x, final double y, final double z, final ItemStack is) {
         super(TYPE, w, x, y, z, is);
         this.setNoDespawn();
     }
@@ -175,7 +175,7 @@ public final class EntityGrowingCrystal extends AEBaseEntityItem {
     @Override
     protected void applyFloatMotion() {
         ItemStack item = getItem();
-        if (item.getItem() instanceof ItemCrystalSeed) {
+        if (item.getItem() instanceof CrystalSeedItem) {
             return;
         }
         super.applyFloatMotion();

src/main/java/appeng/entity/SingularityEntity.java

@@ -36,17 +36,17 @@ import appeng.api.features.AEFeature;
 import appeng.core.AEConfig;
 import appeng.util.Platform;
 
-public final class EntitySingularity extends AEBaseEntityItem {
+public final class SingularityEntity extends AEBaseItemEntity {
 
-    public static EntityType<EntitySingularity> TYPE;
+    public static EntityType<SingularityEntity> TYPE;
 
     private static int randTickSeed = 0;
 
-    public EntitySingularity(EntityType<? extends EntitySingularity> entityType, final World w) {
+    public SingularityEntity(EntityType<? extends SingularityEntity> entityType, final World w) {
         super(entityType, w);
     }
 
-    public EntitySingularity(final World w, final double x, final double y, final double z, final ItemStack is) {
+    public SingularityEntity(final World w, final double x, final double y, final double z, final ItemStack is) {
         super(TYPE, w, x, y, z, is);
     }
 
@@ -98,7 +98,7 @@ public final class EntitySingularity extends AEBaseEntityItem {
                                     randTickSeed++;
                                     item.grow(-1);
 
-                                    final EntitySingularity entity = new EntitySingularity(this.world, this.getPosX(),
+                                    final SingularityEntity entity = new SingularityEntity(this.world, this.getPosX(),
                                             this.getPosY(), this.getPosZ(), singularityStack);
                                     this.world.addEntity(entity);
                                 });

src/main/java/appeng/entity/TinyTNTPrimedEntity.java

@@ -45,20 +45,20 @@ import appeng.api.AEApi;
 import appeng.api.features.AEFeature;
 import appeng.core.AEConfig;
 import appeng.core.AppEng;
-import appeng.core.sync.packets.PacketMockExplosion;
+import appeng.core.sync.packets.MockExplosionPacket;
 import appeng.util.Platform;
 
-public final class EntityTinyTNTPrimed extends TNTEntity implements IEntityAdditionalSpawnData {
+public final class TinyTNTPrimedEntity extends TNTEntity implements IEntityAdditionalSpawnData {
 
-    public static EntityType<EntityTinyTNTPrimed> TYPE;
+    public static EntityType<TinyTNTPrimedEntity> TYPE;
 
-    public EntityTinyTNTPrimed(EntityType<? extends EntityTinyTNTPrimed> type, World worldIn) {
+    public TinyTNTPrimedEntity(EntityType<? extends TinyTNTPrimedEntity> type, World worldIn) {
         super(type, worldIn);
         this.preventEntitySpawning = true;
     }
 
-    public EntityTinyTNTPrimed(final World w, final double x, final double y, final double z,
-            final LivingEntity igniter) {
+    public TinyTNTPrimedEntity(final World w, final double x, final double y, final double z,
+                               final LivingEntity igniter) {
         super(w, x, y, z, igniter);
     }
 
@@ -167,7 +167,7 @@ public final class EntityTinyTNTPrimed extends TNTEntity implements IEntityAddit
         }
 
         AppEng.proxy.sendToAllNearExcept(null, this.getPosX(), this.getPosY(), this.getPosZ(), 64, this.world,
-                new PacketMockExplosion(this.getPosX(), this.getPosY(), this.getPosZ()));
+                new MockExplosionPacket(this.getPosX(), this.getPosY(), this.getPosZ()));
     }
 
     @Override

src/main/java/appeng/entity/TinyTNTPrimedRenderer.java

@@ -34,16 +34,16 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 @OnlyIn(Dist.CLIENT)
-public class RenderTinyTNTPrimed extends EntityRenderer<EntityTinyTNTPrimed> {
+public class TinyTNTPrimedRenderer extends EntityRenderer<TinyTNTPrimedEntity> {
 
-    public RenderTinyTNTPrimed(final EntityRendererManager manager) {
+    public TinyTNTPrimedRenderer(final EntityRendererManager manager) {
         super(manager);
         this.shadowSize = 0.5F;
     }
 
     @Override
-    public void render(EntityTinyTNTPrimed tnt, float entityYaw, float partialTicks, MatrixStack mStack,
-            IRenderTypeBuffer buffers, int packedLight) {
+    public void render(TinyTNTPrimedEntity tnt, float entityYaw, float partialTicks, MatrixStack mStack,
+                       IRenderTypeBuffer buffers, int packedLight) {
         final BlockRendererDispatcher blockrendererdispatcher = Minecraft.getInstance().getBlockRendererDispatcher();
         mStack.push();
         mStack.translate(0, 0.25F, 0);
@@ -78,7 +78,7 @@ public class RenderTinyTNTPrimed extends EntityRenderer<EntityTinyTNTPrimed> {
     }
 
     @Override
-    public ResourceLocation getEntityTexture(final EntityTinyTNTPrimed entity) {
+    public ResourceLocation getEntityTexture(final TinyTNTPrimedEntity entity) {
         return AtlasTexture.LOCATION_BLOCKS_TEXTURE;
     }
 }