From f0a62699601e8b8f947bbdbbce3ad821b95c56a1 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Mon, 27 Sep 2021 00:56:58 +0200 Subject: exchange silicondioxide with Silicon exchange Aludioxide with Alu Former-commit-id: c9531b147c7332c928170ea0bab21aa318d52487 --- .../bartworks/system/material/WerkstoffLoader.java | 28 +++++++++++----------- .../processingLoaders/AdditionalRecipes.java | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java index 4cf650fcf3..e43a0f15b6 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java @@ -255,8 +255,8 @@ public class WerkstoffLoader { Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon), new Pair<>(Materials.Sodium, 1), new Pair<>(Materials.Iron, 3), - new Pair<>(Materials.Aluminium, 6), - new Pair<>(Materials.Silicon, 6), + new Pair<>(Materials.Aluminiumoxide, 6), + new Pair<>(Materials.SiliconDioxide, 6), new Pair<>(Materials.Boron, 3), new Pair<>(Materials.Oxygen, 30), new Pair<>(Materials.Fluorine, 1) @@ -284,7 +284,7 @@ public class WerkstoffLoader { new Pair<>(Materials.Sodium, 1), new Pair<>(Materials.Chrome, 3), new Pair<>(Materials.Magnalium, 6), - new Pair<>(Materials.Silicon, 6), + new Pair<>(Materials.SiliconDioxide, 6), new Pair<>(Materials.Boron, 3), new Pair<>(Materials.Oxygen, 31), new Pair<>(Materials.Hydrogen, 3) @@ -318,8 +318,8 @@ public class WerkstoffLoader { TextureSet.SET_RUBY, Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon), new Pair<>(Materials.Sodium, 1), - new Pair<>(Materials.Aluminium, 9), - new Pair<>(Materials.Silicon, 6), + new Pair<>(Materials.Aluminiumoxide, 9), + new Pair<>(Materials.SiliconDioxide, 6), new Pair<>(Materials.Boron, 3), new Pair<>(Materials.Oxygen, 31), new Pair<>(Materials.Hydrogen, 1) @@ -440,7 +440,7 @@ public class WerkstoffLoader { TextureSet.SET_GEM_VERTICAL, Arrays.asList(WerkstoffLoader.Zirconium, Materials.Silicon), new Pair<>(WerkstoffLoader.Zirconium, 1), - new Pair<>(Materials.Silicon, 1), + new Pair<>(Materials.SiliconDioxide, 1), new Pair<>(Materials.Oxygen, 4) ); @@ -490,7 +490,7 @@ public class WerkstoffLoader { TextureSet.SET_QUARTZ, Arrays.asList(Materials.Iron, Materials.Silicon), new Pair<>(Materials.Iron, 2), - new Pair<>(Materials.Silicon, 1), + new Pair<>(Materials.SiliconDioxide, 1), new Pair<>(Materials.Oxygen, 4) ); public static final Werkstoff Forsterit = new Werkstoff( @@ -503,7 +503,7 @@ public class WerkstoffLoader { TextureSet.SET_QUARTZ, Arrays.asList(Materials.Magnesium, Materials.Silicon), new Pair<>(Materials.Magnesium, 2), - new Pair<>(Materials.Silicon, 1), + new Pair<>(Materials.SiliconDioxide, 1), new Pair<>(Materials.Oxygen, 4) ); public static final Werkstoff Hedenbergit = new Werkstoff( @@ -517,7 +517,7 @@ public class WerkstoffLoader { Arrays.asList(Materials.Iron, Materials.Calcium, Materials.Silicon), new Pair<>(Materials.Calcium, 1), new Pair<>(Materials.Iron, 1), - new Pair<>(Materials.Silicon, 2), + new Pair<>(Materials.SiliconDioxide, 2), new Pair<>(Materials.Oxygen, 6) ); public static final Werkstoff DescloiziteZNVO4 = new Werkstoff( @@ -557,10 +557,10 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures(), 28, TextureSet.SET_METALLIC, - Arrays.asList(Materials.Potassium, Materials.Aluminium, Materials.Silicon), + Arrays.asList(Materials.Potassium, Materials.Aluminiumoxide, Materials.Silicon), new Pair<>(Materials.Potassium, 1), - new Pair<>(Materials.Aluminium, 3), - new Pair<>(Materials.Silicon, 3), + new Pair<>(Materials.Aluminiumoxide, 3), + new Pair<>(Materials.SiliconDioxide, 3), new Pair<>(Materials.Oxygen, 12), new Pair<>(Materials.Hydrogen, 2) @@ -577,7 +577,7 @@ public class WerkstoffLoader { Arrays.asList(Materials.Potassium, Materials.Chrome, Materials.Silicon), new Pair<>(Materials.Potassium, 1), new Pair<>(Materials.Chrome, 3), - new Pair<>(Materials.Silicon, 3), + new Pair<>(Materials.SiliconDioxide, 3), new Pair<>(Materials.Oxygen, 12), new Pair<>(Materials.Hydrogen, 2) @@ -652,7 +652,7 @@ public class WerkstoffLoader { 35, TextureSet.SET_QUARTZ, //No Byproducts - new Pair<>(Materials.Silicon, 5), + new Pair<>(Materials.SiliconDioxide, 5), new Pair<>(Materials.Oxygen, 10), new Pair<>(Materials.Iron, 1) ); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java index 332cbdfb66..c6a1ca5ce2 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java @@ -292,7 +292,7 @@ public class AdditionalRecipes { 400, BW_Util.getMachineVoltageFromTier(5) ); - GT_Values.RA.addChemicalRecipe(WerkstoffLoader.Thorianit.get(dust), Materials.Aluminium.getDust(1), Materials.Thorium.getDust(1), 1000); + GT_Values.RA.addChemicalRecipe(WerkstoffLoader.Thorianit.get(dust), Materials.Aluminiumoxide.getDust(1), Materials.Thorium.getDust(1), 1000); GT_Values.RA.addChemicalRecipe(WerkstoffLoader.Thorianit.get(dust), Materials.Magnesium.getDust(1), Materials.Thorium.getDust(1), 1000); GT_Values.RA.addChemicalRecipe(WerkstoffLoader.Thorianit.get(crushed), ItemList.Crop_Drop_Thorium.get(9), Materials.Water.getFluid(1000), Materials.Thorium.getMolten(144), WerkstoffLoader.Thorianit.get(crushedPurified, 4), 96, 24); -- cgit From 16a9d812cf97e137835ea2740941f0c6e28e31c1 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Mon, 27 Sep 2021 01:49:59 +0200 Subject: derp fix Former-commit-id: a101523edd4574f4db47da5d13c7ffa5c250223e --- .../bartworks/system/material/processingLoaders/AdditionalRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java index c6a1ca5ce2..332cbdfb66 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java @@ -292,7 +292,7 @@ public class AdditionalRecipes { 400, BW_Util.getMachineVoltageFromTier(5) ); - GT_Values.RA.addChemicalRecipe(WerkstoffLoader.Thorianit.get(dust), Materials.Aluminiumoxide.getDust(1), Materials.Thorium.getDust(1), 1000); + GT_Values.RA.addChemicalRecipe(WerkstoffLoader.Thorianit.get(dust), Materials.Aluminium.getDust(1), Materials.Thorium.getDust(1), 1000); GT_Values.RA.addChemicalRecipe(WerkstoffLoader.Thorianit.get(dust), Materials.Magnesium.getDust(1), Materials.Thorium.getDust(1), 1000); GT_Values.RA.addChemicalRecipe(WerkstoffLoader.Thorianit.get(crushed), ItemList.Crop_Drop_Thorium.get(9), Materials.Water.getFluid(1000), Materials.Thorium.getMolten(144), WerkstoffLoader.Thorianit.get(crushedPurified, 4), 96, 24); -- cgit From a42f797c22e5f921d736621b7762b8cc2fada7bb Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Mon, 27 Sep 2021 01:58:48 +0200 Subject: fix a few recipe. Need to make new Centrifuge and Electrolyzer recipes Former-commit-id: be3d5aa13a44425869695b897e1e8436d25ff131 --- .../tileentities/multis/GT_TileEntity_HTGR.java | 6 +-- .../bartworks/system/material/WerkstoffLoader.java | 46 +++++++++++----------- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java index 40e2a8b878..ba25171e1f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java @@ -497,18 +497,18 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase static final Fuel_[] sHTGR_Fuel = new Fuel_[]{ new Fuel_("Thorium", "Thorium", WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 64), Materials.Uranium235.getDust(4), GT_Values.NF, new ItemStack[]{ - Materials.Silicon.getDust(1), Materials.Graphite.getDust(1), Materials.Carbon.getDust(1), + Materials.SiliconDioxide.getDust(1), Materials.Graphite.getDust(1), Materials.Carbon.getDust(1), Materials.Lutetium.getDust(1), WerkstoffLoader.Thorium232.get(OrePrefixes.dust,1)}, new int[]{9000, 9000, 9000, 9000, 1000}, "Multiplies coolant by 1"), new Fuel_("Uranium", "Uranium", Materials.Uranium.getDust(64), Materials.Uranium235.getDust(8), FluidRegistry.getFluidStack("krypton", 8), new ItemStack[]{ - Materials.Silicon.getDust(1), Materials.Graphite.getDust(1), Materials.Carbon.getDust(1), + Materials.SiliconDioxide.getDust(1), Materials.Graphite.getDust(1), Materials.Carbon.getDust(1), Materials.Lead.getDust(1), Materials.Uranium.getDust(1)}, new int[]{9000, 9000, 9000, 7000, 1000}, "Multiplies coolant by 1.5"), new Fuel_("Plutonium", "Plutonium", Materials.Plutonium.getDust(64), Materials.Plutonium241.getDust(4), FluidRegistry.getFluidStack("xenon", 8), new ItemStack[]{ - Materials.Silicon.getDust(1), Materials.Graphite.getDust(1), Materials.Carbon.getDust(1), + Materials.SiliconDioxide.getDust(1), Materials.Graphite.getDust(1), Materials.Carbon.getDust(1), Materials.Lead.getDust(1), Materials.Plutonium.getDust(1)}, new int[]{9000, 9000, 9000, 7000, 1000}, "Multiplies coolant by 2"), diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java index e43a0f15b6..8260a1a0e6 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java @@ -252,11 +252,11 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 5, TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon), + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), new Pair<>(Materials.Sodium, 1), new Pair<>(Materials.Iron, 3), - new Pair<>(Materials.Aluminiumoxide, 6), - new Pair<>(Materials.SiliconDioxide, 6), + new Pair<>(Materials.Aluminium, 6), + new Pair<>(Materials.Silicon, 6), new Pair<>(Materials.Boron, 3), new Pair<>(Materials.Oxygen, 30), new Pair<>(Materials.Fluorine, 1) @@ -280,11 +280,11 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 7, TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon), + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), new Pair<>(Materials.Sodium, 1), new Pair<>(Materials.Chrome, 3), new Pair<>(Materials.Magnalium, 6), - new Pair<>(Materials.SiliconDioxide, 6), + new Pair<>(Materials.Silicon, 6), new Pair<>(Materials.Boron, 3), new Pair<>(Materials.Oxygen, 31), new Pair<>(Materials.Hydrogen, 3) @@ -298,7 +298,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 8, TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon), + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), new Pair<>(Materials.Sodium, 1), new Pair<>(Materials.Vanadium, 3), new Pair<>(Materials.Magnalium, 6), @@ -316,10 +316,10 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 9, TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon), + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), new Pair<>(Materials.Sodium, 1), - new Pair<>(Materials.Aluminiumoxide, 9), - new Pair<>(Materials.SiliconDioxide, 6), + new Pair<>(Materials.Aluminium, 9), + new Pair<>(Materials.Silicon, 6), new Pair<>(Materials.Boron, 3), new Pair<>(Materials.Oxygen, 31), new Pair<>(Materials.Hydrogen, 1) @@ -438,9 +438,9 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 19, TextureSet.SET_GEM_VERTICAL, - Arrays.asList(WerkstoffLoader.Zirconium, Materials.Silicon), + Arrays.asList(WerkstoffLoader.Zirconium, Materials.SiliconDioxide), new Pair<>(WerkstoffLoader.Zirconium, 1), - new Pair<>(Materials.SiliconDioxide, 1), + new Pair<>(Materials.Silicon, 1), new Pair<>(Materials.Oxygen, 4) ); @@ -488,9 +488,9 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 23, TextureSet.SET_QUARTZ, - Arrays.asList(Materials.Iron, Materials.Silicon), + Arrays.asList(Materials.Iron, Materials.SiliconDioxide), new Pair<>(Materials.Iron, 2), - new Pair<>(Materials.SiliconDioxide, 1), + new Pair<>(Materials.Silicon, 1), new Pair<>(Materials.Oxygen, 4) ); public static final Werkstoff Forsterit = new Werkstoff( @@ -501,9 +501,9 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 24, TextureSet.SET_QUARTZ, - Arrays.asList(Materials.Magnesium, Materials.Silicon), + Arrays.asList(Materials.Magnesium, Materials.SiliconDioxide), new Pair<>(Materials.Magnesium, 2), - new Pair<>(Materials.SiliconDioxide, 1), + new Pair<>(Materials.Silicon, 1), new Pair<>(Materials.Oxygen, 4) ); public static final Werkstoff Hedenbergit = new Werkstoff( @@ -514,10 +514,10 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 25, TextureSet.SET_QUARTZ, - Arrays.asList(Materials.Iron, Materials.Calcium, Materials.Silicon), + Arrays.asList(Materials.Iron, Materials.Calcium, Materials.SiliconDioxide), new Pair<>(Materials.Calcium, 1), new Pair<>(Materials.Iron, 1), - new Pair<>(Materials.SiliconDioxide, 2), + new Pair<>(Materials.Silicon, 2), new Pair<>(Materials.Oxygen, 6) ); public static final Werkstoff DescloiziteZNVO4 = new Werkstoff( @@ -557,10 +557,10 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures(), 28, TextureSet.SET_METALLIC, - Arrays.asList(Materials.Potassium, Materials.Aluminiumoxide, Materials.Silicon), + Arrays.asList(Materials.Potassium, Materials.Aluminiumoxide, Materials.SiliconDioxide), new Pair<>(Materials.Potassium, 1), - new Pair<>(Materials.Aluminiumoxide, 3), - new Pair<>(Materials.SiliconDioxide, 3), + new Pair<>(Materials.Aluminium, 3), + new Pair<>(Materials.Silicon, 3), new Pair<>(Materials.Oxygen, 12), new Pair<>(Materials.Hydrogen, 2) @@ -574,10 +574,10 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures(), 29, TextureSet.SET_METALLIC, - Arrays.asList(Materials.Potassium, Materials.Chrome, Materials.Silicon), + Arrays.asList(Materials.Potassium, Materials.Chrome, Materials.SiliconDioxide), new Pair<>(Materials.Potassium, 1), new Pair<>(Materials.Chrome, 3), - new Pair<>(Materials.SiliconDioxide, 3), + new Pair<>(Materials.Silicon, 3), new Pair<>(Materials.Oxygen, 12), new Pair<>(Materials.Hydrogen, 2) @@ -652,7 +652,7 @@ public class WerkstoffLoader { 35, TextureSet.SET_QUARTZ, //No Byproducts - new Pair<>(Materials.SiliconDioxide, 5), + new Pair<>(Materials.Silicon, 5), new Pair<>(Materials.Oxygen, 10), new Pair<>(Materials.Iron, 1) ); -- cgit From 8370f620400ddf7b5efaa4299d23288a4d2d477c Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Wed, 29 Sep 2021 11:13:59 +0200 Subject: remove auto electrolyse recipes add them manual back with oxide variants (cherry picked from commit f3c43083b0fc076c16eba965323f241de8b80890) Former-commit-id: b57da6a8a54f25425ff3496e6427f916ee415633 --- .../bartworks/common/loaders/RecipeLoader.java | 12 +++++++++++- .../bartworks/system/material/WerkstoffLoader.java | 21 +++++++++++---------- 2 files changed, 22 insertions(+), 11 deletions(-) (limited to 'src/main/java') 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 ac747e00b0..70733182a1 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 @@ -965,6 +965,16 @@ public class RecipeLoader { BW_Util.getMachineVoltageFromTier(6) ); } + GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.Forsterit.get(OrePrefixes.dust, 7), GT_Values.NI, GT_Values.NF, Materials.Oxygen.getGas(2000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 200, 90); + GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 6), GT_Values.NI, GT_Values.NF, Materials.Oxygen.getGas(2000L), WerkstoffLoader.Zirconium.get(OrePrefixes.dust, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 250, 90); + GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.Fayalit.get(OrePrefixes.dust, 7), GT_Values.NI, GT_Values.NF, Materials.Oxygen.getGas(2000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 320, 90); + GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.Prasiolite.get(OrePrefixes.dust, 16), GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 5L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 580, 90); + GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.Hedenbergit.get(OrePrefixes.dust, 10), GT_Values.NI, GT_Values.NF, Materials.Oxygen.getGas(2000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 2L), GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 300, 90); + GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.FuchsitAL.get(OrePrefixes.dust, 21), ItemList.Cell_Empty.get(2), GT_Values.NF, Materials.Oxygen.getGas(2000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), GT_Values.NI, GT_Values.NI, null, 390, 120); + GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.FuchsitCR.get(OrePrefixes.dust, 21), ItemList.Cell_Empty.get(2), GT_Values.NF, Materials.Oxygen.getGas(2000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), GT_Values.NI, GT_Values.NI, null, 460, 120); + GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.VanadioOxyDravit.get(OrePrefixes.dust, 53), ItemList.Cell_Empty.get(3), GT_Values.NF, Materials.Oxygen.getGas(19000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnalium, 6L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3), null, 710, 120); + GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.ChromoAluminoPovondrait.get(OrePrefixes.dust, 53), ItemList.Cell_Empty.get(3), GT_Values.NF, Materials.Oxygen.getGas(19000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnalium, 6L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3), null, 720, 120); + GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.FluorBuergerit.get(OrePrefixes.dust, 50), ItemList.Cell_Empty.get(1), GT_Values.NF, Materials.Oxygen.getGas(6000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 6L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 3), null, 730, 120); + GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.Olenit.get(OrePrefixes.dust, 51), ItemList.Cell_Empty.get(1), GT_Values.NF, Materials.Oxygen.getGas(1000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1), GT_Values.NI, null, 790, 120); } - } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java index 8260a1a0e6..d80ba8aba7 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java @@ -248,6 +248,7 @@ public class WerkstoffLoader { new short[]{0x20, 0x20, 0x20, 0}, "Fluor-Buergerite", subscriptNumbers("NaFe3Al6(Si6O18)(BO3)3O3F"), + new Werkstoff.Stats().setElektrolysis(false), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().addGems(), 5, @@ -275,7 +276,7 @@ public class WerkstoffLoader { new short[]{0, 0x79, 0x6A, 0}, "Chromo-Alumino-Povondraite", subscriptNumbers("NaCr3(Al4Mg2)(Si6O18)(BO3)3(OH)3O"), - Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND), + Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND).setElektrolysis(false), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().addGems(), 7, @@ -293,7 +294,7 @@ public class WerkstoffLoader { new short[]{0x60, 0xA0, 0xA0, 0}, "Vanadio-Oxy-Dravite", subscriptNumbers("NaV3(Al4Mg2)(Si6O18)(BO3)3(OH)3O"), - Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND), + Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND).setElektrolysis(false), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().addGems(), 8, @@ -311,7 +312,7 @@ public class WerkstoffLoader { new short[]{210, 210, 210, 0}, "Olenite", subscriptNumbers("NaAl3Al6(Si6O18)(BO3)3O3OH"), - Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND), + Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND).setElektrolysis(false), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().addGems(), 9, @@ -433,7 +434,7 @@ public class WerkstoffLoader { public static final Werkstoff RedZircon = new Werkstoff( new short[]{195, 19, 19, 0}, "Red Zircon", - new Werkstoff.Stats().setElektrolysis(true).setMeltingPoint(2130), + new Werkstoff.Stats().setElektrolysis(false).setMeltingPoint(2130), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().addGems(), 19, @@ -483,7 +484,7 @@ public class WerkstoffLoader { public static final Werkstoff Fayalit = new Werkstoff( new short[]{50, 50, 50, 0}, "Fayalite", - new Werkstoff.Stats().setElektrolysis(true), + new Werkstoff.Stats().setElektrolysis(false), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().addGems(), 23, @@ -496,7 +497,7 @@ public class WerkstoffLoader { public static final Werkstoff Forsterit = new Werkstoff( new short[]{255, 255, 255, 0}, "Forsterite", - new Werkstoff.Stats().setElektrolysis(true), + new Werkstoff.Stats().setElektrolysis(false), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().addGems(), 24, @@ -509,7 +510,7 @@ public class WerkstoffLoader { public static final Werkstoff Hedenbergit = new Werkstoff( new short[]{100, 150, 100, 0}, "Hedenbergite", - new Werkstoff.Stats().setElektrolysis(true), + new Werkstoff.Stats().setElektrolysis(false), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().addGems(), 25, @@ -552,7 +553,7 @@ public class WerkstoffLoader { new short[]{0x4D, 0x7F, 0x64, 0}, "Green Fuchsite", subscriptNumbers("KAl3Si3O10(OH)2"), - new Werkstoff.Stats().setElektrolysis(true), + new Werkstoff.Stats().setElektrolysis(false), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures(), 28, @@ -569,7 +570,7 @@ public class WerkstoffLoader { new short[]{128, 0, 0, 0}, "Red Fuchsite", subscriptNumbers("KCr3Si3O10(OH)2"), - new Werkstoff.Stats().setElektrolysis(true), + new Werkstoff.Stats().setElektrolysis(false), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures(), 29, @@ -646,7 +647,7 @@ public class WerkstoffLoader { public static final Werkstoff Prasiolite = new Werkstoff( new short[]{0xD0, 0xDD, 0x95, 0}, "Prasiolite", - new Werkstoff.Stats().setElektrolysis(true).setMeltingPoint(1923), + new Werkstoff.Stats().setElektrolysis(false).setMeltingPoint(1923), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().addGems(), 35, -- cgit From bd049c1189527a02f76f53296d3d0dd91f1007a5 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Fri, 1 Oct 2021 12:42:09 +0200 Subject: change AlO2 to Al and SiO2 to Si Former-commit-id: c49673c71786def934e9820e60a78fac5da9a1ae --- .../bartworks/system/material/WerkstoffLoader.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java index d80ba8aba7..91ba6ee440 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java @@ -253,7 +253,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 5, TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon), new Pair<>(Materials.Sodium, 1), new Pair<>(Materials.Iron, 3), new Pair<>(Materials.Aluminium, 6), @@ -281,7 +281,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 7, TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon), new Pair<>(Materials.Sodium, 1), new Pair<>(Materials.Chrome, 3), new Pair<>(Materials.Magnalium, 6), @@ -299,7 +299,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 8, TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon), new Pair<>(Materials.Sodium, 1), new Pair<>(Materials.Vanadium, 3), new Pair<>(Materials.Magnalium, 6), @@ -317,7 +317,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 9, TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon), new Pair<>(Materials.Sodium, 1), new Pair<>(Materials.Aluminium, 9), new Pair<>(Materials.Silicon, 6), @@ -439,7 +439,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 19, TextureSet.SET_GEM_VERTICAL, - Arrays.asList(WerkstoffLoader.Zirconium, Materials.SiliconDioxide), + Arrays.asList(WerkstoffLoader.Zirconium, Materials.Silicon), new Pair<>(WerkstoffLoader.Zirconium, 1), new Pair<>(Materials.Silicon, 1), new Pair<>(Materials.Oxygen, 4) @@ -489,7 +489,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 23, TextureSet.SET_QUARTZ, - Arrays.asList(Materials.Iron, Materials.SiliconDioxide), + Arrays.asList(Materials.Iron, Materials.Silicon), new Pair<>(Materials.Iron, 2), new Pair<>(Materials.Silicon, 1), new Pair<>(Materials.Oxygen, 4) @@ -502,7 +502,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 24, TextureSet.SET_QUARTZ, - Arrays.asList(Materials.Magnesium, Materials.SiliconDioxide), + Arrays.asList(Materials.Magnesium, Materials.Silicon), new Pair<>(Materials.Magnesium, 2), new Pair<>(Materials.Silicon, 1), new Pair<>(Materials.Oxygen, 4) @@ -515,7 +515,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 25, TextureSet.SET_QUARTZ, - Arrays.asList(Materials.Iron, Materials.Calcium, Materials.SiliconDioxide), + Arrays.asList(Materials.Iron, Materials.Calcium, Materials.Silicon), new Pair<>(Materials.Calcium, 1), new Pair<>(Materials.Iron, 1), new Pair<>(Materials.Silicon, 2), @@ -558,7 +558,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures(), 28, TextureSet.SET_METALLIC, - Arrays.asList(Materials.Potassium, Materials.Aluminiumoxide, Materials.SiliconDioxide), + Arrays.asList(Materials.Potassium, Materials.Aluminium, Materials.Silicon), new Pair<>(Materials.Potassium, 1), new Pair<>(Materials.Aluminium, 3), new Pair<>(Materials.Silicon, 3), @@ -575,7 +575,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures(), 29, TextureSet.SET_METALLIC, - Arrays.asList(Materials.Potassium, Materials.Chrome, Materials.SiliconDioxide), + Arrays.asList(Materials.Potassium, Materials.Chrome, Materials.Silicon), new Pair<>(Materials.Potassium, 1), new Pair<>(Materials.Chrome, 3), new Pair<>(Materials.Silicon, 3), @@ -1109,7 +1109,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().disable().onlyDust(), 71, TextureSet.SET_DULL, - new Pair<>(Materials.SiliconDioxide, 3), + new Pair<>(Materials.Silicon, 3), new Pair<>(Materials.Gold, 2) ); public static final Werkstoff AcidicOsmiumSolution = new Werkstoff( -- cgit From b025fff4c8b9148391cf71b596083b01399cd78f Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Fri, 1 Oct 2021 12:43:21 +0200 Subject: change SiO2 back to Si Former-commit-id: ad8dfa08d3309f5f40386d27b2d7274eed9cbc82 --- .../bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java index ba25171e1f..40e2a8b878 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java @@ -497,18 +497,18 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase static final Fuel_[] sHTGR_Fuel = new Fuel_[]{ new Fuel_("Thorium", "Thorium", WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 64), Materials.Uranium235.getDust(4), GT_Values.NF, new ItemStack[]{ - Materials.SiliconDioxide.getDust(1), Materials.Graphite.getDust(1), Materials.Carbon.getDust(1), + Materials.Silicon.getDust(1), Materials.Graphite.getDust(1), Materials.Carbon.getDust(1), Materials.Lutetium.getDust(1), WerkstoffLoader.Thorium232.get(OrePrefixes.dust,1)}, new int[]{9000, 9000, 9000, 9000, 1000}, "Multiplies coolant by 1"), new Fuel_("Uranium", "Uranium", Materials.Uranium.getDust(64), Materials.Uranium235.getDust(8), FluidRegistry.getFluidStack("krypton", 8), new ItemStack[]{ - Materials.SiliconDioxide.getDust(1), Materials.Graphite.getDust(1), Materials.Carbon.getDust(1), + Materials.Silicon.getDust(1), Materials.Graphite.getDust(1), Materials.Carbon.getDust(1), Materials.Lead.getDust(1), Materials.Uranium.getDust(1)}, new int[]{9000, 9000, 9000, 7000, 1000}, "Multiplies coolant by 1.5"), new Fuel_("Plutonium", "Plutonium", Materials.Plutonium.getDust(64), Materials.Plutonium241.getDust(4), FluidRegistry.getFluidStack("xenon", 8), new ItemStack[]{ - Materials.SiliconDioxide.getDust(1), Materials.Graphite.getDust(1), Materials.Carbon.getDust(1), + Materials.Silicon.getDust(1), Materials.Graphite.getDust(1), Materials.Carbon.getDust(1), Materials.Lead.getDust(1), Materials.Plutonium.getDust(1)}, new int[]{9000, 9000, 9000, 7000, 1000}, "Multiplies coolant by 2"), -- cgit From fdfc0c6c5965c4668ec4a2f439be5c3c861b7fc0 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Fri, 1 Oct 2021 12:45:37 +0200 Subject: this was SiO2 by default Former-commit-id: 614dfd6ed9fd17c79e82173c92ac6e2f7350ca47 --- .../github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java index 91ba6ee440..2d9f445dfb 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java @@ -1109,7 +1109,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().disable().onlyDust(), 71, TextureSet.SET_DULL, - new Pair<>(Materials.Silicon, 3), + new Pair<>(Materials.SiliconDioxide, 3), new Pair<>(Materials.Gold, 2) ); public static final Werkstoff AcidicOsmiumSolution = new Werkstoff( -- cgit From 178006243ad74b40aa1417dc3a1e3896e1383253 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Fri, 1 Oct 2021 13:09:31 +0200 Subject: change SI back to SiO2 and AL to AlO2 as byproduct Former-commit-id: 636cc6aae424e75bd38c36c9f2d305028712d238 --- .../bartworks/system/material/WerkstoffLoader.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java index 2d9f445dfb..d80ba8aba7 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java @@ -253,7 +253,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 5, TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon), + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), new Pair<>(Materials.Sodium, 1), new Pair<>(Materials.Iron, 3), new Pair<>(Materials.Aluminium, 6), @@ -281,7 +281,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 7, TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon), + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), new Pair<>(Materials.Sodium, 1), new Pair<>(Materials.Chrome, 3), new Pair<>(Materials.Magnalium, 6), @@ -299,7 +299,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 8, TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon), + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), new Pair<>(Materials.Sodium, 1), new Pair<>(Materials.Vanadium, 3), new Pair<>(Materials.Magnalium, 6), @@ -317,7 +317,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 9, TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon), + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), new Pair<>(Materials.Sodium, 1), new Pair<>(Materials.Aluminium, 9), new Pair<>(Materials.Silicon, 6), @@ -439,7 +439,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 19, TextureSet.SET_GEM_VERTICAL, - Arrays.asList(WerkstoffLoader.Zirconium, Materials.Silicon), + Arrays.asList(WerkstoffLoader.Zirconium, Materials.SiliconDioxide), new Pair<>(WerkstoffLoader.Zirconium, 1), new Pair<>(Materials.Silicon, 1), new Pair<>(Materials.Oxygen, 4) @@ -489,7 +489,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 23, TextureSet.SET_QUARTZ, - Arrays.asList(Materials.Iron, Materials.Silicon), + Arrays.asList(Materials.Iron, Materials.SiliconDioxide), new Pair<>(Materials.Iron, 2), new Pair<>(Materials.Silicon, 1), new Pair<>(Materials.Oxygen, 4) @@ -502,7 +502,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 24, TextureSet.SET_QUARTZ, - Arrays.asList(Materials.Magnesium, Materials.Silicon), + Arrays.asList(Materials.Magnesium, Materials.SiliconDioxide), new Pair<>(Materials.Magnesium, 2), new Pair<>(Materials.Silicon, 1), new Pair<>(Materials.Oxygen, 4) @@ -515,7 +515,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures().addGems(), 25, TextureSet.SET_QUARTZ, - Arrays.asList(Materials.Iron, Materials.Calcium, Materials.Silicon), + Arrays.asList(Materials.Iron, Materials.Calcium, Materials.SiliconDioxide), new Pair<>(Materials.Calcium, 1), new Pair<>(Materials.Iron, 1), new Pair<>(Materials.Silicon, 2), @@ -558,7 +558,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures(), 28, TextureSet.SET_METALLIC, - Arrays.asList(Materials.Potassium, Materials.Aluminium, Materials.Silicon), + Arrays.asList(Materials.Potassium, Materials.Aluminiumoxide, Materials.SiliconDioxide), new Pair<>(Materials.Potassium, 1), new Pair<>(Materials.Aluminium, 3), new Pair<>(Materials.Silicon, 3), @@ -575,7 +575,7 @@ public class WerkstoffLoader { new Werkstoff.GenerationFeatures(), 29, TextureSet.SET_METALLIC, - Arrays.asList(Materials.Potassium, Materials.Chrome, Materials.Silicon), + Arrays.asList(Materials.Potassium, Materials.Chrome, Materials.SiliconDioxide), new Pair<>(Materials.Potassium, 1), new Pair<>(Materials.Chrome, 3), new Pair<>(Materials.Silicon, 3), -- cgit