The Great Renamening of 2020

src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java

@@ -26,7 +26,7 @@ import net.minecraftforge.client.model.data.IModelData;
 import appeng.client.render.cablebus.CubeBuilder;
 import appeng.core.AppEng;
 import appeng.helpers.Splotch;
-import appeng.tile.misc.TilePaint;
+import appeng.tile.misc.PaintSplotchesTileEntity;
 
 /**
  * Renders paint blocks, which render multiple "splotches" that have been
@@ -58,7 +58,7 @@ class PaintSplotchesBakedModel implements IDynamicBakedModel {
             return Collections.emptyList();
         }
 
-        PaintSplotches splotchesState = extraData.getData(TilePaint.SPLOTCHES);
+        PaintSplotches splotchesState = extraData.getData(PaintSplotchesTileEntity.SPLOTCHES);
 
         if (splotchesState == null) {
             // This is the inventory model which should usually not be used other than in

src/main/java/appeng/block/paint/PaintSplotchesBlock.java

@@ -37,11 +37,11 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.block.AEBaseTileBlock;
-import appeng.tile.misc.TilePaint;
+import appeng.tile.misc.PaintSplotchesTileEntity;
 import appeng.util.Platform;
 
-public class BlockPaint extends AEBaseTileBlock<TilePaint> {
-    public BlockPaint() {
+public class PaintSplotchesBlock extends AEBaseTileBlock<PaintSplotchesTileEntity> {
+    public PaintSplotchesBlock() {
         super(defaultProps(Material.WATER, MaterialColor.AIR));
         this.setFullSize(false);
         this.setOpaque(false);
@@ -61,7 +61,7 @@ public class BlockPaint extends AEBaseTileBlock<TilePaint> {
     @Override
     public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos,
             boolean isMoving) {
-        final TilePaint tp = this.getTileEntity(world, pos);
+        final PaintSplotchesTileEntity tp = this.getTileEntity(world, pos);
 
         if (tp != null) {
             tp.neighborChanged();
@@ -77,7 +77,7 @@ public class BlockPaint extends AEBaseTileBlock<TilePaint> {
 
     @Override
     public int getLightValue(final BlockState state, final IBlockReader w, final BlockPos pos) {
-        final TilePaint tp = this.getTileEntity(w, pos);
+        final PaintSplotchesTileEntity tp = this.getTileEntity(w, pos);
 
         if (tp != null) {
             return tp.getLightLevel();

src/main/java/appeng/block/paint/PaintSplotchesRendering.java

@@ -9,7 +9,7 @@ import appeng.bootstrap.BlockRenderingCustomizer;
 import appeng.bootstrap.IBlockRendering;
 import appeng.bootstrap.IItemRendering;
 
-public class PaintRendering extends BlockRenderingCustomizer {
+public class PaintSplotchesRendering extends BlockRenderingCustomizer {
 
     @Override
     @OnlyIn(Dist.CLIENT)