aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorDreamMasterXXL <dream-master@gmx.net>2021-09-27 01:58:48 +0200
committerDreamMasterXXL <dream-master@gmx.net>2021-09-27 01:58:48 +0200
commita42f797c22e5f921d736621b7762b8cc2fada7bb (patch)
tree2dabc235a4931b026dd63750b9c25989e38001fc /src/main/java
parent16a9d812cf97e137835ea2740941f0c6e28e31c1 (diff)
downloadGT5-Unofficial-a42f797c22e5f921d736621b7762b8cc2fada7bb.tar.gz
GT5-Unofficial-a42f797c22e5f921d736621b7762b8cc2fada7bb.tar.bz2
GT5-Unofficial-a42f797c22e5f921d736621b7762b8cc2fada7bb.zip
fix a few recipe. Need to make new Centrifuge and Electrolyzer recipes
Former-commit-id: be3d5aa13a44425869695b897e1e8436d25ff131
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java6
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java46
2 files changed, 26 insertions, 26 deletions
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)
);