From 97066413e5a0af495c21d339a0a9125e30bbb9bf Mon Sep 17 00:00:00 2001 From: miozune Date: Thu, 19 May 2022 20:49:39 +0900 Subject: Borosilicate rebalance (#127) * Borosilicate rebalance * Change texture name Former-commit-id: b527918bac7fec90a8a181462303d5389bd546ae --- .../bartworks/common/loaders/ItemRegistry.java | 12 ++++----- .../bartworks/common/loaders/RecipeLoader.java | 30 +++++++++++---------- .../resources/assets/bartworks/lang/en_US.lang | 10 +++---- .../ChromeReinforcedBoronSilicateGlassBlock.png | Bin 199 -> 0 bytes ...NeutroniumReinforcedBoronSilicateGlassBlock.png | Bin 0 -> 129 bytes .../EuropiumReinforcedBoronSilicateGlassBlock.png | Bin 106 -> 0 bytes ...erMaterialReinforcedBoronSilicateGlassBlock.png | Bin 0 -> 199 bytes ...NeutroniumReinforcedBoronSilicateGlassBlock.png | Bin 0 -> 126 bytes .../NickelReinforcedBoronSilicateGlassBlock.png | Bin 201 -> 0 bytes .../TitaniumReinforcedBoronSilicateGlassBlock.png | Bin 0 -> 130 bytes .../TungstenReinforcedBoronSilicateGlassBlock.png | Bin 198 -> 0 bytes ...gstenSteelReinforcedBoronSilicateGlassBlock.png | Bin 0 -> 125 bytes .../UraniumReinforcedBoronSilicateGlassBlock.png | Bin 185 -> 0 bytes 13 files changed, 27 insertions(+), 25 deletions(-) delete mode 100644 src/main/resources/assets/bartworks/textures/blocks/ChromeReinforcedBoronSilicateGlassBlock.png create mode 100644 src/main/resources/assets/bartworks/textures/blocks/CosmicNeutroniumReinforcedBoronSilicateGlassBlock.png delete mode 100644 src/main/resources/assets/bartworks/textures/blocks/EuropiumReinforcedBoronSilicateGlassBlock.png create mode 100644 src/main/resources/assets/bartworks/textures/blocks/LuVTierMaterialReinforcedBoronSilicateGlassBlock.png create mode 100644 src/main/resources/assets/bartworks/textures/blocks/NeutroniumReinforcedBoronSilicateGlassBlock.png delete mode 100644 src/main/resources/assets/bartworks/textures/blocks/NickelReinforcedBoronSilicateGlassBlock.png create mode 100644 src/main/resources/assets/bartworks/textures/blocks/TitaniumReinforcedBoronSilicateGlassBlock.png delete mode 100644 src/main/resources/assets/bartworks/textures/blocks/TungstenReinforcedBoronSilicateGlassBlock.png create mode 100644 src/main/resources/assets/bartworks/textures/blocks/TungstenSteelReinforcedBoronSilicateGlassBlock.png delete mode 100644 src/main/resources/assets/bartworks/textures/blocks/UraniumReinforcedBoronSilicateGlassBlock.png (limited to 'src') 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 3ecb7fbab8..547dbeb9cb 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 @@ -88,9 +88,9 @@ public class ItemRegistry { "BW_GlasBlocks", new String[]{ MainMod.MOD_ID + ":BoronSilicateGlassBlock", - MainMod.MOD_ID + ":NickelReinforcedBoronSilicateGlassBlock", - MainMod.MOD_ID + ":TungstenReinforcedBoronSilicateGlassBlock", - MainMod.MOD_ID + ":ChromeReinforcedBoronSilicateGlassBlock", + MainMod.MOD_ID + ":TitaniumReinforcedBoronSilicateGlassBlock", + MainMod.MOD_ID + ":TungstenSteelReinforcedBoronSilicateGlassBlock", + MainMod.MOD_ID + ":LuVTierMaterialReinforcedBoronSilicateGlassBlock", MainMod.MOD_ID + ":IridiumReinforcedBoronSilicateGlassBlock", MainMod.MOD_ID + ":OsmiumReinforcedBoronSilicateGlassBlock", MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock1", @@ -100,10 +100,10 @@ public class ItemRegistry { MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock5", MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock6", MainMod.MOD_ID + ":ThoriumYttriumGlass", - MainMod.MOD_ID + ":UraniumReinforcedBoronSilicateGlassBlock", - MainMod.MOD_ID + ":EuropiumReinforcedBoronSilicateGlassBlock", + MainMod.MOD_ID + ":NeutroniumReinforcedBoronSilicateGlassBlock", + MainMod.MOD_ID + ":CosmicNeutroniumReinforcedBoronSilicateGlassBlock", }, - 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()}, + new short[][]{Materials.BorosilicateGlass.getRGBA(), Materials.Titanium.getRGBA(), Materials.TungstenSteel.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.Neutronium.getRGBA(), Materials.CosmicNeutronium.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 7b7b940af5..f91cfe43a1 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 @@ -261,13 +261,14 @@ public class RecipeLoader { GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 64, 1160), GT_Utility.getIntegratedCircuit(17), Materials.SolderingAlloy.getMolten(9216), ItemRegistry.megaMachines[4], 72000, BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), Materials.Nickel.getMolten(5184), new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), 800, BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), Materials.Tungsten.getMolten(1296), new ItemStack(ItemRegistry.bw_glasses[0], 1, 2), 800, BW_Util.getMachineVoltageFromTier(4)); - 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)); + GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), Materials.Titanium.getMolten(1152), new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), 800, BW_Util.getMachineVoltageFromTier(3)); + GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), Materials.TungstenSteel.getMolten(1152), new ItemStack(ItemRegistry.bw_glasses[0], 1, 2), 800, BW_Util.getMachineVoltageFromTier(4)); + FluidStack LuVMaterialFluid = ConfigHandler.newStuff ? WerkstoffLoader.LuVTierMaterial.getMolten(1152) : Materials.Chrome.getMolten(1152); + GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), LuVMaterialFluid, new ItemStack(ItemRegistry.bw_glasses[0], 1, 3), 800, BW_Util.getMachineVoltageFromTier(5)); + GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), Materials.Iridium.getMolten(1152), new ItemStack(ItemRegistry.bw_glasses[0], 1, 4), 800, BW_Util.getMachineVoltageFromTier(6)); + GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), Materials.Osmium.getMolten(1152), new ItemStack(ItemRegistry.bw_glasses[0], 1, 5), 800, BW_Util.getMachineVoltageFromTier(7)); + GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), Materials.Neutronium.getMolten(1152), new ItemStack(ItemRegistry.bw_glasses[0], 1, 13), 800, BW_Util.getMachineVoltageFromTier(8)); + GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), Materials.CosmicNeutronium.getMolten(1152), 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); @@ -278,13 +279,14 @@ public class RecipeLoader { GT_Values.RA.addChemicalBathRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), Dyes.dyeBrown.getFluidDye(i, 36), new ItemStack(ItemRegistry.bw_glasses[0], 1, 11), null, null, null, 64, 2); } //and reverse recipes... cause im nice :P - GT_Values.RA.addPulveriserRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), new ItemStack[]{Materials.BorosilicateGlass.getDust(9), Materials.Nickel.getDust(36)}, null, 800, BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addPulveriserRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 2), new ItemStack[]{Materials.BorosilicateGlass.getDust(9), Materials.Nickel.getDust(36), Materials.Tungsten.getDust(9)}, null, 800, BW_Util.getMachineVoltageFromTier(5)); - 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)); + GT_Values.RA.addPulveriserRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), new ItemStack[]{Materials.BorosilicateGlass.getDust(9), Materials.Titanium.getDust(8)}, null, 800, BW_Util.getMachineVoltageFromTier(4)); + GT_Values.RA.addPulveriserRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 2), new ItemStack[]{Materials.BorosilicateGlass.getDust(9), Materials.TungstenSteel.getDust(8)}, null, 800, BW_Util.getMachineVoltageFromTier(5)); + ItemStack LuVMaterialDust = ConfigHandler.newStuff ? WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.dust, 8) : Materials.Chrome.getDust(8); + GT_Values.RA.addPulveriserRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 3), new ItemStack[]{Materials.BorosilicateGlass.getDust(9), LuVMaterialDust}, 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.Iridium.getDust(8)}, 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.Osmium.getDust(8)}, null, 800, BW_Util.getMachineVoltageFromTier(8)); + GT_Values.RA.addPulveriserRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 13), new ItemStack[]{Materials.BorosilicateGlass.getDust(9), Materials.Neutronium.getDust(8)}, null, 800, BW_Util.getMachineVoltageFromTier(9)); + GT_Values.RA.addPulveriserRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, 14), new ItemStack[]{Materials.BorosilicateGlass.getDust(9), Materials.CosmicNeutronium.getDust(8)}, null, 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/resources/assets/bartworks/lang/en_US.lang b/src/main/resources/assets/bartworks/lang/en_US.lang index a13642b7fd..cb38553b32 100644 --- a/src/main/resources/assets/bartworks/lang/en_US.lang +++ b/src/main/resources/assets/bartworks/lang/en_US.lang @@ -44,9 +44,9 @@ labModule.item.PlasmidSynthesisModule.name=Plasmid Synthesis Module labModule.item.TransformationModule.name=Transformation Module labModule.item.ClonalCellularSynthesisModule.name=Clonal Cellular Synthesis Module BW_GlasBlocks.0.name=Borosilicate Glass Block -BW_GlasBlocks.1.name=Nickel Reinforced Borosilicate Glass Block -BW_GlasBlocks.2.name=Tungsten Reinforced Borosilicate Glass Block -BW_GlasBlocks.3.name=Chrome Reinforced Borosilicate Glass Block +BW_GlasBlocks.1.name=Titanium Reinforced Borosilicate Glass Block +BW_GlasBlocks.2.name=Tungstensteel Reinforced Borosilicate Glass Block +BW_GlasBlocks.3.name=Rhodium-Plated Palladium Reinforced Borosilicate Glass Block BW_GlasBlocks.4.name=Iridium Reinforced Borosilicate Glass Block BW_GlasBlocks.5.name=Osmium Reinforced Borosilicate Glass Block BW_GlasBlocks.6.name=Colored Borosilicate Glass Block (Red) @@ -56,8 +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 +BW_GlasBlocks.13.name=Neutronium Reinforced Borosilicate Glass Block +BW_GlasBlocks.14.name=Cosmic Neutronium 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/ChromeReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/ChromeReinforcedBoronSilicateGlassBlock.png deleted file mode 100644 index 213f8feafd..0000000000 Binary files a/src/main/resources/assets/bartworks/textures/blocks/ChromeReinforcedBoronSilicateGlassBlock.png and /dev/null differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/CosmicNeutroniumReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/CosmicNeutroniumReinforcedBoronSilicateGlassBlock.png new file mode 100644 index 0000000000..2f58642a18 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/blocks/CosmicNeutroniumReinforcedBoronSilicateGlassBlock.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/EuropiumReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/EuropiumReinforcedBoronSilicateGlassBlock.png deleted file mode 100644 index 5255386cc6..0000000000 Binary files a/src/main/resources/assets/bartworks/textures/blocks/EuropiumReinforcedBoronSilicateGlassBlock.png and /dev/null differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/LuVTierMaterialReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/LuVTierMaterialReinforcedBoronSilicateGlassBlock.png new file mode 100644 index 0000000000..213f8feafd Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/blocks/LuVTierMaterialReinforcedBoronSilicateGlassBlock.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/NeutroniumReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/NeutroniumReinforcedBoronSilicateGlassBlock.png new file mode 100644 index 0000000000..c75fafb933 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/blocks/NeutroniumReinforcedBoronSilicateGlassBlock.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/NickelReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/NickelReinforcedBoronSilicateGlassBlock.png deleted file mode 100644 index 9ab096b467..0000000000 Binary files a/src/main/resources/assets/bartworks/textures/blocks/NickelReinforcedBoronSilicateGlassBlock.png and /dev/null differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/TitaniumReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/TitaniumReinforcedBoronSilicateGlassBlock.png new file mode 100644 index 0000000000..9908141e11 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/blocks/TitaniumReinforcedBoronSilicateGlassBlock.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/TungstenReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/TungstenReinforcedBoronSilicateGlassBlock.png deleted file mode 100644 index b3823b02fc..0000000000 Binary files a/src/main/resources/assets/bartworks/textures/blocks/TungstenReinforcedBoronSilicateGlassBlock.png and /dev/null differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/TungstenSteelReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/TungstenSteelReinforcedBoronSilicateGlassBlock.png new file mode 100644 index 0000000000..07618e28aa Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/blocks/TungstenSteelReinforcedBoronSilicateGlassBlock.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/UraniumReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/UraniumReinforcedBoronSilicateGlassBlock.png deleted file mode 100644 index 0cc6e08ae3..0000000000 Binary files a/src/main/resources/assets/bartworks/textures/blocks/UraniumReinforcedBoronSilicateGlassBlock.png and /dev/null differ -- cgit