diff options
author | DreamMasterXXL <dream-master@gmx.net> | 2021-09-27 00:56:58 +0200 |
---|---|---|
committer | DreamMasterXXL <dream-master@gmx.net> | 2021-09-27 00:56:58 +0200 |
commit | f0a62699601e8b8f947bbdbbce3ad821b95c56a1 (patch) | |
tree | 7e0dfbd277632f4fe853f05f44465d7e4b80f21f /src/main | |
parent | 849edba573d8bf0c4ac21ec695f6683aee3ca523 (diff) | |
download | GT5-Unofficial-f0a62699601e8b8f947bbdbbce3ad821b95c56a1.tar.gz GT5-Unofficial-f0a62699601e8b8f947bbdbbce3ad821b95c56a1.tar.bz2 GT5-Unofficial-f0a62699601e8b8f947bbdbbce3ad821b95c56a1.zip |
exchange silicondioxide with Silicon
exchange Aludioxide with Alu
Former-commit-id: c9531b147c7332c928170ea0bab21aa318d52487
Diffstat (limited to 'src/main')
2 files changed, 15 insertions, 15 deletions
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); |