GT++ Code Sanitize (#3235)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

47 files changed, 170 insertions, 221 deletions

diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
index c546d2114e..70416c82ef 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
@@ -29,7 +29,6 @@ import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.CubicObject;
 import gtPlusPlus.api.objects.minecraft.SafeTexture;
-import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.InventoryUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -64,28 +63,28 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
     }
 
     /**
-     * A lazy way to declare the unlocal name for the block, makes boilerplating easy.
+     * A lazy way to declare the unlocal name for the block, makes boilerplate easy.
      *
      * @return The internal name for this block.
      */
     public abstract String getUnlocalBlockName();
 
     /**
-     * Lazy Boilerplating.
+     * Lazy Boilerplate.
      *
      * @return Block Hardness.
      */
     protected abstract float initBlockHardness();
 
     /**
-     * Lazy Boilerplating.
+     * Lazy Boilerplate.
      *
      * @return Block Resistance.
      */
     protected abstract float initBlockResistance();
 
     /**
-     * Lazy Boilerplating.
+     * Lazy Boilerplate.
      *
      * @return The {@link CreativeTab} this Block is shown on.
      */
@@ -131,7 +130,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
     /**
      * An array of CubicObjects, one for each meta, else just a single cell array. Expected to be null regularly, as the
      * default texture handling should suffice. Handy if re-using textures or using a non-standard structure for them.
-     * FULL texture path must be used, inclusive of the MODID and a colon.
+     * FULL texture path must be used, inclusive of the MOD ID and a colon.
      */
     public CubicObject<String>[] getCustomTextureDirectoryObject() {
         return null;
@@ -155,24 +154,14 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
 
         Logger.INFO("[TeTexture] Building Texture Maps for " + getTileEntityName() + ".");
 
-        // Init on the Client side only, to prevent Field initialisers existing in the Server side bytecode.
+        // Init on the Client side only, to prevent Field initializers existing in the Server side bytecode.
         mSidedTextureArray = new ArrayList<>();
-        /**
-         * Holds the data for the six sides, each side holds an array of data for each respective meta.
-         */
+        // Holds the data for the six sides, each side holds an array of data for each respective meta.
         ArrayList<CubicObject<String>> sidedTexturePathArray = new ArrayList<>();
-
         // Store them in forge order
         // DOWN, UP, NORTH, SOUTH, WEST, EAST
-
         // Default Path Name, this will make us look inside 'miscutils\textures\blocks'
-        final String aPrefixTexPath = GTPlusPlus.ID + ":";
-        // Default Path Name, this will make us look in the subdirectory for this Tile Entity.
-        final String aTexPathMid = "TileEntities" + GTPPCore.SEPERATOR
-            + getTileEntityNameForTexturePathing()
-            + GTPPCore.SEPERATOR;
-        // Construct a full path
-        String aTexPathBuilt = aPrefixTexPath + aTexPathMid;
+        String aTexPathBuilt = GTPlusPlus.ID + ":TileEntities/" + getTileEntityNameForTexturePathing() + "/";
         // File Name Suffixes, without meta tags
         String aStringBot;
         String aStringTop;
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java
index 6772b71262..7629de4eb5 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java
@@ -61,8 +61,8 @@ public class BlockBaseFluid extends BlockFluidClassic {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister icon) {
-        this.textureArray[0] = icon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Still");
-        this.textureArray[1] = icon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Flow");
+        this.textureArray[0] = icon.registerIcon(GTPlusPlus.ID + ":fluid/Fluid_" + this.name + "_Still");
+        this.textureArray[1] = icon.registerIcon(GTPlusPlus.ID + ":fluid/Fluid_" + this.name + "_Flow");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
index 7ba3e7e474..bc4f4b25a6 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -122,7 +122,6 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
         if (EnchantmentHelper.getSilkTouchModifier(player)) {
             shouldSilkTouch = true;
             super.harvestBlock(worldIn, player, x, y, z, meta);
-
             if (shouldSilkTouch) {
                 shouldSilkTouch = false;
             }
@@ -145,12 +144,9 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
             drops.add(ItemUtils.simpleMetaStack(this, metadata, 1));
         } else {
             switch (GTMod.gregtechproxy.oreDropSystem) {
-                case Item -> {
-                    drops.add(
-                        ItemUtils.getItemStackOfAmountFromOreDictNoBroken(
-                            "oreRaw" + this.blockMaterial.getLocalizedName(),
-                            1));
-                }
+                case Item -> drops.add(
+                    ItemUtils
+                        .getItemStackOfAmountFromOreDictNoBroken("oreRaw" + this.blockMaterial.getLocalizedName(), 1));
                 case FortuneItem -> {
                     // if shouldFortune and isNatural then get fortune drops
                     // if not shouldFortune or not isNatural then get normal drops
@@ -174,18 +170,12 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
                                 1));
                     }
                 }
-                case UnifiedBlock -> {
-                    // Unified ore
-                    drops.add(ItemUtils.simpleMetaStack(this, metadata, 1));
-                }
-                case PerDimBlock -> {
-                    // Per Dimension ore
-                    drops.add(ItemUtils.simpleMetaStack(this, metadata, 1));
-                }
-                case Block -> {
-                    // Regular ore
-                    drops.add(ItemUtils.simpleMetaStack(this, metadata, 1));
-                }
+                // Unified ore
+                case UnifiedBlock -> drops.add(ItemUtils.simpleMetaStack(this, metadata, 1));
+                // Per Dimension ore
+                case PerDimBlock -> drops.add(ItemUtils.simpleMetaStack(this, metadata, 1));
+                // Regular ore
+                case Block -> drops.add(ItemUtils.simpleMetaStack(this, metadata, 1));
             }
         }
         return drops;
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
index 0c353cfbdd..07e6d3324f 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
@@ -23,7 +23,7 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
 
 public class BlockCompressedObsidian extends BlockObsidian {
 
-    private final IIcon textureArray[] = new IIcon[11];
+    private final IIcon[] textureArray = new IIcon[11];
 
     public BlockCompressedObsidian() {
         this.setBlockName("blockCompressedObsidian");
@@ -49,17 +49,17 @@ public class BlockCompressedObsidian extends BlockObsidian {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister iicon) {
-        this.textureArray[0] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian1");
-        this.textureArray[1] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian2");
-        this.textureArray[2] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian3");
-        this.textureArray[3] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian4");
-        this.textureArray[4] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian5");
-        this.textureArray[5] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian_invert");
-        this.textureArray[6] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone1");
-        this.textureArray[7] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone2");
-        this.textureArray[8] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone3");
-        this.textureArray[9] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone4");
-        this.textureArray[10] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone5");
+        this.textureArray[0] = iicon.registerIcon(GTPlusPlus.ID + ":compressed/obsidian1");
+        this.textureArray[1] = iicon.registerIcon(GTPlusPlus.ID + ":compressed/obsidian2");
+        this.textureArray[2] = iicon.registerIcon(GTPlusPlus.ID + ":compressed/obsidian3");
+        this.textureArray[3] = iicon.registerIcon(GTPlusPlus.ID + ":compressed/obsidian4");
+        this.textureArray[4] = iicon.registerIcon(GTPlusPlus.ID + ":compressed/obsidian5");
+        this.textureArray[5] = iicon.registerIcon(GTPlusPlus.ID + ":compressed/obsidian_invert");
+        this.textureArray[6] = iicon.registerIcon(GTPlusPlus.ID + ":compressed/glowstone1");
+        this.textureArray[7] = iicon.registerIcon(GTPlusPlus.ID + ":compressed/glowstone2");
+        this.textureArray[8] = iicon.registerIcon(GTPlusPlus.ID + ":compressed/glowstone3");
+        this.textureArray[9] = iicon.registerIcon(GTPlusPlus.ID + ":compressed/glowstone4");
+        this.textureArray[10] = iicon.registerIcon(GTPlusPlus.ID + ":compressed/glowstone5");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockFluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/BlockFluidTankInfinite.java
index a300b83577..2e884fda96 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockFluidTankInfinite.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockFluidTankInfinite.java
@@ -14,7 +14,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
-import net.minecraftforge.fluids.ItemFluidContainer;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -55,12 +54,10 @@ public class BlockFluidTankInfinite extends BlockContainer {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture");
-        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture");
-        this.textureBottom = p_149651_1_
-            .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture");
-        this.textureFront = p_149651_1_
-            .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture");
+        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/Generic_Creative_Texture");
+        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/Generic_Creative_Texture");
+        this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/Generic_Creative_Texture");
+        this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/Generic_Creative_Texture");
     }
 
     /**
@@ -81,9 +78,8 @@ public class BlockFluidTankInfinite extends BlockContainer {
                 } catch (Throwable t) {
                     handItem = null;
                 }
-                if (handItem != null
-                    && (handItem instanceof IFluidContainerItem || handItem instanceof ItemFluidContainer
-                        || FluidContainerRegistry.isFilledContainer(player.getHeldItem()))) {
+                if (handItem != null && (handItem instanceof IFluidContainerItem
+                    || FluidContainerRegistry.isFilledContainer(player.getHeldItem()))) {
                     if (tank.tank.getFluid() == null) {
                         try {
                             if (!FluidContainerRegistry.isFilledContainer(player.getHeldItem())) {
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockHellFire.java b/src/main/java/gtPlusPlus/core/block/general/BlockHellFire.java
index b18a2d4b86..1a6549e758 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockHellFire.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockHellFire.java
@@ -30,6 +30,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.objects.XSTR;
+import gregtech.api.util.GTLog;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.math.MathUtils;
 
@@ -68,8 +69,8 @@ public class BlockHellFire extends BlockFire {
                     }
                 }
 
-            } catch (Throwable t) {
-                t.printStackTrace();
+            } catch (Exception e) {
+                e.printStackTrace(GTLog.err);
             }
         }
 
@@ -250,7 +251,7 @@ public class BlockHellFire extends BlockFire {
     }
 
     /**
-     * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z
+     * Checks to see if it is valid to put this block at the specified coordinates. Args: world, x, y, z
      */
     @Override
     public boolean canPlaceBlockAt(final World worldObj, final int x, final int y, final int z) {
@@ -398,9 +399,8 @@ public class BlockHellFire extends BlockFire {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister IIconRegister) {
-        this.IIconArray = new IIcon[] {
-            IIconRegister.registerIcon(GTPlusPlus.ID + ":" + "hellfire/" + "blockHellFire" + "_layer_0"),
-            IIconRegister.registerIcon(GTPlusPlus.ID + ":" + "hellfire/" + "blockHellFire" + "_layer_1") };
+        this.IIconArray = new IIcon[] { IIconRegister.registerIcon(GTPlusPlus.ID + ":hellfire/blockHellFire_layer_0"),
+            IIconRegister.registerIcon(GTPlusPlus.ID + ":hellfire/blockHellFire_layer_1") };
     }
 
     @Override
@@ -429,13 +429,13 @@ public class BlockHellFire extends BlockFire {
     private static class FireInfo {
 
         private int encouragement = 0;
-        private int flammibility = 0;
+        private int flammability = 0;
     }
 
     private final IdentityHashMap<Block, FireInfo> blockInfo = Maps.newIdentityHashMap();
 
     @Override
-    public void setFireInfo(final Block block, final int encouragement, final int flammibility) {
+    public void setFireInfo(final Block block, final int encouragement, final int flammability) {
         try {
             if (block == Blocks.air) {
                 throw new IllegalArgumentException("Tried to set air on fire... This is bad.");
@@ -445,17 +445,19 @@ public class BlockHellFire extends BlockFire {
                 return;
             }
             this.field_149849_a[id] = encouragement;
-            this.field_149848_b[id] = flammibility;
+            this.field_149848_b[id] = flammability;
 
-            final FireInfo info = this.getInfo(block, true);
+            final FireInfo info = this.getInfo(block);
             info.encouragement = encouragement;
-            info.flammibility = flammibility;
-        } catch (Throwable t) {}
+            info.flammability = flammability;
+        } catch (Exception e) {
+            e.printStackTrace(GTLog.err);
+        }
     }
 
-    private FireInfo getInfo(final Block block, final boolean garentee) {
+    private FireInfo getInfo(final Block block) {
         FireInfo ret = this.blockInfo.get(block);
-        if ((ret == null) && garentee) {
+        if (ret == null) {
             ret = new FireInfo();
             this.blockInfo.put(block, ret);
         }
@@ -465,10 +467,10 @@ public class BlockHellFire extends BlockFire {
     @Override
     public void rebuildFireInfo() {
         for (int x = 0; x < 4096; x++) {
-            // If we care.. we could detect changes in here and make sure we
+            // If we care... we could detect changes in here and make sure we
             // keep them, however
             // it's my thinking that anyone who hacks into the private variables
-            // should DIAF and we don't care about them.
+            // should reconsider, and we don't care about them.
             this.field_149849_a[x] = 0;
             this.field_149848_b[x] = 0;
         }
@@ -477,7 +479,7 @@ public class BlockHellFire extends BlockFire {
             final int id = Block.getIdFromBlock(e.getKey());
             if ((id >= 0) && (id < 4096)) {
                 this.field_149849_a[id] = e.getValue().encouragement;
-                this.field_149848_b[id] = e.getValue().flammibility;
+                this.field_149848_b[id] = e.getValue().flammability;
             }
         }
     }
@@ -527,7 +529,7 @@ public class BlockHellFire extends BlockFire {
         final int oldChance, final ForgeDirection face) {
         final int newChance = world.getBlock(x, y, z)
             .getFireSpreadSpeed(world, x, y, z, face);
-        return (newChance > oldChance ? newChance : oldChance);
+        return Math.max(newChance, oldChance);
     }
     /*
      * ================================= Forge Start ======================================
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockLightGlass.java b/src/main/java/gtPlusPlus/core/block/general/BlockLightGlass.java
index 1e4df5c399..097d5d8a5e 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockLightGlass.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockLightGlass.java
@@ -23,11 +23,10 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
 public class BlockLightGlass extends BlockAir {
 
     private int state = 0;
-    private final int a = 255;
     private int r = 255;
     private int g = 0;
     private int b = 0;
-    private int hex;
+    private final int a = 255;
 
     public BlockLightGlass(final boolean bool) {
         super();
@@ -35,7 +34,7 @@ public class BlockLightGlass extends BlockAir {
         this.setBlockName("blockMFEffect");
         this.setLightLevel(12F);
         setHardness(0.1F);
-        setBlockTextureName(GTPlusPlus.ID + ":" + "blockMFEffect");
+        setBlockTextureName(GTPlusPlus.ID + ":blockMFEffect");
         setStepSound(Block.soundTypeGlass);
         GameRegistry.registerBlock(this, "blockMFEffect");
 
@@ -78,7 +77,7 @@ public class BlockLightGlass extends BlockAir {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister iIcon) {
-        this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + "blockMFEffect");
+        this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":blockMFEffect");
     }
 
     @Override
@@ -120,8 +119,7 @@ public class BlockLightGlass extends BlockAir {
                 this.state = 0;
             }
         }
-        this.hex = (this.a << 24) + (this.r << 16) + (this.g << 8) + (this.b);
-        return this.hex;
+        return (this.r << 16) + (this.g << 8) + (this.b) + (this.a << 24);
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockMiningExplosives.java b/src/main/java/gtPlusPlus/core/block/general/BlockMiningExplosives.java
index 20b6fff9e6..3aec9ef427 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockMiningExplosives.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockMiningExplosives.java
@@ -2,8 +2,6 @@ package gtPlusPlus.core.block.general;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
 
-import java.util.Random;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockTNT;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -72,14 +70,6 @@ public class BlockMiningExplosives extends BlockTNT {
     }
 
     /**
-     * Returns the quantity of items to drop on block destruction.
-     */
-    @Override
-    public int quantityDropped(final Random random) {
-        return 1;
-    }
-
-    /**
      * Called upon the block being destroyed by an explosion
      */
     @Override
@@ -103,7 +93,7 @@ public class BlockMiningExplosives extends BlockTNT {
      */
     @Override
     public void onBlockDestroyedByPlayer(final World world, final int x, final int y, final int z, final int meta) {
-        this.func_150114_a(world, x, y, z, meta, (EntityLivingBase) null);
+        this.func_150114_a(world, x, y, z, meta, null);
     }
 
     // TODO Spawns Primed TNT?
@@ -175,19 +165,11 @@ public class BlockMiningExplosives extends BlockTNT {
         }
     }
 
-    /**
-     * Return whether this block can drop from an explosion.
-     */
-    @Override
-    public boolean canDropFromExplosion(final Explosion bang) {
-        return false;
-    }
-
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister iconRegister) {
-        this.blockIcon = iconRegister.registerIcon(GTPlusPlus.ID + ":" + "chrono/" + "MetalSheet2");
-        this.textureTop = iconRegister.registerIcon(GTPlusPlus.ID + ":" + "chrono/" + "MetalFunnel");
-        this.textureBottom = iconRegister.registerIcon(GTPlusPlus.ID + ":" + "chrono/" + "MetalPanel");
+        this.blockIcon = iconRegister.registerIcon(GTPlusPlus.ID + ":chrono/MetalSheet2");
+        this.textureTop = iconRegister.registerIcon(GTPlusPlus.ID + ":chrono/MetalFunnel");
+        this.textureBottom = iconRegister.registerIcon(GTPlusPlus.ID + ":chrono/MetalPanel");
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
index e12e829260..f11c3d9a9b 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
@@ -47,7 +47,7 @@ public class BlockSuperLight extends BlockContainer {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlBigBlue");
+        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":SwirlBigBlue");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java
index 191a2a8f92..dcbe41f150 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java
@@ -13,6 +13,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import gregtech.api.util.GTLog;
 import gregtech.common.items.MetaGeneratedTool01;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.minecraft.CubicObject;
@@ -27,7 +28,7 @@ public class BlockCircuitProgrammer extends BasicTileBlockWithTooltip {
     /**
      * Determines which tooltip is displayed within the itemblock.
      */
-    private final int mTooltipID = 4;
+    private final int mTooltipID = 2;
 
     @Override
     public int getTooltipID() {
@@ -39,7 +40,7 @@ public class BlockCircuitProgrammer extends BasicTileBlockWithTooltip {
     }
 
     /**
-     * Called upon block activation (right click on the block.)
+     * Called upon block activation (right-click on the block.)
      */
     @Override
     public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
@@ -60,11 +61,12 @@ public class BlockCircuitProgrammer extends BasicTileBlockWithTooltip {
                         mDidScrewDriver = tile.onScrewdriverRightClick((byte) side, player, x, y, z);
                     }
                 }
-            } catch (final Throwable t) {}
-
+            } catch (Exception e) {
+                e.printStackTrace(GTLog.err);
+            }
             if (!mDidScrewDriver) {
                 final TileEntity te = world.getTileEntity(x, y, z);
-                if ((te != null) && (te instanceof TileEntityCircuitProgrammer)) {
+                if (te instanceof TileEntityCircuitProgrammer) {
                     player.openGui(GTplusplus.instance, GuiHandler.GUI8, world, x, y, z);
                     return true;
                 }
@@ -141,12 +143,10 @@ public class BlockCircuitProgrammer extends BasicTileBlockWithTooltip {
 
     @Override
     public CubicObject<String>[] getCustomTextureDirectoryObject() {
-        String[] aTexData = new String[] { GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_G",
-            GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_TECH_PANEL_B",
-            GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
-            GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
-            GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
-            GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I" };
+        String[] aTexData = new String[] { GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_H",
+            GTPlusPlus.ID + ":metro/TEXTURE_TECH_PANEL_B", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_I",
+            GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_I", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_I",
+            GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_I" };
         CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<>(aTexData) };
         return aTextureData;
     }
diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockDecayablesChest.java b/src/main/java/gtPlusPlus/core/block/machine/BlockDecayablesChest.java
index 7b42f08fa8..67ad10bb69 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/BlockDecayablesChest.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockDecayablesChest.java
@@ -36,12 +36,12 @@ public class BlockDecayablesChest extends BlockContainer implements ITileTooltip
     private IIcon textureBottom;
 
     @SideOnly(Side.CLIENT)
-    private IIcon textureFront;
+    private IIcon textureSide;
 
     /**
      * Determines which tooltip is displayed within the itemblock.
      */
-    private final int mTooltipID = 5;
+    private final int mTooltipID = 3;
 
     @Override
     public int getTooltipID() {
@@ -118,17 +118,17 @@ public class BlockDecayablesChest extends BlockContainer implements ITileTooltip
         return switch (ordinalSide) {
             case 0 -> textureBottom;
             case 1 -> textureTop;
-            default -> textureFront;
+            default -> textureSide;
         };
     }
 
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "DecayablesChest_top");
-        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "DecayablesChest_top");
-        this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "DecayablesChest_side");
-        this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "DecayablesChest_bottom");
+        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/DecayablesChest_top");
+        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/DecayablesChest_top");
+        this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/DecayablesChest_bottom");
+        this.textureSide = p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/DecayablesChest_Side");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockFishTrap.java b/src/main/java/gtPlusPlus/core/block/machine/BlockFishTrap.java
index 0a91c76d60..cf54a044e6 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/BlockFishTrap.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockFishTrap.java
@@ -27,19 +27,10 @@ import gtPlusPlus.core.util.minecraft.InventoryUtils;
 
 public class BlockFishTrap extends BlockContainer implements ITileTooltip {
 
-    @SideOnly(Side.CLIENT)
-    private IIcon textureTop;
-
-    @SideOnly(Side.CLIENT)
-    private IIcon textureBottom;
-
-    @SideOnly(Side.CLIENT)
-    private IIcon textureFront;
-
     /**
      * Determines which tooltip is displayed within the itemblock.
      */
-    private final int mTooltipID = 0;
+    private final int mTooltipID = 1;
 
     @Override
     public int getTooltipID() {
@@ -61,22 +52,20 @@ public class BlockFishTrap extends BlockContainer implements ITileTooltip {
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(final int ordinalSide, final int meta) {
-        return ordinalSide == 1 ? this.textureTop
-            : (ordinalSide == 0 ? this.textureBottom
-                : ((ordinalSide != 2) && (ordinalSide != 4) ? this.blockIcon : this.textureFront));
+        return this.blockIcon;
     }
 
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "fishtrap");
-        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "fishtrap");
-        this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "fishtrap");
-        this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "fishtrap");
+        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/fishtrap");
+        p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/fishtrap");
+        p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/fishtrap");
+        p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/fishtrap");
     }
 
     /**
-     * Called upon block activation (right click on the block.)
+     * Called upon block activation (right-click on the block.)
      */
     @Override
     public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
@@ -86,7 +75,7 @@ public class BlockFishTrap extends BlockContainer implements ITileTooltip {
         }
 
         final TileEntity te = world.getTileEntity(x, y, z);
-        if ((te != null) && (te instanceof TileEntityFishTrap)) {
+        if (te instanceof TileEntityFishTrap) {
             player.openGui(GTplusplus.instance, 5, world, x, y, z);
             return true;
         }
diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java
index 510caf3e14..5ec07bb9e3 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java
@@ -14,6 +14,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import gregtech.api.util.GTLog;
 import gregtech.common.items.MetaGeneratedTool01;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.minecraft.CubicObject;
@@ -29,7 +30,7 @@ public class BlockFlaskSetter extends BasicTileBlockWithTooltip {
     /**
      * Determines which tooltip is displayed within the itemblock.
      */
-    private final int mTooltipID = 8;
+    private final int mTooltipID = 5;
 
     @Override
     public int getTooltipID() {
@@ -68,11 +69,12 @@ public class BlockFlaskSetter extends BasicTileBlockWithTooltip {
                         mDidScrewDriver = tile.onScrewdriverRightClick((byte) side, player, x, y, z);
                     }
                 }
-            } catch (final Throwable t) {}
-
+            } catch (Exception e) {
+                e.printStackTrace(GTLog.err);
+            }
             if (!mDidScrewDriver) {
                 final TileEntity te = world.getTileEntity(x, y, z);
-                if ((te != null) && (te instanceof TileEntityVolumetricFlaskSetter aTile)) {
+                if (te instanceof TileEntityVolumetricFlaskSetter) {
                     player.openGui(GTplusplus.instance, GuiHandler.GUI18, world, x, y, z);
                     // new Packet_VolumetricFlaskGui2(aTile, aTile.getCustomValue());
                     return true;
@@ -145,12 +147,10 @@ public class BlockFlaskSetter extends BasicTileBlockWithTooltip {
 
     @Override
     public CubicObject<String>[] getCustomTextureDirectoryObject() {
-        String[] aTexData = new String[] { GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_A",
-            GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_TECH_PANEL_C",
-            GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H",
-            GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H",
-            GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H",
-            GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H" };
+        String[] aTexData = new String[] { GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_H",
+            GTPlusPlus.ID + ":metro/TEXTURE_TECH_PANEL_C", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_H",
+            GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_H", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_H",
+            GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_H" };
         CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<>(aTexData) };
         return aTextureData;
     }
diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockPestKiller.java b/src/main/java/gtPlusPlus/core/block/machine/BlockPestKiller.java
index 95e7f3bc56..d4211a7831 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/BlockPestKiller.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockPestKiller.java
@@ -40,7 +40,7 @@ public class BlockPestKiller extends BlockContainer implements ITileTooltip {
     /**
      * Determines which tooltip is displayed within the itemblock.
      */
-    private final int mTooltipID = 6;
+    private final int mTooltipID = 4;
 
     @Override
     public int getTooltipID() {
@@ -69,11 +69,11 @@ public class BlockPestKiller extends BlockContainer implements ITileTooltip {
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
         this.blockIcon = p_149651_1_
-            .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
-        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "MACHINE_PESTKILLER_TOP");
+            .registerIcon(GTPlusPlus.ID + ":TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
+        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/MACHINE_PESTKILLER_TOP");
         this.textureBottom = p_149651_1_.registerIcon("planks_acacia");
         this.textureFront = p_149651_1_
-            .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
+            .registerIcon(GTPlusPlus.ID + ":TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
     }
 
     /**
@@ -87,7 +87,7 @@ public class BlockPestKiller extends BlockContainer implements ITileTooltip {
         }
 
         final TileEntity te = world.getTileEntity(x, y, z);
-        if ((te != null) && (te instanceof TileEntityPestKiller)) {
+        if (te instanceof TileEntityPestKiller) {
             player.openGui(GTplusplus.instance, GuiHandler.GUI15, world, x, y, z);
             return true;
         }
diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java
index 195240958f..acfc3a02ff 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java
@@ -42,11 +42,9 @@ public class BlockProjectTable extends BlockContainer implements ITileTooltip {
     /**
      * Determines which tooltip is displayed within the itemblock.
      */
-    private final int mTooltipID = 3;
-
     @Override
     public int getTooltipID() {
-        return this.mTooltipID;
+        return 0;
     }
 
     public BlockProjectTable() {
@@ -70,10 +68,10 @@ public class BlockProjectTable extends BlockContainer implements ITileTooltip {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "machine_top");
-        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "cover_crafting");
-        this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "machine_top");
-        this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "machine_top");
+        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/machine_top");
+        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/cover_crafting");
+        this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/machine_top");
+        this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":TileEntities/machine_top");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
index cf50da52a3..9da305cbd2 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
@@ -21,28 +21,26 @@ public class ItemBlockBasicTile extends ItemBlock {
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-        if (this.mID == 0) { // Fish trap
+        if (this.mID == 1) { // Fish trap
             list.add("This trap catches fish faster if surrounded by more water blocks");
-            list.add("Can also be placed beside upto 4 other fish traps");
+            list.add("Can also be placed beside up to 4 other fish traps");
             list.add("Requires at least two faces touching water");
             list.add("1/1000 chance to produce triple loot.");
-        } else if (this.mID == 4) { // Circuit Table
+        } else if (this.mID == 2) { // Circuit Table
             list.add("Easy Circuit Configuration");
             list.add("Change default setting with a Screwdriver");
             list.add("Default is used to select slot for auto-insertion");
-        } else if (this.mID == 5) { // Decayables Chest
+        } else if (this.mID == 3) { // Decayables Chest
             list.add("Chest which holds radioactive materials");
             list.add("Items which decay will tick while inside");
-            list.add("Place with right click");
-        } else if (this.mID == 6) { // Butterfly Killer
+            list.add("Place with right-click");
+        } else if (this.mID == 4) { // Butterfly Killer
             list.add("Kills Forestry Butterflies, Bats and other pests");
             list.add("Use either Formaldehyde or Hydrogen cyanide");
             list.add("Be weary of your neighbours");
-        } else if (this.mID == 8) { // Volumetric Flask Setter
+        } else if (this.mID == 5) { // Volumetric Flask Setter
             list.add("Easy Flask Configuration");
             list.add("Configure default input slot with a screwdriver");
-        } else if (this.mID == 9) {
-
         } else {
             list.add("Bad Tooltip ID - " + mID);
         }
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
index 92876663f0..a69d9eab34 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
@@ -1,6 +1,5 @@
 package gtPlusPlus.core.item.base.itemblock;
 
-import java.util.HashMap;
 import java.util.List;
 
 import net.minecraft.block.Block;
@@ -11,6 +10,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
+import gregtech.api.util.GTLog;
 import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
 import gtPlusPlus.core.block.base.BlockBaseModular;
 import gtPlusPlus.core.block.base.BlockBaseOre;
@@ -22,8 +22,6 @@ import gtPlusPlus.core.util.sys.KeyboardUtils;
 
 public class ItemBlockGtBlock extends ItemBlock {
 
-    public static HashMap<String, String> sNameCache = new HashMap<>();
-
     protected final int blockColour;
     private int sRadiation;
 
@@ -50,7 +48,6 @@ public class ItemBlockGtBlock extends ItemBlock {
         } else {
             this.blockColour = block.getBlockColor();
         }
-
         if (block instanceof BlockBaseModular g) {
             this.mMaterial = g.getMaterialEx();
             this.thisBlockType = g.thisBlock;
@@ -60,55 +57,23 @@ public class ItemBlockGtBlock extends ItemBlock {
         }
     }
 
-    public int getBlockTypeMeta() {
-        if (this.thisBlockType.equals(BlockTypes.STANDARD)) {
-            return 0;
-        } else if (this.thisBlockType.equals(BlockTypes.FRAME)) {
-            return 1;
-        } else if (this.thisBlockType.equals(BlockTypes.ORE)) {
-            return 2;
-        }
-        return 0;
-    }
-
-    public String getUnlocalizedBlockName() {
-        return "block." + mMaterial.getUnlocalizedName()
-            + "."
-            + this.thisBlockType.name()
-                .toLowerCase();
-    }
-
-    public String GetProperName() {
-        String tempIngot = sNameCache.get(getUnlocalizedBlockName());
-        if (tempIngot == null) {
-            tempIngot = "BAD.UNLOCAL.NAME";
-        }
-        return tempIngot;
-    }
-
     @Override
     public String getItemStackDisplayName(ItemStack stack) {
         return this.thisBlock.getLocalizedName();
     }
 
-    public int getRenderColor(final int aMeta) {
-        return this.blockColour;
-    }
-
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
 
         if (this.mMaterial != null) {
             list.add(this.mMaterial.vChemicalFormula);
         } else {
-
             try {
                 BlockBaseModular g = (BlockBaseModular) thisBlock;
                 this.mMaterial = g.getMaterialEx();
-            } catch (Throwable t) {
-
+            } catch (Exception e) {
+                e.printStackTrace(GTLog.err);
             }
-
             // list.add("Material is Null.");
         }
 
@@ -116,10 +81,7 @@ public class ItemBlockGtBlock extends ItemBlock {
             if (KeyboardUtils.isCtrlKeyDown()) {
                 Block b = Block.getBlockFromItem(stack.getItem());
                 if (b != null) {
-
-                    String aTool = b.getHarvestTool(stack.getItemDamage());
                     int aMiningLevel1 = b.getHarvestLevel(stack.getItemDamage());
-
                     if (this.mMaterial != null) {
                         list.add("Mining Level: " + Math.min(Math.max(aMiningLevel1, 0), 5));
                         list.add("Contains:    ");
@@ -141,7 +103,6 @@ public class ItemBlockGtBlock extends ItemBlock {
         } else {
             Block b = Block.getBlockFromItem(stack.getItem());
             if (b != null) {
-                String aTool = b.getHarvestTool(stack.getItemDamage());
                 int aMiningLevel1 = b.getHarvestLevel(stack.getItemDamage());
                 list.add("Mining Level: " + Math.min(Math.max(aMiningLevel1, 0), 5));
             }
diff --git a/src/main/java/gtPlusPlus/core/lib/GTPPCore.java b/src/main/java/gtPlusPlus/core/lib/GTPPCore.java
index db30eecb33..a4aecd5982 100644
--- a/src/main/java/gtPlusPlus/core/lib/GTPPCore.java
+++ b/src/main/java/gtPlusPlus/core/lib/GTPPCore.java
@@ -40,8 +40,6 @@ public class GTPPCore {
     public static final Supplier<String> GT_Tooltip_Radioactive = () -> StatCollector
         .translateToLocal("GTPP.core.GT_Tooltip_Radioactive");
 
-    public static final String SEPERATOR = "/";
-
     /**
      * Lists/Maps
      */
diff --git a/src/main/resources/assets/miscutils/textures/blocks/FirePit/Firepit.tcn b/src/main/resources/assets/miscutils/textures/blocks/FirePit/Firepit.tcn
deleted file mode 100644
index 453b7325c8..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/FirePit/Firepit.tcn
+++ /dev/null
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricManipulator.png b/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricManipulator.png
new file mode 100644
index 0000000000..6514089c64
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricManipulator.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricManipulator.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricManipulator.png.mcmeta
new file mode 100644
index 0000000000..cba1c43271
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricManipulator.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation":{
+    "frametime":2,
+    "frames": [0,1,2,3,4,5,6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricManipulatorStatic.png b/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricManipulatorStatic.png
new file mode 100644
index 0000000000..29b3a74f34
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricManipulatorStatic.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricShieldingCore.png b/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricShieldingCore.png
new file mode 100644
index 0000000000..14b5e673d0
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricShieldingCore.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricShieldingCore.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricShieldingCore.png.mcmeta
new file mode 100644
index 0000000000..10cf8c6afd
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricShieldingCore.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation":{
+    "frametime":1,
+    "frames": [0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricShieldingCoreStatic.png b/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricShieldingCoreStatic.png
new file mode 100644
index 0000000000..53e0e51c06
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/CosmicFabricShieldingCoreStatic.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/ForceField.png b/src/main/resources/assets/miscutils/textures/blocks/qft/ForceField.png
new file mode 100644
index 0000000000..32254623d1
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/ForceField.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/ForceFieldGlass.png b/src/main/resources/assets/miscutils/textures/blocks/qft/ForceFieldGlass.png
new file mode 100644
index 0000000000..ad6502026e
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/ForceFieldGlass.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedManipulator.png b/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedManipulator.png
new file mode 100644
index 0000000000..c5d7fe80b2
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedManipulator.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedManipulator.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedManipulator.png.mcmeta
new file mode 100644
index 0000000000..b0c531fa79
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedManipulator.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation":{
+    "frametime":1,
+    "frames": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedManipulatorStatic.png b/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedManipulatorStatic.png
new file mode 100644
index 0000000000..40d9b8f31b
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedManipulatorStatic.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedShieldingCore.png b/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedShieldingCore.png
new file mode 100644
index 0000000000..4e2e761fa8
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedShieldingCore.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedShieldingCore.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedShieldingCore.png.mcmeta
new file mode 100644
index 0000000000..9720a23866
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedShieldingCore.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation":{
+    "frametime":1,
+    "frames": [0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedShieldingCoreStatic.png b/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedShieldingCoreStatic.png
new file mode 100644
index 0000000000..c822112126
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/InfinityInfusedShieldingCoreStatic.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/Manipulator_Top.png b/src/main/resources/assets/miscutils/textures/blocks/qft/Manipulator_Top.png
new file mode 100644
index 0000000000..2a5b8aec95
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/Manipulator_Top.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronPulseManipulator.png b/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronPulseManipulator.png
new file mode 100644
index 0000000000..97c32e5988
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronPulseManipulator.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronPulseManipulator.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronPulseManipulator.png.mcmeta
new file mode 100644
index 0000000000..cba1c43271
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronPulseManipulator.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation":{
+    "frametime":2,
+    "frames": [0,1,2,3,4,5,6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronPulseManipulatorStatic.png b/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronPulseManipulatorStatic.png
new file mode 100644
index 0000000000..29b3a74f34
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronPulseManipulatorStatic.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronShieldingCore.png b/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronShieldingCore.png
new file mode 100644
index 0000000000..9c14ae0abf
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronShieldingCore.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronShieldingCore.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronShieldingCore.png.mcmeta
new file mode 100644
index 0000000000..163c81b6a1
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronShieldingCore.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation":{
+    "frametime":1,
+    "frames": [0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronShieldingCoreStatic.png b/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronShieldingCoreStatic.png
new file mode 100644
index 0000000000..d4cd1c1dee
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/NeutronShieldingCoreStatic.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeBendingCore.png b/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeBendingCore.png
new file mode 100644
index 0000000000..bb8bee0ce7
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeBendingCore.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeBendingCore.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeBendingCore.png.mcmeta
new file mode 100644
index 0000000000..163c81b6a1
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeBendingCore.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation":{
+    "frametime":1,
+    "frames": [0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeBendingCoreStatic.png b/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeBendingCoreStatic.png
new file mode 100644
index 0000000000..ca38aad14f
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeBendingCoreStatic.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeContinuumRipper.png b/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeContinuumRipper.png
new file mode 100644
index 0000000000..bb21d8af98
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeContinuumRipper.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeContinuumRipper.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeContinuumRipper.png.mcmeta
new file mode 100644
index 0000000000..c8988534a9
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeContinuumRipper.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation":{
+    "frametime":1,
+    "frames": [0,1,2,3,4,5,6,7]
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeContinuumRipperStatic.png b/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeContinuumRipperStatic.png
new file mode 100644
index 0000000000..c54c56daaf
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/SpaceTimeContinuumRipperStatic.png
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/forceFieldGlassTop.png b/src/main/resources/assets/miscutils/textures/blocks/qft/forceFieldGlassTop.png
new file mode 100644
index 0000000000..97dbb4049e
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/forceFieldGlassTop.png