The Great Renamening of 2020

src/main/java/appeng/block/spatial/MatrixFrameBlock.java

@@ -44,12 +44,12 @@ import appeng.block.AEBaseBlock;
  * This block is used to fill empty space in spatial dimensions and delinates
  * the border of a spatial dimensions's usable space.
  */
-public class BlockMatrixFrame extends AEBaseBlock {
+public class MatrixFrameBlock extends AEBaseBlock {
 
     private static final Material MATERIAL = new Material(MaterialColor.AIR, false, true, true, false, false, false,
             false, PushReaction.PUSH_ONLY);
 
-    public BlockMatrixFrame() {
+    public MatrixFrameBlock() {
         super(Properties.create(MATERIAL).hardnessAndResistance(-1.0F, 6000000.0F).notSolid().noDrops());
     }
 

src/main/java/appeng/block/spatial/SpatialIOPortBlock.java

@@ -34,20 +34,20 @@ import net.minecraft.world.World;
 import appeng.block.AEBaseTileBlock;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
-import appeng.container.implementations.ContainerSpatialIOPort;
-import appeng.tile.spatial.TileSpatialIOPort;
+import appeng.container.implementations.SpatialIOPortContainer;
+import appeng.tile.spatial.SpatialIOPortTileEntity;
 import appeng.util.Platform;
 
-public class BlockSpatialIOPort extends AEBaseTileBlock<TileSpatialIOPort> {
+public class SpatialIOPortBlock extends AEBaseTileBlock<SpatialIOPortTileEntity> {
 
-    public BlockSpatialIOPort() {
+    public SpatialIOPortBlock() {
         super(defaultProps(Material.IRON));
     }
 
     @Override
     public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos,
             boolean isMoving) {
-        final TileSpatialIOPort te = this.getTileEntity(world, pos);
+        final SpatialIOPortTileEntity te = this.getTileEntity(world, pos);
         if (te != null) {
             te.updateRedstoneState();
         }
@@ -60,10 +60,10 @@ public class BlockSpatialIOPort extends AEBaseTileBlock<TileSpatialIOPort> {
             return ActionResultType.PASS;
         }
 
-        final TileSpatialIOPort tg = this.getTileEntity(w, pos);
+        final SpatialIOPortTileEntity tg = this.getTileEntity(w, pos);
         if (tg != null) {
             if (Platform.isServer()) {
-                ContainerOpener.openContainer(ContainerSpatialIOPort.TYPE, p,
+                ContainerOpener.openContainer(SpatialIOPortContainer.TYPE, p,
                         ContainerLocator.forTileEntitySide(tg, hit.getFace()));
             }
             return ActionResultType.SUCCESS;

src/main/java/appeng/block/spatial/SpatialPylonBlock.java

@@ -26,18 +26,18 @@ import net.minecraft.world.World;
 
 import appeng.block.AEBaseTileBlock;
 import appeng.helpers.AEGlassMaterial;
-import appeng.tile.spatial.TileSpatialPylon;
+import appeng.tile.spatial.SpatialPylonTileEntity;
 
-public class BlockSpatialPylon extends AEBaseTileBlock<TileSpatialPylon> {
+public class SpatialPylonBlock extends AEBaseTileBlock<SpatialPylonTileEntity> {
 
-    public BlockSpatialPylon() {
+    public SpatialPylonBlock() {
         super(defaultProps(AEGlassMaterial.INSTANCE));
     }
 
     @Override
     public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos,
             boolean isMoving) {
-        final TileSpatialPylon tsp = this.getTileEntity(world, pos);
+        final SpatialPylonTileEntity tsp = this.getTileEntity(world, pos);
         if (tsp != null) {
             tsp.neighborChanged();
         }
@@ -45,7 +45,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock<TileSpatialPylon> {
 
     @Override
     public int getLightValue(final BlockState state, final IBlockReader w, final BlockPos pos) {
-        final TileSpatialPylon tsp = this.getTileEntity(w, pos);
+        final SpatialPylonTileEntity tsp = this.getTileEntity(w, pos);
         if (tsp != null) {
             return tsp.getLightValue();
         }