add the glass (#208)

Former-commit-id: 708159b2af4bd7f321f0e17122819393b1230ea0

10 files changed, 273 insertions, 18 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java
index 27d6f30e0c..1e5946b78d 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java
@@ -2,6 +2,8 @@ package com.github.bartimaeusnek.bartworks.API;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
 
+import com.github.bartimaeusnek.bartworks.common.blocks.BW_GlasBlocks;
+import com.github.bartimaeusnek.bartworks.common.blocks.BW_GlasBlocks2;
 import com.gtnewhorizon.structurelib.structure.IStructureElement;
 import cpw.mods.fml.common.registry.GameRegistry;
 import java.util.ArrayList;
@@ -26,7 +28,14 @@ public class BorosilicateGlass {
     private static List<Pair<Block, Integer>> representatives;
 
     private static Block getGlassBlock() {
-        if (block == null) block = GameRegistry.findBlock("bartworks", "BW_GlasBlocks");
+        if (block == null || !(block instanceof BW_GlasBlocks))
+            block = GameRegistry.findBlock("bartworks", "BW_GlasBlocks");
+        return block;
+    }
+
+    private static Block getGlassBlock2() {
+        if (block == null || !(block instanceof BW_GlasBlocks2))
+            block = GameRegistry.findBlock("bartworks", "BW_GlasBlocks2");
         return block;
     }
 
@@ -42,6 +51,9 @@ public class BorosilicateGlass {
             ret.add(Pair.of(block, 5));
             ret.add(Pair.of(block, 13));
             ret.add(Pair.of(block, 14));
+            ret.add(Pair.of(block, 15));
+            block = getGlassBlock2();
+            ret.add(Pair.of(block, 0));
             representatives = ret;
         }
         return representatives;
@@ -55,7 +67,7 @@ public class BorosilicateGlass {
      * Check if there is at least one type of boroglass in that tier.
      */
     public static boolean hasGlassInTier(int tier) {
-        return tier >= 3 && tier <= 10;
+        return tier >= 3 && tier <= 12;
     }
 
     /**
@@ -121,6 +133,7 @@ public class BorosilicateGlass {
      */
     public static byte getTier(Block block, int meta) {
         byte ret;
+        if (block instanceof BW_GlasBlocks2) meta += 16;
         switch (meta) {
             case 1:
                 ret = 4;
@@ -144,9 +157,21 @@ public class BorosilicateGlass {
             case 14:
                 ret = 10;
                 break;
+            case 15:
+                ret = 11;
+                break;
+            case 16:
+                ret = 12;
+                break;
             default:
                 ret = 3;
         }
-        return block == getGlassBlock() ? ret : -1;
+        if (block instanceof BW_GlasBlocks) {
+            return block == getGlassBlock() ? ret : -1;
+        }
+        if (block instanceof BW_GlasBlocks2) {
+            return block == getGlassBlock2() ? ret : -1;
+        }
+        return -1;
     }
 }
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java
index f464b249d8..1e0ee45c9d 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java
@@ -23,6 +23,7 @@
 package com.github.bartimaeusnek.bartworks.client.renderer;
 
 import com.github.bartimaeusnek.bartworks.common.blocks.BW_GlasBlocks;
+import com.github.bartimaeusnek.bartworks.common.blocks.BW_GlasBlocks2;
 import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
@@ -78,16 +79,29 @@ public class RendererGlasBlock implements ISimpleBlockRenderingHandler {
     public boolean renderWorldBlock(
             IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
         // renderer.setRenderBounds(0.001,0.001,0.001,0.999,0.999,0.999);
-        renderer.renderStandardBlock(ItemRegistry.bw_fake_glasses, x, y, z);
         // renderer.setRenderBounds(0,0,0,1,1,1);
-        renderer.renderStandardBlockWithColorMultiplier(
-                block,
-                x,
-                y,
-                z,
-                ((BW_GlasBlocks) block).getColor(world.getBlockMetadata(x, y, z))[0] / 255f,
-                ((BW_GlasBlocks) block).getColor(world.getBlockMetadata(x, y, z))[1] / 255f,
-                ((BW_GlasBlocks) block).getColor(world.getBlockMetadata(x, y, z))[2] / 255f);
+        if (block instanceof BW_GlasBlocks) {
+            renderer.renderStandardBlock(ItemRegistry.bw_fake_glasses, x, y, z);
+            renderer.renderStandardBlockWithColorMultiplier(
+                    block,
+                    x,
+                    y,
+                    z,
+                    ((BW_GlasBlocks) block).getColor(world.getBlockMetadata(x, y, z))[0] / 255f,
+                    ((BW_GlasBlocks) block).getColor(world.getBlockMetadata(x, y, z))[1] / 255f,
+                    ((BW_GlasBlocks) block).getColor(world.getBlockMetadata(x, y, z))[2] / 255f);
+        }
+        if (block instanceof BW_GlasBlocks2) {
+            renderer.renderStandardBlock(ItemRegistry.bw_fake_glasses2, x, y, z);
+            renderer.renderStandardBlockWithColorMultiplier(
+                    block,
+                    x,
+                    y,
+                    z,
+                    ((BW_GlasBlocks2) block).getColor(world.getBlockMetadata(x, y, z))[0] / 255f,
+                    ((BW_GlasBlocks2) block).getColor(world.getBlockMetadata(x, y, z))[1] / 255f,
+                    ((BW_GlasBlocks2) block).getColor(world.getBlockMetadata(x, y, z))[2] / 255f);
+        }
         return true;
     }
 
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks2.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks2.java
new file mode 100644
index 0000000000..d2d149fd6e
--- /dev/null
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks2.java
@@ -0,0 +1,172 @@
+package com.github.bartimaeusnek.bartworks.common.blocks;
+
+import com.github.bartimaeusnek.bartworks.API.SideReference;
+import com.github.bartimaeusnek.bartworks.client.renderer.RendererGlasBlock;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class BW_GlasBlocks2 extends BW_Blocks {
+    @SideOnly(Side.CLIENT)
+    private IIcon[] connectedTexture;
+
+    private final boolean connectedTex;
+    private boolean fake;
+    private short[][] color = new short[this.textureNames.length][3];
+
+    public BW_GlasBlocks2(String name, String[] texture, CreativeTabs tabs) {
+        super(name, texture, tabs, Material.glass);
+        this.connectedTex = false;
+    }
+
+    public BW_GlasBlocks2(
+            String name, String[] texture, short[][] color, CreativeTabs tabs, boolean connectedTex, boolean fake) {
+        super(name, texture, tabs, Material.glass);
+        this.connectedTex = connectedTex;
+        this.color = color;
+        this.fake = fake;
+    }
+
+    public short[] getColor(int meta) {
+        return meta < this.texture.length ? this.color[meta] : this.color[0];
+    }
+
+    @Override
+    public boolean isOpaqueCube() {
+        return false;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public boolean shouldSideBeRendered(IBlockAccess worldClient, int xCoord, int yCoord, int zCoord, int aSide) {
+        if (worldClient.getBlock(xCoord, yCoord, zCoord) instanceof BW_GlasBlocks2) return false;
+        return super.shouldSideBeRendered(worldClient, xCoord, yCoord, zCoord, aSide);
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(int side, int meta) {
+        return meta < this.texture.length ? this.texture[meta] : this.texture[0];
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(IIconRegister par1IconRegister) {
+        if (!this.connectedTex) {
+            this.texture = new IIcon[this.textureNames.length];
+            for (int i = 0; i < this.textureNames.length; i++) {
+                this.texture[i] = par1IconRegister.registerIcon(this.textureNames[i]);
+            }
+            return;
+        }
+        this.texture = new IIcon[this.textureNames.length];
+        this.connectedTexture = new IIcon[16];
+        for (int i = 0; i < this.textureNames.length; i++) {
+            this.texture[i] = par1IconRegister.registerIcon(this.textureNames[i]);
+            String[] splitname = this.textureNames[0].split(":");
+            for (int j = 0; j < 16; j++) {
+                this.connectedTexture[j] = par1IconRegister.registerIcon(splitname[0] + ":connectedTex/"
+                        + "BoronSilicateGlassBlock" + '/' + "BoronSilicateGlassBlock" + '_' + j);
+            }
+        }
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(IBlockAccess worldClient, int xCoord, int yCoord, int zCoord, int aSide) {
+        if (!this.connectedTex) return super.getIcon(worldClient, xCoord, yCoord, zCoord, aSide);
+
+        ForgeDirection dir = ForgeDirection.getOrientation(aSide);
+        byte sides = 0;
+        switch (dir) {
+            case UP:
+            case DOWN: {
+                if (worldClient.getBlock(xCoord, yCoord, zCoord - 1) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b0001);
+                if (worldClient.getBlock(xCoord, yCoord, zCoord + 1) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b0010);
+                if (worldClient.getBlock(xCoord - 1, yCoord, zCoord) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b0100);
+                if (worldClient.getBlock(xCoord + 1, yCoord, zCoord) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b1000);
+                break;
+            }
+            case EAST: {
+                if (worldClient.getBlock(xCoord, yCoord + 1, zCoord) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b0001);
+                if (worldClient.getBlock(xCoord, yCoord - 1, zCoord) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b0010);
+                if (worldClient.getBlock(xCoord, yCoord, zCoord + 1) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b0100);
+                if (worldClient.getBlock(xCoord, yCoord, zCoord - 1) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b1000);
+                break;
+            }
+            case WEST: {
+                if (worldClient.getBlock(xCoord, yCoord + 1, zCoord) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b0001);
+                if (worldClient.getBlock(xCoord, yCoord - 1, zCoord) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b0010);
+                if (worldClient.getBlock(xCoord, yCoord, zCoord - 1) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b0100);
+                if (worldClient.getBlock(xCoord, yCoord, zCoord + 1) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b1000);
+                break;
+            }
+            case NORTH: {
+                if (worldClient.getBlock(xCoord, yCoord + 1, zCoord) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b0001);
+                if (worldClient.getBlock(xCoord, yCoord - 1, zCoord) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b0010);
+                if (worldClient.getBlock(xCoord + 1, yCoord, zCoord) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b0100);
+                if (worldClient.getBlock(xCoord - 1, yCoord, zCoord) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b1000);
+                break;
+            }
+            case SOUTH: {
+                if (worldClient.getBlock(xCoord, yCoord + 1, zCoord) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b0001);
+                if (worldClient.getBlock(xCoord, yCoord - 1, zCoord) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b0010);
+                if (worldClient.getBlock(xCoord - 1, yCoord, zCoord) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b0100);
+                if (worldClient.getBlock(xCoord + 1, yCoord, zCoord) instanceof BW_GlasBlocks2)
+                    sides = (byte) (sides | 0b1000);
+                break;
+            }
+            case UNKNOWN:
+            default: {
+                break;
+            }
+        }
+        return this.connectedTexture[sides];
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int getRenderBlockPass() {
+        return 1;
+    }
+
+    @Override
+    public int getRenderType() {
+        if (!this.fake && SideReference.Side.Client) return RendererGlasBlock.RID;
+        else return 0;
+    }
+
+    @Override
+    public boolean renderAsNormalBlock() {
+        return false;
+    }
+
+    @Override
+    protected boolean canSilkHarvest() {
+        return false;
+    }
+}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java
index dca6662c2e..bba88a0859 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java
@@ -92,6 +92,7 @@ public class BeforeGTPreload implements Runnable {
                     .getField("bw_glasses")
                     .get(null);
             GameRegistry.registerBlock(bw_glasses[0], BW_ItemBlocks.class, "BW_GlasBlocks");
+            GameRegistry.registerBlock(bw_glasses[1], BW_ItemBlocks.class, "BW_GlasBlocks2");
             OreDictionary.registerOre("blockGlassHV", new ItemStack(Blocks.glass, 1, Short.MAX_VALUE));
             OreDictionary.registerOre("blockGlassHV", new ItemStack(bw_glasses[0], 1, 0));
             OreDictionary.registerOre("blockGlassEV", Ic2Items.reinforcedGlass);
@@ -103,6 +104,8 @@ public class BeforeGTPreload implements Runnable {
             OreDictionary.registerOre("blockGlassUV", new ItemStack(bw_glasses[0], 1, 5));
             OreDictionary.registerOre("blockGlassUHV", new ItemStack(bw_glasses[0], 1, 13));
             OreDictionary.registerOre("blockGlassUEV", new ItemStack(bw_glasses[0], 1, 14));
+            OreDictionary.registerOre("blockGlassUIV", new ItemStack(bw_glasses[0], 1, 15));
+            OreDictionary.registerOre("blockGlassUMV", new ItemStack(bw_glasses[1], 1, 0));
         } catch (IllegalAccessException | NoSuchFieldException | ClassNotFoundException e) {
             e.printStackTrace();
             FMLCommonHandler.instance().exitJava(-1, true);
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
index 95f3943cd8..c6ee62871b 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
@@ -28,10 +28,7 @@ import static com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler.ne
 
 import com.github.bartimaeusnek.bartworks.API.LoaderReference;
 import com.github.bartimaeusnek.bartworks.MainMod;
-import com.github.bartimaeusnek.bartworks.common.blocks.BW_Blocks;
-import com.github.bartimaeusnek.bartworks.common.blocks.BW_GlasBlocks;
-import com.github.bartimaeusnek.bartworks.common.blocks.BW_TileEntityContainer;
-import com.github.bartimaeusnek.bartworks.common.blocks.BW_TileEntityContainer_MachineBlock;
+import com.github.bartimaeusnek.bartworks.common.blocks.*;
 import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
 import com.github.bartimaeusnek.bartworks.common.items.*;
 import com.github.bartimaeusnek.bartworks.common.tileentities.classic.BW_RotorBlock;
@@ -152,6 +149,7 @@ public class ItemRegistry {
                 MainMod.MOD_ID + ":ThoriumYttriumGlass",
                 MainMod.MOD_ID + ":NeutroniumReinforcedBoronSilicateGlassBlock",
                 MainMod.MOD_ID + ":CosmicNeutroniumReinforcedBoronSilicateGlassBlock",
+                MainMod.MOD_ID + ":InfinityReinforcedBoronSilicateGlassBlock",
             },
             new short[][] {
                 Materials.BorosilicateGlass.getRGBA(),
@@ -168,15 +166,30 @@ public class ItemRegistry {
                 new short[] {0x80, 0x33, 0},
                 WerkstoffLoader.YttriumOxide.getRGBA(),
                 Materials.Neutronium.getRGBA(),
-                Materials.CosmicNeutronium.getRGBA()
+                Materials.CosmicNeutronium.getRGBA(),
+                new short[] {0xda, 0xeb, 0xff},
             },
             MainMod.BIO_TAB,
             true,
             false);
+    public static final Block bw_realglas2 = new BW_GlasBlocks2(
+            "BW_GlasBlocks2",
+            new String[] {MainMod.MOD_ID + ":TranscendentallyReinforcedBoronSilicateGlassBlock"},
+            new short[][] {new short[] {50, 50, 50}},
+            MainMod.BIO_TAB,
+            true,
+            false);
 
-    public static final Block[] bw_glasses = {bw_realglas};
+    public static final Block[] bw_glasses = {bw_realglas, bw_realglas2};
     public static final Block bw_fake_glasses = new BW_GlasBlocks(
             "BW_GlasBlocks", new String[] {MainMod.MOD_ID + ":BoronSilicateGlassBlockRandlos"}, null, null, true, true);
+    public static final Block bw_fake_glasses2 = new BW_GlasBlocks2(
+            "BW_GlasBlocks2",
+            new String[] {MainMod.MOD_ID + ":BoronSilicateGlassBlockRandlos"},
+            null,
+            null,
+            true,
+            true);
     public static final Block[] BW_BLOCKS = {
         new BW_Blocks(
                 "BW_ItemBlocks",
@@ -225,6 +238,7 @@ public class ItemRegistry {
     public static void run() {
         if (newStuff) {
             GameRegistry.registerBlock(ItemRegistry.bw_fake_glasses, "BW_FakeGlasBlock");
+            GameRegistry.registerBlock(ItemRegistry.bw_fake_glasses2, "BW_FakeGlasBlocks2");
             GameRegistry.registerBlock(ItemRegistry.BW_BLOCKS[2], BW_ItemBlocks.class, "BW_Machinery_Casings");
             GameRegistry.registerItem(ItemRegistry.LEATHER_ROTOR, "BW_LeatherRotor");
             GameRegistry.registerItem(ItemRegistry.WOOL_ROTOR, "BW_WoolRotor");
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
index 2876e70b7a..f6bef99113 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
@@ -411,6 +411,18 @@ public class RecipeLoader {
                     new ItemStack(ItemRegistry.bw_glasses[0], 1, 14),
                     800,
                     BW_Util.getMachineVoltageFromTier(9));
+            GT_Values.RA.addFluidSolidifierRecipe(
+                    new ItemStack(ItemRegistry.bw_glasses[0], 1, 0),
+                    Materials.Infinity.getMolten(1152),
+                    new ItemStack(ItemRegistry.bw_glasses[0], 1, 15),
+                    800,
+                    BW_Util.getMachineVoltageFromTier(10));
+            GT_Values.RA.addFluidSolidifierRecipe(
+                    new ItemStack(ItemRegistry.bw_glasses[0], 1, 0),
+                    Materials.TranscendentMetal.getMolten(1152),
+                    new ItemStack(ItemRegistry.bw_glasses[1], 1, 0),
+                    800,
+                    BW_Util.getMachineVoltageFromTier(11));
 
             for (int i = 0; i < Dyes.dyeBrown.getSizeOfFluidList(); ++i) {
                 GT_Values.RA.addChemicalBathRecipe(
@@ -514,6 +526,18 @@ public class RecipeLoader {
                     null,
                     800,
                     BW_Util.getMachineVoltageFromTier(10));
+            GT_Values.RA.addPulveriserRecipe(
+                    new ItemStack(ItemRegistry.bw_glasses[0], 1, 15),
+                    new ItemStack[] {Materials.BorosilicateGlass.getDust(9), Materials.Infinity.getDust(8)},
+                    null,
+                    800,
+                    BW_Util.getMachineVoltageFromTier(11));
+            GT_Values.RA.addPulveriserRecipe(
+                    new ItemStack(ItemRegistry.bw_glasses[1], 1, 0),
+                    new ItemStack[] {Materials.BorosilicateGlass.getDust(9), Materials.TranscendentMetal.getDust(8)},
+                    null,
+                    800,
+                    BW_Util.getMachineVoltageFromTier(12));
 
             for (int i = 6; i < 11; i++) {
                 GT_Values.RA.addPulveriserRecipe(
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/NEI_BW_Config.java b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/NEI_BW_Config.java
index 2fbb6a2d33..de9aa9b70b 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/NEI_BW_Config.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/NEI_BW_Config.java
@@ -54,6 +54,7 @@ public class NEI_BW_Config implements IConfigureNEI {
         API.hideItem(new ItemStack(ItemRegistry.TAB));
         API.hideItem(new ItemStack(FluidLoader.bioFluidBlock));
         API.hideItem(new ItemStack(ItemRegistry.bw_fake_glasses));
+        API.hideItem(new ItemStack(ItemRegistry.bw_fake_glasses2));
         ItemStack[] prefixesToHide = {
             WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustTiny, WerkstoffLoader.Bismutite)
                     .copy(),
diff --git a/src/main/resources/assets/bartworks/lang/en_US.lang b/src/main/resources/assets/bartworks/lang/en_US.lang
index 5fbbd79986..21208346cd 100644
--- a/src/main/resources/assets/bartworks/lang/en_US.lang
+++ b/src/main/resources/assets/bartworks/lang/en_US.lang
@@ -58,6 +58,8 @@ BW_GlasBlocks.11.name=Colored Borosilicate Glass Block (Brown)
 BW_GlasBlocks.12.name=Thorium Yttrium Glass Block
 BW_GlasBlocks.13.name=Neutronium Reinforced Borosilicate Glass Block
 BW_GlasBlocks.14.name=Cosmic Neutronium Reinforced Borosilicate Glass Block
+BW_GlasBlocks.15.name=Infinity Reinforced Borosilicate Glass Block
+BW_GlasBlocks2.0.name=Transcendentally Reinforced Borosilicate Glass Block
 
 tooltip.glas.0.name=Glass-Tier:
 tooltip.LESU.0.name=Maximum Capacity!
diff --git a/src/main/resources/assets/bartworks/textures/blocks/InfinityReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/InfinityReinforcedBoronSilicateGlassBlock.png
new file mode 100644
index 0000000000..4710c28436
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/InfinityReinforcedBoronSilicateGlassBlock.png
diff --git a/src/main/resources/assets/bartworks/textures/blocks/TranscendentallyReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/TranscendentallyReinforcedBoronSilicateGlassBlock.png
new file mode 100644
index 0000000000..220e85e57c
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/TranscendentallyReinforcedBoronSilicateGlassBlock.png