aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/material
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2021-12-12 12:34:49 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2021-12-12 12:34:49 +0000
commitcdaa19e700a862766e1af69528c42af43cf1a1fc (patch)
treecb065ed7cae780e5b11e35431cf54171e0534c3c /src/Java/gtPlusPlus/core/material
parent5e0647862dae8d3cc847f09ff081e424a537f7f4 (diff)
downloadGT5-Unofficial-cdaa19e700a862766e1af69528c42af43cf1a1fc.tar.gz
GT5-Unofficial-cdaa19e700a862766e1af69528c42af43cf1a1fc.tar.bz2
GT5-Unofficial-cdaa19e700a862766e1af69528c42af43cf1a1fc.zip
Fixed cells being consumed in nuclear reprocessing.
Removed some debug logging. Removed ClassTransformer_CC_GuiContainerManager. Improved handling in GT_NEI_LFTR_Sparging. Added Erbium. Added HeLiCoPtEr.
Diffstat (limited to 'src/Java/gtPlusPlus/core/material')
-rw-r--r--src/Java/gtPlusPlus/core/material/ALLOY.java18
-rw-r--r--src/Java/gtPlusPlus/core/material/ORES.java3
2 files changed, 21 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index f51dbf920d..fd7547970c 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -745,6 +745,24 @@ public final class ALLOY {
/*
* Top Tier Alloys
*/
+
+ public static final Material HELICOPTER = new Material(
+ "HeLiCoPtEr", //Material Name
+ MaterialState.SOLID, //State
+ null, //Material Colour
+ 5763,
+ 8192,
+ -1,
+ -1,
+ true, //Uses Blast furnace?
+ //Material Stacks with Percentage of required elements.
+ new MaterialStack[]{
+ new MaterialStack(ELEMENT.getInstance().HELIUM, 20),
+ new MaterialStack(ELEMENT.getInstance().LITHIUM, 20),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 20),
+ new MaterialStack(ELEMENT.getInstance().PLATINUM, 20),
+ new MaterialStack(ELEMENT.getInstance().ERBIUM, 20)
+ });
//0lafe Compound
public static final Material LAFIUM = new Material(
diff --git a/src/Java/gtPlusPlus/core/material/ORES.java b/src/Java/gtPlusPlus/core/material/ORES.java
index 262852eec7..0186c23a07 100644
--- a/src/Java/gtPlusPlus/core/material/ORES.java
+++ b/src/Java/gtPlusPlus/core/material/ORES.java
@@ -245,6 +245,7 @@ public final class ORES {
-1, //Radiation
new MaterialStack[]{
new MaterialStack(ELEMENT.getInstance().CERIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
@@ -267,6 +268,7 @@ public final class ORES {
-1, //Radiation
new MaterialStack[]{
new MaterialStack(ELEMENT.getInstance().CERIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4),
@@ -661,6 +663,7 @@ public final class ORES {
new MaterialStack[]{
new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
new MaterialStack(ELEMENT.getInstance().EUROPIUM, 1),
new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 2),
new MaterialStack(ELEMENT.getInstance().OXYGEN, 8)