diff options
| -rw-r--r-- | .idea.disabled/.gitignore | 3 | ||||
| -rw-r--r-- | .idea.disabled/compiler.xml | 18 | ||||
| -rw-r--r-- | .idea.disabled/gradle.xml | 19 | ||||
| -rw-r--r-- | .idea.disabled/jarRepositories.xml | 75 | ||||
| -rw-r--r-- | .idea.disabled/libraries/gradle_wrapper.xml | 9 | ||||
| -rw-r--r-- | .idea.disabled/misc.xml | 6 | ||||
| -rw-r--r-- | .idea.disabled/modules.xml | 8 | ||||
| -rw-r--r-- | .idea.disabled/vcs.xml | 6 | ||||
| -rw-r--r-- | src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java | 444 | ||||
| -rw-r--r-- | src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java | 1076 |
10 files changed, 1658 insertions, 6 deletions
diff --git a/.idea.disabled/.gitignore b/.idea.disabled/.gitignore new file mode 100644 index 0000000000..26d33521af --- /dev/null +++ b/.idea.disabled/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea.disabled/compiler.xml b/.idea.disabled/compiler.xml new file mode 100644 index 0000000000..4cfbddb5f3 --- /dev/null +++ b/.idea.disabled/compiler.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="CompilerConfiguration"> + <annotationProcessing> + <profile name="Gradle Imported" enabled="true"> + <outputRelativeToContentRoot value="true" /> + <processorPath useClasspath="false"> + <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.gtnewhorizons/rfg-javac-plugin/1.3.24/7265cfff54fd7593baf59aa6c37386e8e90933d7/rfg-javac-plugin-1.3.24.jar" /> + </processorPath> + <module name="LanthRework.main" /> + </profile> + </annotationProcessing> + <bytecodeTargetLevel target="1.8" /> + </component> + <component name="JavacSettings"> + <option name="ADDITIONAL_OPTIONS_STRING" value="-encoding utf8" /> + </component> +</project>
\ No newline at end of file diff --git a/.idea.disabled/gradle.xml b/.idea.disabled/gradle.xml new file mode 100644 index 0000000000..5c0b931b2c --- /dev/null +++ b/.idea.disabled/gradle.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="GradleMigrationSettings" migrationVersion="1" /> + <component name="GradleSettings"> + <option name="linkedExternalProjectsSettings"> + <GradleProjectSettings> + <option name="distributionType" value="DEFAULT_WRAPPED" /> + <option name="externalProjectPath" value="$PROJECT_DIR$" /> + <option name="gradleJvm" value="1.8" /> + <option name="modules"> + <set> + <option value="$PROJECT_DIR$" /> + </set> + </option> + <option name="useQualifiedModuleNames" value="true" /> + </GradleProjectSettings> + </option> + </component> +</project>
\ No newline at end of file diff --git a/.idea.disabled/jarRepositories.xml b/.idea.disabled/jarRepositories.xml new file mode 100644 index 0000000000..d6ffd88f5a --- /dev/null +++ b/.idea.disabled/jarRepositories.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="RemoteRepositoriesConfiguration"> + <remote-repository> + <option name="id" value="central" /> + <option name="name" value="Maven Central repository" /> + <option name="url" value="https://repo1.maven.org/maven2" /> + </remote-repository> + <remote-repository> + <option name="id" value="jboss.community" /> + <option name="name" value="JBoss Community repository" /> + <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" /> + </remote-repository> + <remote-repository> + <option name="id" value="Overmind forge repo mirror" /> + <option name="name" value="Overmind forge repo mirror" /> + <option name="url" value="https://gregtech.overminddl1.com/" /> + </remote-repository> + <remote-repository> + <option name="id" value="Modrinth" /> + <option name="name" value="Modrinth" /> + <option name="url" value="https://api.modrinth.com/maven" /> + </remote-repository> + <remote-repository> + <option name="id" value="MavenRepo" /> + <option name="name" value="MavenRepo" /> + <option name="url" value="https://repo.maven.apache.org/maven2/" /> + </remote-repository> + <remote-repository> + <option name="id" value="ic2-mirror" /> + <option name="name" value="ic2-mirror" /> + <option name="url" value="https://maven2.ic2.player.to/" /> + </remote-repository> + <remote-repository> + <option name="id" value="sonatype" /> + <option name="name" value="sonatype" /> + <option name="url" value="https://oss.sonatype.org/content/repositories/snapshots/" /> + </remote-repository> + <remote-repository> + <option name="id" value="CurseMaven" /> + <option name="name" value="CurseMaven" /> + <option name="url" value="https://cursemaven.com" /> + </remote-repository> + <remote-repository> + <option name="id" value="ic2" /> + <option name="name" value="ic2" /> + <option name="url" value="https://maven.ic2.player.to/" /> + </remote-repository> + <remote-repository> + <option name="id" value="mojang" /> + <option name="name" value="mojang" /> + <option name="url" value="https://libraries.minecraft.net" /> + </remote-repository> + <remote-repository> + <option name="id" value="MMD Maven" /> + <option name="name" value="MMD Maven" /> + <option name="url" value="https://maven.mcmoddev.com/" /> + </remote-repository> + <remote-repository> + <option name="id" value="GTNH Maven" /> + <option name="name" value="GTNH Maven" /> + <option name="url" value="http://jenkins.usrv.eu:8081/nexus/content/groups/public/" /> + </remote-repository> + <remote-repository> + <option name="id" value="forge" /> + <option name="name" value="forge" /> + <option name="url" value="https://maven.minecraftforge.net" /> + </remote-repository> + <remote-repository> + <option name="id" value="sponge" /> + <option name="name" value="sponge" /> + <option name="url" value="https://repo.spongepowered.org/maven/" /> + </remote-repository> + </component> +</project>
\ No newline at end of file diff --git a/.idea.disabled/libraries/gradle_wrapper.xml b/.idea.disabled/libraries/gradle_wrapper.xml new file mode 100644 index 0000000000..0796d76606 --- /dev/null +++ b/.idea.disabled/libraries/gradle_wrapper.xml @@ -0,0 +1,9 @@ +<component name="libraryTable"> + <library name="gradle-wrapper"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component>
\ No newline at end of file diff --git a/.idea.disabled/misc.xml b/.idea.disabled/misc.xml new file mode 100644 index 0000000000..65be7348e2 --- /dev/null +++ b/.idea.disabled/misc.xml @@ -0,0 +1,6 @@ +<project version="4"> + <component name="ExternalStorageConfigurationManager" enabled="true" /> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK"> + <output url="file://$PROJECT_DIR$/out" /> + </component> +</project>
\ No newline at end of file diff --git a/.idea.disabled/modules.xml b/.idea.disabled/modules.xml new file mode 100644 index 0000000000..455c37bbe7 --- /dev/null +++ b/.idea.disabled/modules.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/.idea/LanthRework.iml" filepath="$PROJECT_DIR$/.idea/LanthRework.iml" /> + </modules> + </component> +</project>
\ No newline at end of file diff --git a/.idea.disabled/vcs.xml b/.idea.disabled/vcs.xml new file mode 100644 index 0000000000..35eb1ddfbb --- /dev/null +++ b/.idea.disabled/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="" vcs="Git" /> + </component> +</project>
\ No newline at end of file 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 3b9f63b020..56e6f57aea 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -16,6 +16,8 @@ public class WerkstoffMaterialPool implements Runnable { private static final int offsetID = 11_000; private static final int offsetID2 = 11_100; private static final int offsetID3 = 11_300; + private static final int offsetID4 = 11_400; + private static final int offsetID5 = 11_440; /* * public static final Werkstoff __ = new Werkstoff( new short[] {_, _, _}, "__", new Werkstoff.Stats(), @@ -947,6 +949,448 @@ public class WerkstoffMaterialPool implements Runnable { offsetID3 + 16, TextureSet.SET_FLUID); + // TODO Samarium Processing Line Material regist + + public static final Werkstoff MuddySamariumRareEarthSolution = new Werkstoff( + new short[] { 226, 180, 108 }, + "Muddy Samarium Rare Earth Solution", + subscriptNumbers("???Sm???"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID5 + 1, + TextureSet.SET_FLUID); + + public static final Werkstoff SamariumRareEarthMud = new Werkstoff( + new short[] { 226, 180, 128 }, + "Samarium Rare Earth Mud", + subscriptNumbers("??Sm??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID5 + 2, + TextureSet.SET_FLUID); + + public static final Werkstoff DilutedSamariumRareEarthSolution = new Werkstoff( + new short[] { 226, 180, 148 }, + "Diluted Samarium Rare Earth Solution", + subscriptNumbers("?Sm?"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID5 + 3, + TextureSet.SET_FLUID); + + public static final Werkstoff ImpureSamariumOxalate = new Werkstoff( + new short[] { 248, 248, 180 }, + "Samarium Oxalate Enriched", + subscriptNumbers("?Sm2(C2O4)3"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID5 + 4, + TextureSet.SET_DULL); + + public static final Werkstoff ImpureSamariumChloride = new Werkstoff( + new short[] { 248, 248, 120 }, + "Impure Samarium Chloride", + subscriptNumbers("?SmCl3"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten(), + offsetID5 + 5, + TextureSet.SET_DULL); + + public static final Werkstoff SamariumChlorideSodiumChlorideBlend = new Werkstoff( + new short[] { 255, 200, 230 }, + "Samarium Chloride-Sodium Chloride Blend", + subscriptNumbers("?SmCl3NaCl"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID5 + 6, + TextureSet.SET_DULL); + + public static final Werkstoff ImpureLanthanumChloride = new Werkstoff( + new short[] { 90, 100, 30 }, + "Impure Lanthanum Chloride", + subscriptNumbers("?LaCl3"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID5 + 7, + TextureSet.SET_DULL); + + public static final Werkstoff SamariumOxide = new Werkstoff( + new short[] { 223, 182, 193 }, + "Samarium Oxide", + subscriptNumbers("Sm2O3"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID5 + 8, + TextureSet.SET_DULL, + Arrays.asList(Materials.Samarium, Materials.Oxygen), + new Pair<>(Materials.Samarium, 2), + new Pair<>(Materials.Oxygen, 3)); + + public static final Werkstoff SamariumChlorideConcentrate = new Werkstoff( + new short[] { 60, 110, 110 }, + "Samarium Chloride Concentrate", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID5 + 9, + TextureSet.SET_FLUID); + + public static final Werkstoff ChlorinatedRareEarthConcentrate = new Werkstoff( + new short[] { 130, 80, 60 }, + "Chlorinated Rare Earth Concentrate", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID5 + 10, + TextureSet.SET_FLUID); + + public static final Werkstoff ChlorinatedRareEarthEnrichedSolution = new Werkstoff( + new short[] { 130, 90, 60 }, + "Chlorinated Rare Earth Enriched Solution", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID5 + 11, + TextureSet.SET_FLUID); + + public static final Werkstoff ChlorinatedRareEarthDilutedSolution = new Werkstoff( + new short[] { 216, 180, 100 }, + "Chlorinated Rare Earth Diluted Solution", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID5 + 12, + TextureSet.SET_FLUID); + + public static final Werkstoff RarestEarthResidue = new Werkstoff( + new short[] { 224, 211, 211 }, + "Rarest Earth Residue", + subscriptNumbers("???"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID5 + 13, + TextureSet.SET_DULL); + + // TODO reg Lanth Ore Concentrate + /** + * Extracted Nano Resin Lanthanum1.2 Praseodymium3.4 Cerium5.6 Neodymium7.8 Promethium9.10 Samarium11.12 √ + * Europium13.14 Gadolinium15.16 Terbium17.18 Dysprosium19.20 Holmium21.22 Erbium23.24 Thulium25.26 Ytterbium27.28 + * Lutetium29.30 + */ + + public static final Werkstoff LanthanumExtractingNanoResin = new Werkstoff( + new short[] { 50, 80, 40 }, + "Lanthanum Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 1, + TextureSet.SET_FLUID); + + public static final Werkstoff FilledLanthanumExtractingNanoResin = new Werkstoff( + new short[] { 128, 128, 80 }, + "Filled Lanthanum Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 2, + TextureSet.SET_FLUID); + + public static final Werkstoff PraseodymiumExtractingNanoResin = new Werkstoff( + new short[] { 80, 192, 130 }, + "Praseodymium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 3, + TextureSet.SET_FLUID); + + public static final Werkstoff FilledPraseodymiumExtractingNanoResin = new Werkstoff( + new short[] { 140, 192, 130 }, + "Filled Praseodymium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 4, + TextureSet.SET_FLUID); + + public static final Werkstoff CeriumExtractingNanoResin = new Werkstoff( + new short[] { 80, 240, 160 }, + "Cerium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 5, + TextureSet.SET_FLUID); + + public static final Werkstoff FilledCeriumExtractingNanoResin = new Werkstoff( + new short[] { 160, 240, 180 }, + "Filled Cerium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 6, + TextureSet.SET_FLUID); + + public static final Werkstoff NeodymiumExtractingNanoResin = new Werkstoff( + new short[] { 128, 140, 128 }, + "Neodymium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 7, + TextureSet.SET_FLUID); + + public static final Werkstoff FilledNeodymiumExtractingNanoResin = new Werkstoff( + new short[] { 150, 175, 150 }, + "Filled Neodymium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 8, + TextureSet.SET_FLUID); + + public static final Werkstoff PromethiumExtractingNanoResin = new Werkstoff( + new short[] { 110, 255, 60 }, + "Promethium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 9, + TextureSet.SET_FLUID); + + public static final Werkstoff FilledPromethiumExtractingNanoResin = new Werkstoff( + new short[] { 150, 255, 140 }, + "Filled Promethium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 10, + TextureSet.SET_FLUID); + + public static final Werkstoff SamariumExtractingNanoResin = new Werkstoff( + new short[] { 255, 240, 100 }, + "Samarium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 11, + TextureSet.SET_FLUID); + + public static final Werkstoff FilledSamariumExtractingNanoResin = new Werkstoff( + new short[] { 255, 240, 196 }, + "Filled Samarium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 12, + TextureSet.SET_FLUID); + + public static final Werkstoff EuropiumExtractingNanoResin = new Werkstoff( + new short[] { 240, 160, 240 }, + "Europium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 13, + TextureSet.SET_FLUID); + + public static final Werkstoff FilledEuropiumExtractingNanoResin = new Werkstoff( + new short[] { 240, 200, 240 }, + "Filled Europium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 14, + TextureSet.SET_FLUID); + + public static final Werkstoff GadoliniumExtractingNanoResin = new Werkstoff( + new short[] { 120, 255, 80 }, + "Gadolinium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 15, + TextureSet.SET_FLUID); + + public static final Werkstoff FilledGadoliniumExtractingNanoResin = new Werkstoff( + new short[] { 160, 255, 140 }, + "Filled Gadolinium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 16, + TextureSet.SET_FLUID); + + public static final Werkstoff TerbiumExtractingNanoResin = new Werkstoff( + new short[] { 200, 200, 200 }, + "Terbium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 17, + TextureSet.SET_FLUID); + + public static final Werkstoff FilledTerbiumExtractingNanoResin = new Werkstoff( + new short[] { 255, 255, 255 }, + "Filled Terbium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 18, + TextureSet.SET_FLUID); + + public static final Werkstoff DysprosiumExtractingNanoResin = new Werkstoff( + new short[] { 110, 240, 180 }, + "Dysprosium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 19, + TextureSet.SET_FLUID); + + public static final Werkstoff FilledDysprosiumExtractingNanoResin = new Werkstoff( + new short[] { 150, 240, 180 }, + "Filled Dysprosium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 20, + TextureSet.SET_FLUID); + + public static final Werkstoff HolmiumExtractingNanoResin = new Werkstoff( + new short[] { 16, 16, 216 }, + "Holmium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 21, + TextureSet.SET_FLUID); + + public static final Werkstoff FilledHolmiumExtractingNanoResin = new Werkstoff( + new short[] { 60, 90, 255 }, + "Filled Holmium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 22, + TextureSet.SET_FLUID); + + public static final Werkstoff ErbiumExtractingNanoResin = new Werkstoff( + new short[] { 200, 160, 80 }, + "Erbium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 23, + TextureSet.SET_FLUID); + + public static final Werkstoff FilledErbiumExtractingNanoResin = new Werkstoff( + new short[] { 233, 170, 100 }, + "Filled Erbium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 24, + TextureSet.SET_FLUID); + + public static final Werkstoff ThuliumExtractingNanoResin = new Werkstoff( + new short[] { 128, 178, 255 }, + "Thulium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 25, + TextureSet.SET_FLUID); + + public static final Werkstoff FilledThuliumExtractingNanoResin = new Werkstoff( + new short[] { 160, 200, 255 }, + "Filled Thulium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 26, + TextureSet.SET_FLUID); + + public static final Werkstoff YtterbiumExtractingNanoResin = new Werkstoff( + new short[] { 0, 255, 0 }, + "Ytterbium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 27, + TextureSet.SET_FLUID); + + public static final Werkstoff FilledYtterbiumExtractingNanoResin = new Werkstoff( + new short[] { 100, 255, 100 }, + "Filled Ytterbium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 28, + TextureSet.SET_FLUID); + + public static final Werkstoff LutetiumExtractingNanoResin = new Werkstoff( + new short[] { 230, 16, 230 }, + "Lutetium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 29, + TextureSet.SET_FLUID); + + public static final Werkstoff FilledLutetiumExtractingNanoResin = new Werkstoff( + new short[] { 240, 100, 240 }, + "Filled Lutetium Extracting Nano Resin", + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID4 + 30, + TextureSet.SET_FLUID); + + public static final Werkstoff CeriumDopedLutetiumAluminiumOxygenBlend = new Werkstoff( + new short[] { 0, 200, 0 }, + "Cerium-doped Lutetium Aluminium Oxygen Blend", + subscriptNumbers("Lu3Al5O12"), + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID4 + 31, + TextureSet.SET_DULL); + + public static final Werkstoff CeriumDopedLutetiumAluminiumGarnet = new Werkstoff( + new short[] { 0, 255, 0 }, + "Cerium-doped Lutetium Aluminium Garnet (Ce:LuAG)", + subscriptNumbers("Lu3Al5O12"), + new Werkstoff.Stats(), + Werkstoff.Types.MATERIAL, + new Werkstoff.GenerationFeatures().disable().addGems(), + offsetID4 + 32, + TextureSet.SET_GEM_HORIZONTAL); + + // public static final Werkstoff C272 = new Werkstoff( + // new short[] { 0x29, 0xc2, 0x2a }, + // "C-272", + // subscriptNumbers("(C8H17)2PO2H"), + // new Werkstoff.Stats().setElektrolysis(true), + // Werkstoff.Types.COMPOUND, + // new Werkstoff.GenerationFeatures().disable().addCells(), + // offsetID4 + 59, + // TextureSet.SET_FLUID, + // new Pair<>(Carbon, 16), + // new Pair<>(Phosphorus, 1), + // new Pair<>(Oxygen, 3), + // new Pair<>(Hydrogen, 35)); + public static void runInit() { addSubTags(); diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index 102a16e6c7..381dd811a1 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -1,6 +1,8 @@ package com.elisis.gtnhlanth.loader; +import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.*; import static gregtech.common.items.GT_MetaGenerated_Item_01.registerCauldronCleaningFor; +import static net.minecraft.item.Item.getIdFromItem; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -8,7 +10,9 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.HashSet; +import java.util.Iterator; +import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; @@ -29,11 +33,9 @@ import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.Platinu import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; import goodgenerator.items.MyMaterial; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.*; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; @@ -631,13 +633,13 @@ public class RecipeLoader { 600, 1920); - // 5Eu2O3 + Eu = 4EuO + // 5Eu2O3 + Eu = 4EuO // -> 6EuO GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.EuropiumIIIOxide.get(OrePrefixes.dust, 5), Materials.Europium.getDust(1), null, null, - WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 4), + WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 6), 300, 8400); @@ -978,6 +980,924 @@ public class RecipeLoader { new int[] { 9000, 8000, 10000 }, 200, 1920); + + // TODO UV Tier Ion Extracting Method + + // Samarium Part + + // Digester to produce Samarium Chloride Concentrate + RecipeAdder.instance.DigesterRecipes.addDigesterRecipe( + new FluidStack[] { Materials.Chlorine.getGas(36000) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Samarium, 1) }, + SamariumChlorideConcentrate.getFluidOrGas(3000), + new ItemStack[] { Materials.SiliconDioxide.getDust(3) }, + 114514, + 40, + 800); + RecipeAdder.instance.DigesterRecipes.addDigesterRecipe( + new FluidStack[] { Materials.Chlorine.getGas(12000) }, + new ItemStack[] { SamariumOreConcentrate.get(OrePrefixes.dust, 1) }, + SamariumChlorideConcentrate.getFluidOrGas(1000), + new ItemStack[] { Materials.SiliconDioxide.getDust(1) }, + 114514, + 40, + 800); + + // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal + GT_Values.RA.stdBuilder().noItemInputs() + .fluidInputs( + SamariumExtractingNanoResin.getFluidOrGas(1000), + SamariumChlorideConcentrate.getFluidOrGas(1000)) + .noItemOutputs() + .fluidOutputs( + FilledSamariumExtractingNanoResin.getFluidOrGas(1000), + ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) + .eut(491520).duration(20).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + + // Ion Extracting Process to produce Rare Earth Element (example Samarium) by Nano Resin + // Get Extracting Nano Resin + + // Lanthanum + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + Materials.Lanthanum.getDust(1), + Materials.Carbon.getNanite(1)) + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidOutputs(LanthanumExtractingNanoResin.getFluidOrGas(1000)).eut(491520).duration(228) + .addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + + // Praseodymium + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + Materials.Praseodymium.getDust(1), + Materials.Carbon.getNanite(1)) + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidOutputs(PraseodymiumExtractingNanoResin.getFluidOrGas(1000)).eut(491520).duration(228) + .addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + + // Cerium + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + Materials.Cerium.getDust(1), + Materials.Carbon.getNanite(1)) + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidOutputs(CeriumExtractingNanoResin.getFluidOrGas(1000)).eut(491520).duration(228) + .addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + + // Neodymium + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + Materials.Neodymium.getDust(1), + Materials.Carbon.getNanite(1)) + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidOutputs(NeodymiumExtractingNanoResin.getFluidOrGas(1000)).eut(491520).duration(228) + .addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + + // Promethium + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + Materials.Promethium.getDust(1), + Materials.Carbon.getNanite(1)) + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidOutputs(PromethiumExtractingNanoResin.getFluidOrGas(1000)).eut(491520).duration(228) + .addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + + // Sm + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + Materials.Samarium.getDust(1), + Materials.Carbon.getNanite(1)) + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidOutputs(SamariumExtractingNanoResin.getFluidOrGas(1000)).eut(491520).duration(228) + .addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + + // Europium + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + Materials.Europium.getDust(1), + Materials.Carbon.getNanite(1)) + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidOutputs(EuropiumExtractingNanoResin.getFluidOrGas(1000)).eut(491520).duration(228) + .addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + + // Gadolinium + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + Materials.Gadolinium.getDust(1), + Materials.Carbon.getNanite(1)) + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidOutputs(GadoliniumExtractingNanoResin.getFluidOrGas(1000)).eut(491520).duration(228) + .addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + + // Terbium + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + Materials.Terbium.getDust(1), + Materials.Carbon.getNanite(1)) + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidOutputs(TerbiumExtractingNanoResin.getFluidOrGas(1000)).eut(491520).duration(228) |