diff options
| author | chochem <40274384+chochem@users.noreply.github.com> | 2023-06-05 14:57:20 +0100 |
|---|---|---|
| committer | chochem <40274384+chochem@users.noreply.github.com> | 2023-06-05 16:28:44 +0100 |
| commit | ce44fcdc05330366aea961b2781d047b9a6af9f4 (patch) | |
| tree | bf1bf78296f7d9590f1f8392347e8d58bff30284 /src | |
| parent | e0f4d181db3ad853c6c696e09a47c6400b9f437c (diff) | |
| download | GT5-Unofficial-ce44fcdc05330366aea961b2781d047b9a6af9f4.tar.gz GT5-Unofficial-ce44fcdc05330366aea961b2781d047b9a6af9f4.tar.bz2 GT5-Unofficial-ce44fcdc05330366aea961b2781d047b9a6af9f4.zip | |
deprecation didnt work. just remove.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java | 39 | ||||
| -rw-r--r-- | src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java | 23 |
2 files changed, 12 insertions, 50 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 77f33d2a61..6c268ea2e6 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java @@ -40,18 +40,6 @@ public class BotWerkstoffMaterialPool implements Runnable { SET_SHINY, new Pair<>(Tungsten, 1), new Pair<>(Oxygen, 3)); - // public static final Werkstoff TungstenSteelOxide = new Werkstoff( - // new short[]{0x1f,0x27,0x69}, - // "Tungstensteel Oxide", - // new Werkstoff.Stats(), - // COMPOUND, - // new Werkstoff.GenerationFeatures().onlyDust(), - // 29902, - // SET_FINE, - // new Pair<>(Tungsten, 1), - // new Pair<>(Oxygen,3), - // new Pair<>(Steel,1) - // ); public static final Werkstoff AmmoniumNitrate = new Werkstoff( new short[] { 0x81, 0xcc, 0x00 }, "Ammonium Nitrate", @@ -208,24 +196,6 @@ public class BotWerkstoffMaterialPool implements Runnable { new Werkstoff.GenerationFeatures().disable().addCells(), 29920, SET_METALLIC); - public static final Werkstoff HydrogenPeroxide = new Werkstoff( - new short[] { 0xad, 0x53, 0x1a }, - "Hydrogen Peroxide", - subscriptNumbers("H2O2"), - new Werkstoff.Stats(), - COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells().enforceUnification(), - 29921, - SET_METALLIC); - public static final Werkstoff Hydrazine = new Werkstoff( - new short[] { 0xb5, 0x07, 0x07 }, - "hydrazine", - subscriptNumbers("N2H4"), - new Werkstoff.Stats(), - COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - 29922, - SET_METALLIC); public static final Werkstoff DimethylSulfate = new Werkstoff( new short[] { 0xff, 0xfb, 0x00 }, "Dimethyl Sulfate", @@ -244,15 +214,6 @@ public class BotWerkstoffMaterialPool implements Runnable { new Werkstoff.GenerationFeatures().disable().addCells(), 29924, SET_METALLIC); - public static final Werkstoff Formaldehyde = new Werkstoff( - new short[] { 0x2e, 0xd9, 0x83 }, - "Formaldehyde", - subscriptNumbers("CH2O"), - new Werkstoff.Stats(), - COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - 29925, - SET_METALLIC); public static final Werkstoff EthylAcetate = new Werkstoff( new short[] { 0x0c, 0xfb, 0x32b }, "Ethyl Acetate", diff --git a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java index adbfb8b0c1..14452dc0c9 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java @@ -492,18 +492,19 @@ public class BotRecipes { null, 40, 30_720); - } - // C2H6N2O + 2CH2O + 4H = C2H8N2 + C2H4O2 + H2O - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { C2 }, - new FluidStack[] { Acetylhydrazine.getFluidOrGas(1000), Formaldehyde.getFluidOrGas(2000), - Materials.Hydrogen.getGas(4000) }, - new FluidStack[] { UnsymmetricalDimethylhydrazine.getFluidOrGas(1000), - Materials.AceticAcid.getFluid(1000), Materials.Water.getFluid(1000) }, - null, - 20, - 122_880); + // C2H6N2O + 2CH2O + 4H = C2H8N2 + C2H4O2 + H2O + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[] { C2 }, + new FluidStack[] { Acetylhydrazine.getFluidOrGas(1000), + new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 2000), + Materials.Hydrogen.getGas(4000) }, + new FluidStack[] { UnsymmetricalDimethylhydrazine.getFluidOrGas(1000), + Materials.AceticAcid.getFluid(1000), Materials.Water.getFluid(1000) }, + null, + 20, + 122_880); + } } public static void addFuels() { |