uhv and uev glass (#92)

Former-commit-id: ab8787b69208e6804c6ed8c1e086bf2cb6e2fdd8

11 files changed, 33 insertions, 4 deletions

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 11c9d96f66..eb79febe39 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
@@ -102,6 +102,8 @@ public class BeforeGTPreload implements Runnable {
             OreDictionary.registerOre("blockGlassLuV", new ItemStack(bw_glasses[0], 1, 3));
             OreDictionary.registerOre("blockGlassZPM", new ItemStack(bw_glasses[0], 1, 4));
             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));
         } 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 561674bd75..dbe663f3e8 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
@@ -104,8 +104,10 @@ public class ItemRegistry {
                     MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock5",
                     MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock6",
                     MainMod.MOD_ID + ":ThoriumYttriumGlass",
+                    MainMod.MOD_ID + ":UraniumReinforcedBoronSilicateGlassBlock",
+                    MainMod.MOD_ID + ":EuropiumReinforcedBoronSilicateGlassBlock",
             },
-            new short[][]{Materials.BorosilicateGlass.getRGBA(), Materials.Nickel.getRGBA(), Materials.Tungsten.getRGBA(), Materials.Chrome.getRGBA(), Materials.Iridium.getRGBA(), Materials.Osmium.getRGBA(), new short[]{0xff, 0, 0}, new short[]{0, 0xff, 0}, new short[]{0x80, 0, 0xff}, new short[]{0xff, 0xff, 0}, new short[]{0, 0xff, 0x80}, new short[]{0x80, 0x33, 0}, WerkstoffLoader.YttriumOxide.getRGBA()},
+            new short[][]{Materials.BorosilicateGlass.getRGBA(), Materials.Nickel.getRGBA(), Materials.Tungsten.getRGBA(), Materials.Chrome.getRGBA(), Materials.Iridium.getRGBA(), Materials.Osmium.getRGBA(), new short[]{0xff, 0, 0}, new short[]{0, 0xff, 0}, new short[]{0x80, 0, 0xff}, new short[]{0xff, 0xff, 0}, new short[]{0, 0xff, 0x80}, new short[]{0x80, 0x33, 0}, WerkstoffLoader.YttriumOxide.getRGBA(), Materials.Uranium235.getRGBA(), Materials.Europium.getRGBA()},
             MainMod.BIO_TAB,
             true, false
     );
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 cf31a88cd1..b313a68b5e 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
@@ -266,6 +266,8 @@ public class RecipeLoader {
             GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 2), Materials.Chrome.getMolten(1296), new ItemStack(ItemRegistry.bw_glasses[0], 1, 3), 800, BW_Util.getMachineVoltageFromTier(5));
             GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 3), Materials.Iridium.getMolten(3888), new ItemStack(ItemRegistry.bw_glasses[0], 1, 4), 800, BW_Util.getMachineVoltageFromTier(6));
             GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 4), Materials.Osmium.getMolten(1296), new ItemStack(ItemRegistry.bw_glasses[0], 1, 5), 800, BW_Util.getMachineVoltageFromTier(7));
+            GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 5), Materials.Uranium235.getMolten(2304), new ItemStack(ItemRegistry.bw_glasses[0], 1, 13), 800, BW_Util.getMachineVoltageFromTier(8));
+            GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 13), Materials.Europium.getMolten(4608), new ItemStack(ItemRegistry.bw_glasses[0], 1, 14), 800, BW_Util.getMachineVoltageFromTier(9));
 
             for (int i = 0; i < Dyes.dyeBrown.getSizeOfFluidList(); ++i) {
                 GT_Values.RA.addChemicalBathRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), Dyes.dyeRed.getFluidDye(i, 36), new ItemStack(ItemRegistry.bw_glasses[0], 1, 6), null, null, null, 64, 2);
@@ -281,6 +283,8 @@ public class RecipeLoader {
             GT_Values.RA.addPulveriserRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 3), new ItemStack[]{Materials.BorosilicateGlass.getDust(9), Materials.Nichrome.getDust(45), Materials.Tungsten.getDust(9)}, null, 800, BW_Util.getMachineVoltageFromTier(6));
             GT_Values.RA.addPulveriserRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 4), new ItemStack[]{Materials.BorosilicateGlass.getDust(9), Materials.Nichrome.getDust(45), Materials.Tungsten.getDust(9), Materials.Iridium.getDust(27)}, null, 800, BW_Util.getMachineVoltageFromTier(7));
             GT_Values.RA.addPulveriserRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 5), new ItemStack[]{Materials.BorosilicateGlass.getDust(9), Materials.Nichrome.getDust(45), Materials.Tungsten.getDust(9), Materials.Osmiridium.getDust(36)}, null, 800, BW_Util.getMachineVoltageFromTier(8));
+            GT_Values.RA.addFluidExtractionRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 13), new ItemStack(ItemRegistry.bw_glasses[0], 1, 5), Materials.Uranium235.getMolten(2304), 1000 , 800, BW_Util.getMachineVoltageFromTier(9));
+            GT_Values.RA.addFluidExtractionRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 14), new ItemStack(ItemRegistry.bw_glasses[0], 1, 13), Materials.Europium.getMolten(4608), 1000 , 800, BW_Util.getMachineVoltageFromTier(10));
 
             for (int i = 6; i < 11; i++) {
                 GT_Values.RA.addPulveriserRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, i), new ItemStack[]{Materials.BorosilicateGlass.getDust(9)}, null, 400, BW_Util.getMachineVoltageFromTier(1));
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java
index 4f0c6bae2c..79a10a8f7d 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java
@@ -78,7 +78,9 @@ public class GT_TileEntity_CircuitAssemblyLine extends GT_MetaTileEntity_Enhance
                     ofBlock(ItemRegistry.bw_realglas, 3),
                     ofBlock(ItemRegistry.bw_realglas, 4),
                     ofBlock(ItemRegistry.bw_realglas, 5),
-                    ofBlock(ItemRegistry.bw_realglas, 12)
+                    ofBlock(ItemRegistry.bw_realglas, 12),
+                    ofBlock(ItemRegistry.bw_realglas, 13),
+                    ofBlock(ItemRegistry.bw_realglas, 14)
             ))
             .addElement('l', ofBlock(GregTech_API.sBlockCasings2, 5)) //assembling line casings
             .addElement('b', ofChain(
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java
index e1965cc90c..f9263f140a 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java
@@ -459,6 +459,7 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_MetaTileEntity_ElectricBl
         if (block != ItemRegistry.bw_glasses[0])
             return false;
         byte tier = BW_Util.getTierFromGlasMeta(meta);
+        if (tier >= 8) tier = 8;
         if (glasTier > 0)
             return tier == glasTier;
         glasTier = tier;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java
index ba6afeb0c4..3aaeab8c30 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java
@@ -271,6 +271,7 @@ public class GT_TileEntity_MegaChemicalReactor extends GT_MetaTileEntity_LargeCh
             return false;
         }
         byte tier = BW_Util.getTierFromGlasMeta(meta);
+        if (tier >= 8) tier = 8;
         if (glasTier > 0) {
             return tier == glasTier;
         }
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java
index 4aef8d7c93..c8e9c00d58 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java
@@ -413,6 +413,7 @@ public class GT_TileEntity_MegaOilCracker extends GT_MetaTileEntity_OilCracker i
             return false;
         }
         byte tier = BW_Util.getTierFromGlasMeta(meta);
+        if (tier >= 8) tier = 8;
         if (glasTier > 0) {
             return tier == glasTier;
         }
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java
index cc0c56214e..35a7c5e89d 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java
@@ -344,6 +344,12 @@ public class BW_Util {
             case 5:
                 ret = 8;
                 break;
+            case 13:
+                ret = 9;
+                break;
+            case 14:
+                ret = 10;
+                break;
             default:
                 ret = 3;
         }
@@ -587,8 +593,16 @@ public class BW_Util {
             }
         }
 
-        if (block.equals(bw_realglasRef))
-            return meta == 12 ? 5 : meta > 1 && meta < 6 ? (byte) (meta + 3) : 4;
+        if (block.equals(bw_realglasRef)) {
+            if (meta > 12) {
+                return (byte) (meta - 3);
+            }
+            if (meta == 12)
+                return 12;
+            if (meta > 1 && meta < 6)
+                return (byte) (meta + 3);
+            return 4;
+        }
 
         if (block.getUnlocalizedName().equals("blockAlloyGlass"))
             return 4;
diff --git a/src/main/resources/assets/bartworks/lang/en_US.lang b/src/main/resources/assets/bartworks/lang/en_US.lang
index 84930900d1..bebfa4161c 100644
--- a/src/main/resources/assets/bartworks/lang/en_US.lang
+++ b/src/main/resources/assets/bartworks/lang/en_US.lang
@@ -56,6 +56,8 @@ BW_GlasBlocks.9.name=Colored Borosilicate Glass Block (Yellow)
 BW_GlasBlocks.10.name=Colored Borosilicate Glass Block (Light Green)
 BW_GlasBlocks.11.name=Colored Borosilicate Glass Block (Brown)
 BW_GlasBlocks.12.name=Thorium Yttrium Glass Block
+BW_GlasBlocks.13.name=Uranium Reinforced Borosilicate Glass Block
+BW_GlasBlocks.14.name=Europium 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/EuropiumReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/EuropiumReinforcedBoronSilicateGlassBlock.png
new file mode 100644
index 0000000000..5255386cc6
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/EuropiumReinforcedBoronSilicateGlassBlock.png
diff --git a/src/main/resources/assets/bartworks/textures/blocks/UraniumReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/UraniumReinforcedBoronSilicateGlassBlock.png
new file mode 100644
index 0000000000..0cc6e08ae3
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/UraniumReinforcedBoronSilicateGlassBlock.png