diff options
| -rw-r--r-- | src/main/java/GoodGenerator/Items/MyMaterial.java | 102 | ||||
| -rw-r--r-- | src/main/java/GoodGenerator/util/CrackRecipeAdder.java | 14 | ||||
| -rw-r--r-- | src/main/resources/assets/goodgenerator/lang/en_US.lang | 16 |
3 files changed, 124 insertions, 8 deletions
diff --git a/src/main/java/GoodGenerator/Items/MyMaterial.java b/src/main/java/GoodGenerator/Items/MyMaterial.java index 65eb71e108..f5fa273c91 100644 --- a/src/main/java/GoodGenerator/Items/MyMaterial.java +++ b/src/main/java/GoodGenerator/Items/MyMaterial.java @@ -334,6 +334,108 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID ); + public static final Werkstoff ether = new Werkstoff( + new short[]{0xeb,0xbc,0x2f}, + "ether", + subscriptNumbers("CH3CH2OCH2CH3"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + 31028, + TextureSet.SET_FLUID, + new Pair<> (Carbon,4), + new Pair<> (Hydrogen, 10), + new Pair<> (Oxygen, 1) + ); + + public static final Werkstoff antimonyTrichloride = new Werkstoff( + new short[]{0x0f,0xdc,0x34}, + "Antimony Trichloride", + subscriptNumbers("SbCl3"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + 31029, + TextureSet.SET_FLUID + ); + + public static final Werkstoff antimonyPentachloride = new Werkstoff( + new short[]{0x15,0x93,0x2c}, + "Antimony Pentachloride", + subscriptNumbers("SbCl5"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + 31030, + TextureSet.SET_FLUID + ); + + public static final Werkstoff antimonyPentafluoride = new Werkstoff( + new short[]{0x16,0xd5,0xe2}, + "Antimony Pentafluoride", + subscriptNumbers("SbF5"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + 31031, + TextureSet.SET_FLUID + ); + + public static final Werkstoff fluoroantimonicAcid = new Werkstoff( + new short[]{0x16,0xd5,0xe2}, + "Fluoroantimonic Acid", + subscriptNumbers("HSbF6"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + 31032, + TextureSet.SET_FLUID + ); + + public static final Werkstoff radioactiveSludge = new Werkstoff( + new short[]{0xb3,0x49,0x1e}, + "Radioactive Sludge", + ">>> DANGER <<<", + new Werkstoff.Stats().setRadioactive(true), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + 31033, + TextureSet.SET_DULL + ); + + public static final Werkstoff acidNaquadahEmulsion = new Werkstoff( + new short[]{0x25,0x22,0x22}, + "Acid Naquadah Emulsion", + "??Nq??H"+CharExchanger.shifter(8314), + new Werkstoff.Stats().setRadioactive(true), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + 31034, + TextureSet.SET_FLUID + ); + + public static final Werkstoff NaquadahEmulsion = new Werkstoff( + new short[]{0x4a,0x46,0x45}, + "Naquadah Emulsion", + "??Nq??", + new Werkstoff.Stats().setRadioactive(true), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + 31035, + TextureSet.SET_FLUID + ); + + public static final Werkstoff NaquadahSolution = new Werkstoff( + new short[]{0x84,0x81,0x80}, + "Naquadah Solution", + "~Nq~", + new Werkstoff.Stats().setRadioactive(true), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + 31036, + TextureSet.SET_FLUID + ); + @Override public void run() { } } diff --git a/src/main/java/GoodGenerator/util/CrackRecipeAdder.java b/src/main/java/GoodGenerator/util/CrackRecipeAdder.java new file mode 100644 index 0000000000..7cec9e893a --- /dev/null +++ b/src/main/java/GoodGenerator/util/CrackRecipeAdder.java @@ -0,0 +1,14 @@ +package GoodGenerator.util; + +import net.minecraftforge.fluids.FluidStack; + +public class CrackRecipeAdder { + float coe1[] = {1.25f,1.2f,1.1f,0.9f,0.85f,0.8f}; + float coe2[] = {1.4f,1.25f,1.2f,0.8f,0.75f,0.7f}; + float coe3[] = {1.6f,1.5f,1.45f,0.7f,0.6f,0.55f}; + public static void crackerAdder(FluidStack inputFluid,FluidStack[] outputFluids){ + String name; + name = inputFluid.getFluid().getName(); + //WIP + } +} diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang index 17559f7fd9..ce49eb426f 100644 --- a/src/main/resources/assets/goodgenerator/lang/en_US.lang +++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang @@ -17,29 +17,29 @@ item.rawAtomicSeparationCatalyst.name=Raw Atomic Separation Catalyst fluid.lightlyCrackedNaquadahGas=Lightly Cracked Naquadah Gas fluid.moderatelyCrackedNaquadahGas=Moderately Cracked Naquadah Gas -fluid.heavilyCrackedNaquadahGas=Heavily Cracked Naquadah Gas +fluid.heavilyCrackedNaquadahGas=Severely Cracked Naquadah Gas fluid.lightlyCrackedLightNaquadahFuel=Lightly Cracked Light Naquadah Fuel fluid.moderatelyCrackedLightNaquadahFuel=Moderately Cracked Light Naquadah Fuel -fluid.heavilyCrackedLightNaquadahFuel=Heavily Cracked Light Naquadah Fuel +fluid.heavilyCrackedLightNaquadahFuel=Severely Cracked Light Naquadah Fuel fluid.lightlyCrackedHeavyNaquadahFuel=Lightly Cracked Heavy Naquadah Fuel fluid.moderatelyCrackedHeavyNaquadahFuel=Moderately Cracked Heavy Naquadah Fuel -fluid.heavilyCrackedHeavyNaquadahFuel=Heavily Cracked Heavy Naquadah Fuel +fluid.heavilyCrackedHeavyNaquadahFuel=Severely Cracked Heavy Naquadah Fuel fluid.lightlyCrackedNaquadahAsphalt=Lightly Cracked Naquadah Asphalt fluid.moderatelyCrackedNaquadahAsphalt=Moderately Cracked Naquadah Asphalt -fluid.heavilyCrackedNaquadahAsphalt=Heavily Cracked Naquadah Asphalt +fluid.heavilyCrackedNaquadahAsphalt=Severely Cracked Naquadah Asphalt tile.lightlyCrackedNaquadahGas.name=Lightly Cracked Naquadah Gas tile.moderatelyCrackedNaquadahGas.name=Moderately Cracked Naquadah Gas -tile.heavilyCrackedNaquadahGas.name=Heavily Cracked Naquadah Gas +tile.heavilyCrackedNaquadahGas.name=Severely Cracked Naquadah Gas tile.lightlyCrackedLightNaquadahFuel.name=Lightly Cracked Light Naquadah Fuel tile.moderatelyCrackedLightNaquadahFuel.name=Moderately Cracked Light Naquadah Fuel -tile.heavilyCrackedLightNaquadahFuel.name=Heavily Cracked Light Naquadah Fuel +tile.heavilyCrackedLightNaquadahFuel.name=Severely Cracked Light Naquadah Fuel tile.lightlyCrackedHeavyNaquadahFuel.name=Lightly Cracked Heavy Naquadah Fuel tile.moderatelyCrackedHeavyNaquadahFuel.name=Moderately Cracked Heavy Naquadah Fuel -tile.heavilyCrackedHeavyNaquadahFuel.name=Heavily Cracked Heavy Naquadah Fuel +tile.heavilyCrackedHeavyNaquadahFuel.name=Severely Cracked Heavy Naquadah Fuel tile.lightlyCrackedNaquadahAsphalt.name=Lightly Cracked Naquadah Asphalt tile.moderatelyCrackedNaquadahAsphalt.name=Moderately Cracked Naquadah Asphalt -tile.heavilyCrackedNaquadahAsphalt.name=Heavily Cracked Naquadah Asphalt +tile.heavilyCrackedNaquadahAsphalt.name=Severely Cracked Naquadah Asphalt itemGroup.Good Generator=Good Generator |