diff options
Diffstat (limited to 'src/main/java/com/elisis/gtnhlanth/common')
| -rw-r--r-- | src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java | 10 | ||||
| -rw-r--r-- | src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java | 84 |
2 files changed, 83 insertions, 11 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java index b6adfaf7f6..63fa8e0ba2 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java @@ -7,6 +7,8 @@ import static gregtech.api.enums.Materials.*; import static gregtech.api.enums.TextureSet.*; import static com.github.bartimaeusnek.bartworks.system.material.Werkstoff.Types.*; +import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; + @SuppressWarnings("unchecked") public class BotWerkstoffMaterialPool implements Runnable { @@ -62,6 +64,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff SodiumTungstate = new Werkstoff( new short[]{0xc, 0xed, 0xd7,0}, "Sodium Tungstate", + subscriptNumbers("Na2WO4"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -71,6 +74,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff Phosgene = new Werkstoff( new short[]{0x15,0xa1,0x1a}, "Phosgene", + subscriptNumbers("COCl2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -80,6 +84,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff Ethylchloroformate = new Werkstoff( new short[]{0x0a,0xc2,0xcc}, "Ethyl Chloroformate", + subscriptNumbers("C3H5ClO2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -89,6 +94,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff Ethylcarbamate = new Werkstoff( new short[]{0x0d,0xa9,0xb8}, "Ethyl Carbamate", + subscriptNumbers("CH3CH2OCNH2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -98,6 +104,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff EthylNnitrocarbamate = new Werkstoff( new short[]{0x0d,0x85,0xb8}, "Ethyl N-nitrocarbamate", + subscriptNumbers("C3H6N2O4"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -107,6 +114,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff AmmoniumNnitrourethane = new Werkstoff( new short[]{0x0d,0x54,0xb8}, "Ammonium N-nitrourethane", + subscriptNumbers("C3H10N3O4"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -116,6 +124,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff EthylDinitrocarbamate = new Werkstoff( new short[]{0x39,0x08,0xc2}, "Ethyl Dinitrocarbamate", + subscriptNumbers("C3H5N3O6"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -125,6 +134,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff DinitrogenPentoxide = new Werkstoff( new short[]{0xcf,0xeb,0x34}, "Dinitrogen Pentoxide", + subscriptNumbers("N2O5"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().onlyDust(), diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java index b48dc3f2b4..7ea70d4368 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -2,16 +2,21 @@ package com.elisis.gtnhlanth.common.register; import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers;
+import java.util.Arrays;
+
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-import com.github.bartimaeusnek.bartworks.system.material.Werkstoff.GenerationFeatures;
+import com.github.bartimaeusnek.bartworks.util.EnumUtils;
+import com.github.bartimaeusnek.bartworks.util.Pair;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.SubTag;
import gregtech.api.enums.TextureSet;
@SuppressWarnings({"unchecked"})
public class WerkstoffMaterialPool implements Runnable {
private static final int offsetID = 11_000;
- private static final int offsetID2 = 11_046;
+ private static final int offsetID2 = 11_100;
private static final int offsetID3 = 11_300;
/*
@@ -165,8 +170,8 @@ public class WerkstoffMaterialPool implements Runnable { new short[] {171, 40, 175},
"Iodine",
subscriptNumbers("I"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
+ new Werkstoff.Stats().setProtons(53).setMass(127).setSublimation(true).setBoilingPoint(484).setGas(true),
+ Werkstoff.Types.ELEMENT,
new Werkstoff.GenerationFeatures().disable().onlyDust().addCells().enforceUnification(),
offsetID + 12,
TextureSet.SET_FLUID
@@ -332,11 +337,14 @@ public class WerkstoffMaterialPool implements Runnable { new short[] {255, 255, 102},
"Cerium (III) Oxide",
subscriptNumbers("Ce2O3"),
- new Werkstoff.Stats(),
+ new Werkstoff.Stats().setElektrolysis(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 28,
- TextureSet.SET_DULL
+ TextureSet.SET_DULL,
+ Arrays.asList(Materials.Cerium, Materials.Oxygen),
+ new Pair<>(Materials.Cerium, 2),
+ new Pair<>(Materials.Oxygen, 3)
);
public static final Werkstoff CeriumRichMixture = new Werkstoff(
@@ -523,6 +531,43 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID
);
+ public static final Werkstoff EuropiumOxide = new Werkstoff(
+ new short[] {255, 255, 255},
+ "Europium Oxide",
+ subscriptNumbers("EuO"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 46,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff EuropiumSulfide = new Werkstoff(
+ new short[] {5, 0, 5},
+ "Europium Sulfide",
+ subscriptNumbers("EuS"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 47,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff UnknownBlend = new Werkstoff(
+ new short[] {0, 0, 5},
+ "UnknownBlend",
+ subscriptNumbers("?????"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 48,
+ TextureSet.SET_DULL
+ );
+
+
+
+
+ // TODO
@@ -673,6 +718,8 @@ public class WerkstoffMaterialPool implements Runnable { +
+
// Weird/Exciting Chemicals
public static final Werkstoff Tetrahydrofuran = new Werkstoff(
new short[] {255, 255, 255}, //TODO
@@ -789,6 +836,7 @@ public class WerkstoffMaterialPool implements Runnable { public static final Werkstoff Diaminotoluene = new Werkstoff(
new short[] {255, 255, 255},
"Diaminotoluene",
+ subscriptNumbers("C6H3(NH2)2CH3"),
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
@@ -810,16 +858,30 @@ public class WerkstoffMaterialPool implements Runnable { public static final Werkstoff PTMEGElastomer = new Werkstoff(
new short[] {255, 255, 255},
"PTMEG Elastomer",
- subscriptNumbers("(CONH)2(C6H4)2CH2(C4O)"),
- new Werkstoff.Stats(),
+ new Werkstoff.Stats().setMeltingPoint(200),
Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().addCells(),
+ new Werkstoff.GenerationFeatures().disable()
+ .onlyDust()
+ .addMetalItems()
+ .addMolten()
+ .addSimpleMetalWorkingItems()
+ ,
offsetID3 + 12,
- TextureSet.SET_FLUID
- );
+ TextureSet.SET_METALLIC
+ );
+ public static void runInit() {
+
+ addSubTags();
+
+ }
+ private static void addSubTags() {
+
+ WerkstoffMaterialPool.PTMEGElastomer.add(SubTag.BOUNCY, SubTag.STRETCHY);
+
+ }
|