diff --git a/dependencies.gradle b/dependencies.gradle index 0e08ba6d2..2be1c00ec 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,18 +1,18 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.121:dev") - api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.155:dev") + api("com.github.GTNewHorizons:Yamcl:0.7.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") - implementation("com.github.GTNewHorizons:GTNHLib:0.6.10:dev") + implementation("com.github.GTNewHorizons:GTNHLib:0.6.11:dev") - compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.1:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.61:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:twilightforest:2.7.4:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.31:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:twilightforest:2.7.5:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.33:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.8-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.9-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:witchery-69673:2234410") @@ -22,12 +22,14 @@ dependencies { compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384") compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false } compileOnly("com.github.GTNewHorizons:amunra:0.8.1:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.4-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.1:dev") { transitive = false } - compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.0-GTNH:dev") + compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.5-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.3:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:MatterManipulator:0.0.22-GTNH:dev") { transitive = false } + compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.1-GTNH:dev") + //compileOnly("com.github.Roadhog360:Et-Futurum-Requiem:2.6.2:dev") { transitive = false } runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.2.1-GTNH:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.3.2-GTNH:dev") // Core unit testing platform testImplementation(platform('org.junit:junit-bom:5.9.2')) diff --git a/gradle.properties b/gradle.properties index 428d1f972..b0ecdf355 100644 --- a/gradle.properties +++ b/gradle.properties @@ -55,22 +55,13 @@ generateGradleTokenClass = com.dreammaster.lib.BuildVersion # Name of the token containing the project's current version to generate/replace. gradleTokenVersion = VERSION -# [DEPRECATED] Mod ID replacement token. -gradleTokenModId = - -# [DEPRECATED] Mod name replacement token. -gradleTokenModName = - -# [DEPRECATED] Mod Group replacement token. -gradleTokenGroupName = - # [DEPRECATED] # Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java # public static final String VERSION = "GRADLETOKEN_VERSION"; # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's # version in @Mod([...], version = VERSION, [...]). # Leave these properties empty to skip individual token replacements. -replaceGradleTokenInFile = +# replaceGradleTokenInFile = # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can # leave this property empty. @@ -80,7 +71,7 @@ apiPackage = # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/ # There can be multiple files in a space-separated list. # Example value: mymodid_at.cfg nei_at.cfg -accessTransformersFile = +accessTransformersFile = dreamcraft_at.cfg # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! usesMixins = true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c820..e18bc253b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d6..f3b75f3b0 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/settings.gradle b/settings.gradle index 9280f4fce..39d96f7e3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.32' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.33' } diff --git a/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java b/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java index 2c8ec7177..7ffe0b98e 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java @@ -198,7 +198,7 @@ private void runAdditionalFuelRecipes() { // super heavy -> heavy radox conversion GTValues.RA.stdBuilder().itemOutputs().fluidInputs(RadoxSuperHeavy.getFluid(1000)) - .fluidOutputs(RadoxHeavy.getFluid(2000)).duration(50 * MINUTES).eut(TierEU.RECIPE_UV).noOptimize() + .fluidOutputs(RadoxHeavy.getFluid(2000)).duration(50 * MINUTES).eut(TierEU.RECIPE_UV) .addTo(centrifugeRecipes); // heavy radox + Nq+ -> Nq* @@ -270,8 +270,7 @@ private void bacterialVatRecipes() { GTValues.RA.stdBuilder().itemInputs(AntimonyTrioxide.getDust(16), Osmium.getDust(16)) .special(BioItemList.getPetriDish(CultureSet.get("CombinedBac"))).fluidInputs(Oil.getFluid(20)) .fluidOutputs(Xenoxene.getFluid(20)).duration(3 * MINUTES).eut(TierEU.RECIPE_UEV).metadata(GLASS, 8) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), false)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), false)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -282,8 +281,7 @@ private void bacterialVatRecipes() { .special(BioItemList.getPetriDish(CultureSet.get("StemCellBac"))) .fluidInputs(GrowthMediumRaw.getFluid(8)).fluidOutputs(BioMediumRaw.getFluid(2)).duration(3 * MINUTES) .eut(TierEU.RECIPE_LuV).metadata(GLASS, 6) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -294,8 +292,7 @@ private void bacterialVatRecipes() { .special(BioItemList.getPetriDish(CultureSet.get("BioCellBac"))) .fluidInputs(GrowthMediumRaw.getFluid(5)).fluidOutputs(BioMediumRaw.getFluid(5)).duration(3 * MINUTES) .eut(TierEU.RECIPE_ZPM).metadata(GLASS, 7) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), true)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), true)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -305,124 +302,110 @@ private void bacterialVatRecipes() { .special(BioItemList.getPetriDish(CultureSet.get("BioCellBac"))) .fluidInputs(GrowthMediumRaw.getFluid(5)).fluidOutputs(BioMediumRaw.getFluid(10)).duration(3 * MINUTES) .eut(TierEU.RECIPE_UV).metadata(GLASS, 8) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Naquadria), true)).noOptimize().requiresCleanRoom() + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Naquadria), true)).requiresCleanRoom() .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Genetics.ID, "misc", 2L, 4)) .special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))) .fluidInputs(GTModHandler.getDistilledWater(4L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 2)).duration(7 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_HV).metadata(GLASS, 4).noOptimize().addTo(bacterialVatRecipes); + .eut(TierEU.RECIPE_HV).metadata(GLASS, 4).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1)) .special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))) .fluidInputs(GTModHandler.getDistilledWater(8L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 4)).duration(7 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_EV).metadata(GLASS, 5) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1)) .special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))) .fluidInputs(GTModHandler.getDistilledWater(16L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 8)).duration(7 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_IV).metadata(GLASS, 5) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1)) .special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))) .fluidInputs(GTModHandler.getDistilledWater(16L * 9L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 8 * 9)) .duration(9 * (7 * SECONDS + 10 * TICKS)).eut(TierEU.RECIPE_IV).metadata(GLASS, 5) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(IndustrialCraft2.ID, "itemBiochaff", 4L, 0)) .special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria"))) .fluidInputs(GTModHandler.getDistilledWater(4L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 2)).duration(15 * SECONDS) .eut(TierEU.RECIPE_HV).metadata(GLASS, 4) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1)) .special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria"))) .fluidInputs(GTModHandler.getDistilledWater(8L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 4)).duration(15 * SECONDS) .eut(TierEU.RECIPE_EV).metadata(GLASS, 5) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1)) .special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria"))) .fluidInputs(GTModHandler.getDistilledWater(16L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 8)).duration(15 * SECONDS) .eut(TierEU.RECIPE_IV).metadata(GLASS, 6) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1)) .special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria"))) .fluidInputs(GTModHandler.getDistilledWater(16L * 9L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 8 * 9)).duration(9 * 15 * SECONDS) .eut(TierEU.RECIPE_IV).metadata(GLASS, 6) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(CustomItemList.MarsStoneDust.get(16L)) .special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac"))) .fluidInputs(GTModHandler.getDistilledWater(4L)) .fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 1)).duration(30 * SECONDS) .eut(TierEU.RECIPE_EV).metadata(GLASS, 5) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1)) .special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac"))) .fluidInputs(GTModHandler.getDistilledWater(8L)) .fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 2)).duration(30 * SECONDS) .eut(TierEU.RECIPE_IV).metadata(GLASS, 6) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1)) .special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac"))) .fluidInputs(GTModHandler.getDistilledWater(16L)) .fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 4)).duration(30 * SECONDS) .eut(TierEU.RECIPE_LuV).metadata(GLASS, 7) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1)) .special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac"))) .fluidInputs(GTModHandler.getDistilledWater(16L * 9L)) .fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 4 * 9)).duration(9 * 30 * SECONDS) .eut(TierEU.RECIPE_LuV).metadata(GLASS, 7) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(4)) .special(BioItemList.getPetriDish(CultureSet.get("Mutagen"))) .fluidInputs(GTModHandler.getDistilledWater(4L)).fluidOutputs(FluidRegistry.getFluidStack("mutagen", 1)) .duration(1 * MINUTES).eut(TierEU.RECIPE_IV).metadata(GLASS, 6) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1)) .special(BioItemList.getPetriDish(CultureSet.get("Mutagen"))) .fluidInputs(GTModHandler.getDistilledWater(8L)).fluidOutputs(FluidRegistry.getFluidStack("mutagen", 2)) .duration(1 * MINUTES).eut(TierEU.RECIPE_LuV).metadata(GLASS, 7) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1)) .special(BioItemList.getPetriDish(CultureSet.get("Mutagen"))) .fluidInputs(GTModHandler.getDistilledWater(8L * 9L)) .fluidOutputs(FluidRegistry.getFluidStack("mutagen", 2 * 9)).duration(9 * MINUTES) .eut(TierEU.RECIPE_LuV).metadata(GLASS, 7) - .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).addTo(bacterialVatRecipes); } private void bioLabRecipes() { diff --git a/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java b/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java index a64824dc5..9f173792d 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java @@ -132,13 +132,13 @@ public static void registerRecipes() { .special(BioItemList.getPetriDish(CultureSet.get("TcetiEBac"))) .fluidInputs(new FluidStack(BIOFLUIDS[2], 50)).fluidOutputs(new FluidStack(BIOFLUIDS[3], 50)) .duration(1 * MINUTES).eut(TierEU.RECIPE_UV).metadata(GLASS, 8) - .metadata(SIEVERT, new Sievert(100, false)).noOptimize().addTo(bacterialVatRecipes); + .metadata(SIEVERT, new Sievert(100, false)).addTo(bacterialVatRecipes); for (int i = 0; i < OreDictionary.getOres("cropTcetiESeaweed").size(); i++) { GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(i + 1)) .itemOutputs(OreDictionary.getOres("cropTcetiESeaweed").get(i).copy().splitStack(64)) .fluidInputs(new FluidStack(BIOFLUIDS[3], 1000)).duration(2 * SECONDS).eut(TierEU.RECIPE_UV) - .noOptimize().addTo(centrifugeRecipes); + .addTo(centrifugeRecipes); } GTValues.RA.stdBuilder() @@ -150,7 +150,7 @@ public static void registerRecipes() { .special(BioItemList.getPetriDish(CultureSet.get("OvumBac"))) .fluidInputs(FluidRegistry.getFluidStack("binnie.bacteria", 4)) .fluidOutputs(Materials.GrowthMediumRaw.getFluid(1)).duration(1 * MINUTES).eut(TierEU.RECIPE_IV) - .metadata(GLASS, 5).metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize() + .metadata(GLASS, 5).metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)) .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder() @@ -162,7 +162,7 @@ public static void registerRecipes() { .special(BioItemList.getPetriDish(CultureSet.get("OvumBac"))) .fluidInputs(FluidRegistry.getFluidStack("bacterialsludge", 4)) .fluidOutputs(Materials.GrowthMediumRaw.getFluid(2)).duration(1 * MINUTES).eut(TierEU.RECIPE_LuV) - .metadata(GLASS, 6).metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).noOptimize() + .metadata(GLASS, 6).metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)) .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder() @@ -175,6 +175,6 @@ public static void registerRecipes() { .fluidInputs(FluidRegistry.getFluidStack("mutagen", 4)) .fluidOutputs(Materials.GrowthMediumRaw.getFluid(4)).duration(1 * MINUTES).eut(TierEU.RECIPE_ZPM) .metadata(GLASS, 7).metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), true)) - .noOptimize().addTo(bacterialVatRecipes); + .addTo(bacterialVatRecipes); } } diff --git a/src/main/java/com/dreammaster/bartworksHandler/VoidMinerLoader.java b/src/main/java/com/dreammaster/bartworksHandler/VoidMinerLoader.java index 8ae2be7b8..b6f76f499 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/VoidMinerLoader.java +++ b/src/main/java/com/dreammaster/bartworksHandler/VoidMinerLoader.java @@ -23,8 +23,8 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.ISubTagContainer; import gtPlusPlus.core.material.Material; -import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Ore_Layer; -import gtPlusPlus.everglades.gen.gt.WorldGen_Ores; +import toxiceverglades.gen.WorldGenEvergladesOreLayer; +import toxiceverglades.gen.WorldGenEvergladesOres; public class VoidMinerLoader { @@ -71,7 +71,7 @@ public static void initDeepDark() { // Map of GT++ material name to GT++ Material. Map GTPPMaterials = new HashMap<>(); - for (WorldGen_GT_Ore_Layer t : WorldGen_Ores.validOreveins.values()) { + for (WorldGenEvergladesOreLayer t : WorldGenEvergladesOres.validOreveins.values()) { GTPPMaterials.put(t.mPrimary.getLocalizedName(), t.mPrimary); GTPPMaterials.put(t.mSecondary.getLocalizedName(), t.mSecondary); GTPPMaterials.put(t.mBetween.getLocalizedName(), t.mBetween); diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java index 89f4a8fb0..9683a22e8 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java @@ -1138,6 +1138,14 @@ public void run() { GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatRE", 1, GTValues.W), 'E', GTModHandler.getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 3), 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'S', screw.get(Materials.Steel) }); + GTModHandler.addCraftingRecipe( + GTModHandler.getModItem(IndustrialCraft2.ID, "itemToolHoe", 1, GTValues.W), + bits, + new Object[] { "dPH", "PGB", "ECS", 'S', screw.get(Materials.Steel), 'H', + OrePrefixes.stick.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatRE", 1, GTValues.W), 'E', + GTModHandler.getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 3), 'P', + OrePrefixes.plate.get(Materials.Steel) }); if (OpenComputers.isModLoaded()) GTModHandler.addCraftingRecipe( GTModHandler.getModItem(OpenComputers.ID, "wrench", 1, 0), diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_ItemPipes.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_ItemPipes.java index d5c2ed4a6..7d8da0a8f 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_ItemPipes.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_ItemPipes.java @@ -2,7 +2,7 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.metatileentity.implementations.MTEItem; +import gregtech.api.metatileentity.implementations.MTEItemPipe; import gregtech.api.util.GTLanguageManager; import gregtech.api.util.GTOreDictUnificator; @@ -18,7 +18,7 @@ public static void registerPipes() { String displayName = GTLanguageManager.i18nPlaceholder ? "%material" : Materials.Brass.mDefaultLocalName; GTOreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(Materials.Brass), - new MTEItem( + new MTEItemPipe( 5600, "GT_Pipe_Brass_Tiny", "Tiny " + displayName + " Item Pipe", @@ -30,7 +30,7 @@ public static void registerPipes() { 80).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(Materials.Brass), - new MTEItem( + new MTEItemPipe( 5601, "GT_Pipe_Brass_Small", "Small " + displayName + " Item Pipe", @@ -42,7 +42,7 @@ public static void registerPipes() { 40).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveTiny.get(Materials.Brass), - new MTEItem( + new MTEItemPipe( 5640, "GT_Pipe_Restrictive_Brass_Tiny", "Tiny Restrictive " + displayName + " Item Pipe", @@ -54,7 +54,7 @@ public static void registerPipes() { 80).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveSmall.get(Materials.Brass), - new MTEItem( + new MTEItemPipe( 5641, "GT_Pipe_Restrictive_Brass_Small", "Small Restrictive " + displayName + " Item Pipe", @@ -69,7 +69,7 @@ public static void registerPipes() { displayName = GTLanguageManager.i18nPlaceholder ? "%material" : Materials.Electrum.mDefaultLocalName; GTOreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(Materials.Electrum), - new MTEItem( + new MTEItemPipe( 5610, "GT_Pipe_Electrum_Tiny", "Tiny " + displayName + " Item Pipe", @@ -81,7 +81,7 @@ public static void registerPipes() { 40).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(Materials.Electrum), - new MTEItem( + new MTEItemPipe( 5611, "GT_Pipe_Electrum_Small", "Small " + displayName + " Item Pipe", @@ -92,7 +92,7 @@ public static void registerPipes() { false).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveTiny.get(Materials.Electrum), - new MTEItem( + new MTEItemPipe( 5642, "GT_Pipe_Restrictive_Electrum_Tiny", "Tiny Restrictive " + displayName + " Item Pipe", @@ -104,7 +104,7 @@ public static void registerPipes() { 40).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveSmall.get(Materials.Electrum), - new MTEItem( + new MTEItemPipe( 5643, "GT_Pipe_Restrictive_Electrum_Small", "Small Restrictive " + displayName + " Item Pipe", @@ -118,7 +118,7 @@ public static void registerPipes() { displayName = GTLanguageManager.i18nPlaceholder ? "%material" : Materials.Platinum.mDefaultLocalName; GTOreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(Materials.Platinum), - new MTEItem( + new MTEItemPipe( 5620, "GT_Pipe_Platinum_Tiny", "Tiny " + displayName + " Item Pipe", @@ -129,7 +129,7 @@ public static void registerPipes() { false).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(Materials.Platinum), - new MTEItem( + new MTEItemPipe( 5621, "GT_Pipe_Platinum_Small", "Small " + displayName + " Item Pipe", @@ -140,7 +140,7 @@ public static void registerPipes() { false).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveTiny.get(Materials.Platinum), - new MTEItem( + new MTEItemPipe( 5644, "GT_Pipe_Restrictive_Platinum_Tiny", "Tiny Restrictive " + displayName + " Item Pipe", @@ -151,7 +151,7 @@ public static void registerPipes() { true).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveSmall.get(Materials.Platinum), - new MTEItem( + new MTEItemPipe( 5645, "GT_Pipe_Restrictive_Platinum_Small", "Small Restrictive " + displayName + " Item Pipe", @@ -165,7 +165,7 @@ public static void registerPipes() { displayName = GTLanguageManager.i18nPlaceholder ? "%material" : Materials.Osmium.mDefaultLocalName; GTOreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(Materials.Osmium), - new MTEItem( + new MTEItemPipe( 5630, "GT_Pipe_Osmium_Tiny", "Tiny " + displayName + " Item Pipe", @@ -176,7 +176,7 @@ public static void registerPipes() { false).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(Materials.Osmium), - new MTEItem( + new MTEItemPipe( 5631, "GT_Pipe_Osmium_Small", "Small " + displayName + " Item Pipe", @@ -187,7 +187,7 @@ public static void registerPipes() { false).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveTiny.get(Materials.Osmium), - new MTEItem( + new MTEItemPipe( 5646, "GT_Pipe_Restrictive_Osmium_Tiny", "Tiny Restrictive " + displayName + " Item Pipe", @@ -198,7 +198,7 @@ public static void registerPipes() { true).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveSmall.get(Materials.Osmium), - new MTEItem( + new MTEItemPipe( 5647, "GT_Pipe_Restrictive_Osmium_Small", "Small Restrictive " + displayName + " Item Pipe", @@ -212,7 +212,7 @@ public static void registerPipes() { displayName = GTLanguageManager.i18nPlaceholder ? "%material" : Materials.Tin.mDefaultLocalName; GTOreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(Materials.Tin), - new MTEItem( + new MTEItemPipe( 5589, "GT_Pipe_Tin_Tiny", "Tiny " + displayName + " Item Pipe", @@ -224,7 +224,7 @@ public static void registerPipes() { 160).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(Materials.Tin), - new MTEItem( + new MTEItemPipe( 5590, "GT_Pipe_Tin_Small", "Small " + displayName + " Item Pipe", @@ -236,11 +236,19 @@ public static void registerPipes() { 80).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(Materials.Tin), - new MTEItem(5591, "GT_Pipe_Tin", displayName + " Item Pipe", 0.5F, Materials.Tin, 1, 65536, false, 40) - .getStackForm(1L)); + new MTEItemPipe( + 5591, + "GT_Pipe_Tin", + displayName + " Item Pipe", + 0.5F, + Materials.Tin, + 1, + 65536, + false, + 40).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(Materials.Tin), - new MTEItem( + new MTEItemPipe( 5592, "GT_Pipe_Tin_Large", "Large " + displayName + " Item Pipe", @@ -251,7 +259,7 @@ public static void registerPipes() { false).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(Materials.Tin), - new MTEItem( + new MTEItemPipe( 5593, "GT_Pipe_Tin_Huge", "Huge " + displayName + " Item Pipe", @@ -263,7 +271,7 @@ public static void registerPipes() { GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveTiny.get(Materials.Tin), - new MTEItem( + new MTEItemPipe( 5594, "GT_Pipe_Restrictive_Tin_Tiny", "Tiny Restrictive " + displayName + " Item Pipe", @@ -275,7 +283,7 @@ public static void registerPipes() { 160).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveSmall.get(Materials.Tin), - new MTEItem( + new MTEItemPipe( 5595, "GT_Pipe_Restrictive_Tin_Small", "Small Restrictive " + displayName + " Item Pipe", @@ -287,7 +295,7 @@ public static void registerPipes() { 80).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveMedium.get(Materials.Tin), - new MTEItem( + new MTEItemPipe( 5596, "GT_Pipe_Restrictive_Tin", "Restrictive " + displayName + " Pipe", @@ -299,7 +307,7 @@ public static void registerPipes() { 40).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveLarge.get(Materials.Tin), - new MTEItem( + new MTEItemPipe( 5597, "GT_Pipe_Restrictive_Tin_Large", "Large Restrictive " + displayName + " Item Pipe", @@ -310,7 +318,7 @@ public static void registerPipes() { true).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveHuge.get(Materials.Tin), - new MTEItem( + new MTEItemPipe( 5598, "GT_Pipe_Restrictive_Tin_Huge", "Huge Restrictive " + displayName + " Item Pipe", @@ -339,7 +347,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d int baseInvSlots) { GTOreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(aMaterial), - new MTEItem( + new MTEItemPipe( startID, "GT_Pipe_" + name + "_Tiny", "Tiny " + displayName + " Item Pipe", @@ -350,7 +358,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d false).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(aMaterial), - new MTEItem( + new MTEItemPipe( startID + 1, "GT_Pipe_" + name + "_Small", "Small " + displayName + " Item Pipe", @@ -361,7 +369,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d false).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(aMaterial), - new MTEItem( + new MTEItemPipe( startID + 2, "GT_Pipe_" + name, displayName + " Item Pipe", @@ -372,7 +380,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d false).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(aMaterial), - new MTEItem( + new MTEItemPipe( startID + 3, "GT_Pipe_" + name + "_Large", "Large " + displayName + " Item Pipe", @@ -383,7 +391,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d false).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(aMaterial), - new MTEItem( + new MTEItemPipe( startID + 4, "GT_Pipe_" + name + "_Huge", "Huge " + displayName + " Item Pipe", @@ -394,7 +402,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d false).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveTiny.get(aMaterial), - new MTEItem( + new MTEItemPipe( startID + 5, "GT_Pipe_Restrictive_" + name + "_Tiny", "Tiny Restrictive " + displayName + " Item Pipe", @@ -405,7 +413,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d true).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveSmall.get(aMaterial), - new MTEItem( + new MTEItemPipe( startID + 6, "GT_Pipe_Restrictive_" + name + "_Small", "Small Restrictive " + displayName + " Item Pipe", @@ -416,7 +424,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d true).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveMedium.get(aMaterial), - new MTEItem( + new MTEItemPipe( startID + 7, "GT_Pipe_Restrictive_" + name, "Restrictive " + displayName + " Item Pipe", @@ -427,7 +435,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d true).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveLarge.get(aMaterial), - new MTEItem( + new MTEItemPipe( startID + 8, "GT_Pipe_Restrictive_" + name + "_Large", "Large Restrictive " + displayName + " Item Pipe", @@ -438,7 +446,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d true).getStackForm(1L)); GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveHuge.get(aMaterial), - new MTEItem( + new MTEItemPipe( startID + 9, "GT_Pipe_Restrictive_" + name + "_Huge", "Huge Restrictive " + displayName + " Item Pipe", diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_OreDictionary.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_OreDictionary.java index fc8e5a34f..e65ff46a3 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_OreDictionary.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_OreDictionary.java @@ -21,6 +21,7 @@ import static gregtech.api.enums.Mods.TaintedMagic; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.ThaumicTinkerer; +import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.util.GTModHandler.getModItem; import net.minecraft.init.Blocks; @@ -314,6 +315,8 @@ public void run() { OrePrefixes.nugget, Materials.Ichorium, GTModHandler.getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 3)); + GTOreDictUnificator + .registerOre(OrePrefixes.paneGlass, GTModHandler.getModItem(TinkerConstruct.ID, "GlassPane", 1L, 0)); GTOreDictUnificator.registerOre("dyeLime", GTOreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 1L)); diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 9c7950374..e793dd639 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -11,7 +11,6 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gregtech.api.util.GTRecipeBuilder.WILDCARD; -import static gtPlusPlus.core.block.ModBlocks.blockFishTrap; import static gtPlusPlus.core.material.MaterialsAlloy.AQUATIC_STEEL; import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_C276; import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_W; @@ -1602,7 +1601,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.WroughtIron, 1L), CustomItemList.SteelBars.get(6L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(new ItemStack(blockFishTrap, 1, 0)).duration(10 * SECONDS).eut(64).addTo(assemblerRecipes); + .itemOutputs(GregtechItemList.FishTrap.get(1)).duration(10 * SECONDS).eut(64).addTo(assemblerRecipes); if (ExtraBees.isModLoaded()) { ItemStack alveary = GTModHandler.getModItem(Forestry.ID, "alveary", 1L, 0); diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java index f7d031576..b267b3619 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java @@ -545,9 +545,9 @@ public void run() { new Object[] { ItemList.Hull_UEV.get(1), ItemList.Quantum_Chest_IV.get(1), MaterialsAlloy.QUANTUM.getFrameBox(16), ItemList.Field_Generator_UEV.get(1), GregtechItemList.Laser_Lens_Special.get(4), - GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.TengamAttuned, 32), - GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.InfinityCatalyst, 16), - GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Infinity, 8) }, + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.CosmicNeutronium, 64), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.InfinityCatalyst, 32), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Infinity, 16) }, new FluidStack[] { new FluidStack(solderUEV, 9_216), MaterialsAlloy.ABYSSAL.getFluidStack(144 * 128), MaterialsAlloy.OCTIRON.getFluidStack(144 * 256) }, ItemList.Hatch_Catalyst_Bulk.get(1), diff --git a/src/main/java/com/dreammaster/gthandler/recipes/BlastFurnaceRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/BlastFurnaceRecipes.java index eeea07f4e..b79ed5589 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/BlastFurnaceRecipes.java @@ -878,10 +878,11 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 30L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cryolite, 15L)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 12L)).duration(4 * MINUTES) - .eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 963).addTo(blastFurnaceRecipes); + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 10L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cryolite, 5L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 4L)) + .duration(1 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 963) + .addTo(blastFurnaceRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -1421,19 +1422,12 @@ public void run() { .fluidInputs(Materials.Radon.getGas(1000L)).duration(3 * MINUTES + 45 * SECONDS).eut(TierEU.RECIPE_ZPM) .metadata(COIL_HEAT, 7200).addTo(blastFurnaceRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.CosmicNeutronium, 1L), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.CosmicNeutronium, 1L)) - .duration(10 * MINUTES).eut(TierEU.RECIPE_ZPM).metadata(COIL_HEAT, 9900).addTo(blastFurnaceRecipes); - GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.dust, Materials.CosmicNeutronium, 1L), GTUtility.getIntegratedCircuit(11)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.CosmicNeutronium, 1L)) - .fluidInputs(Materials.Radon.getGas(1000L)).duration(8 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_ZPM) + .fluidInputs(Materials.Radon.getGas(1000L)).duration(6 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_ZPM) .metadata(COIL_HEAT, 9900).addTo(blastFurnaceRecipes); GTValues.RA.stdBuilder() @@ -1500,8 +1494,8 @@ public void run() { GTValues.RA.stdBuilder().itemInputs(CustomItemList.RawNeutronium.get(1L), GTUtility.getIntegratedCircuit(11)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Neutronium, 1L)) - .fluidInputs(Materials.Radon.getGas(1000L)).duration(5 * MINUTES + 36 * SECONDS).eut(TierEU.RECIPE_UV) - .metadata(COIL_HEAT, 9000).addTo(blastFurnaceRecipes); + .fluidInputs(Materials.Radon.getGas(1000L)).duration(4 * MINUTES + 28 * SECONDS + 8 * TICKS) + .eut(TierEU.RECIPE_UV).metadata(COIL_HEAT, 9000).addTo(blastFurnaceRecipes); GTValues.RA.stdBuilder().itemInputs(Materials.Sapphire.getDust(3), GTUtility.getIntegratedCircuit(1)) .itemOutputs(Materials.Aluminiumoxide.getDust(1)).duration(60 * SECONDS).eut(TierEU.RECIPE_MV) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/ChemicalBathRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/ChemicalBathRecipes.java index 27acacad6..08ce0d8da 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/ChemicalBathRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/ChemicalBathRecipes.java @@ -261,9 +261,9 @@ public void run() { } if (PamsHarvestCraft.isModLoaded()) { - GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(PamsHarvestCraft.ID, "wovencottonItem", 2L, 0)) - .itemOutputs(CustomItemList.ArtificialLeather.get(2L)) - .fluidInputs(Materials.PolyvinylChloride.getMolten(144L)).duration(15 * SECONDS) + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(PamsHarvestCraft.ID, "wovencottonItem", 1L, 0)) + .itemOutputs(CustomItemList.ArtificialLeather.get(1L)) + .fluidInputs(Materials.PolyvinylChloride.getMolten(72L)).duration(7 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_MV).addTo(chemicalBathRecipes); } if (LogisticsPipes.isModLoaded()) { @@ -382,160 +382,160 @@ public void run() { } if (ProjectRedTransmission.isModLoaded()) { GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 16, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 15, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyered", 144)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 16, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 14, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyegreen", 144)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 16, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 13, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyebrown", 144)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 16, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 12, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyeblue", 144)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 16, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 11, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyepurple", 144)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 16, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 10, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyecyan", 144)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 16, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 9, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyelightgray", 144)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 16, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 8, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyegray", 144)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 16, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 7, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyepink", 144)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 16, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 6, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyelime", 144)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 16, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 5, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyeyellow", 144)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 16, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 4, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyelightblue", 144)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 16, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 3, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyemagenta", 144)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 16, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 2, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyeorange", 144)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 16, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 1, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyewhite", 144)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 33, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyeblack", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 32, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyered", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 31, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyegreen", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 30, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyebrown", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 29, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyeblue", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 28, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyepurple", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 27, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyecyan", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 26, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyelightgray", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 25, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyegray", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 24, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyepink", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 23, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyelime", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 22, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyeyellow", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 21, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyelightblue", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 20, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyemagenta", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 19, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyeorange", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); - GTValues.RA.stdBuilder() - .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 17, missing)) - .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 8, 18, missing)) - .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyewhite", 288)).duration(10 * SECONDS) - .eut(2).addTo(chemicalBathRecipes); + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 16, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 15, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyered", 18)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 16, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 14, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyegreen", 18)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 16, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 13, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyebrown", 18)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 16, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 12, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyeblue", 18)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 16, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 11, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyepurple", 18)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 16, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 10, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyecyan", 18)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 16, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 9, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyelightgray", 18)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 16, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 8, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyegray", 18)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 16, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 7, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyepink", 18)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 16, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 6, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyelime", 18)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 16, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 5, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyeyellow", 18)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 16, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 4, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyelightblue", 18)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 16, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 3, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyemagenta", 18)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 16, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 2, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyeorange", 18)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 16, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 2, 1, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyewhite", 18)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 33, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyeblack", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 32, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyered", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 31, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyegreen", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 30, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyebrown", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 29, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyeblue", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 28, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyepurple", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 27, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyecyan", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 26, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyelightgray", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 25, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyegray", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 24, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyepink", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 23, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyelime", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 22, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyeyellow", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 21, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyelightblue", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 20, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyemagenta", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 19, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyeorange", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 17, missing)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 18, missing)) + .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyewhite", 36)) + .duration(1 * SECONDS + 5 * TICKS).eut(2).addTo(chemicalBathRecipes); } } } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java index eed34fd7e..6e632c56f 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java @@ -42,7 +42,7 @@ import gregtech.api.enums.TierEU; import gregtech.api.recipe.metadata.CompressionTierKey; import gregtech.api.util.GTOreDictUnificator; -import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtnhlanth.common.register.WerkstoffMaterialPool; public class CompressorRecipes implements Runnable { @@ -298,12 +298,12 @@ private void makeExtraUtilitiesRecipes() { private void makeGTPlusPlusRecipes() { // Compressed Glowstone GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.glowstone, 9)) - .itemOutputs(new ItemStack(ModBlocks.blockCompressedObsidian, 1, 6)).duration(15 * SECONDS).eut(2) + .itemOutputs(GregtechItemList.CompressedGlowstone.get(1)).duration(15 * SECONDS).eut(2) .addTo(compressorRecipes); // Double Compressed Glowstone - GTValues.RA.stdBuilder().itemInputs(new ItemStack(ModBlocks.blockCompressedObsidian, 9, 6)) - .itemOutputs(new ItemStack(ModBlocks.blockCompressedObsidian, 1, 7)).duration(15 * SECONDS).eut(2) + GTValues.RA.stdBuilder().itemInputs(GregtechItemList.CompressedGlowstone.get(9)) + .itemOutputs(GregtechItemList.DoubleCompressedGlowstone.get(1)).duration(15 * SECONDS).eut(2) .addTo(compressorRecipes); } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/FluidHeaterRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/FluidHeaterRecipes.java index 8545bb708..910625b92 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/FluidHeaterRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/FluidHeaterRecipes.java @@ -1,10 +1,16 @@ package com.dreammaster.gthandler.recipes; +import static com.dreammaster.scripts.IScriptLoader.missing; +import static gregtech.api.enums.Mods.Automagy; +import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.recipe.RecipeMaps.fluidHeaterRecipes; +import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; import gregtech.api.enums.GTValues; import gregtech.api.enums.TierEU; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.util.minecraft.FluidUtils; public class FluidHeaterRecipes implements Runnable { @@ -14,7 +20,18 @@ public void run() { GTValues.RA.stdBuilder().fluidInputs(FluidUtils.getSteam(3840)) .fluidOutputs(FluidUtils.getSuperHeatedSteam(3840)).duration(5 * SECONDS).eut(TierEU.RECIPE_LuV) - .noOptimize().addTo(fluidHeaterRecipes); - + .addTo(fluidHeaterRecipes); + if (PamsHarvestCraft.isModLoaded()) { + GTValues.RA.stdBuilder().fluidInputs(getFluidStack("milk", 250)) + .itemInputs(GTUtility.getIntegratedCircuit(24)) + .itemOutputs(getModItem(PamsHarvestCraft.ID, "freshmilkItem", 1, 0, missing)).duration(2 * SECONDS) + .eut(TierEU.RECIPE_ULV).addTo(fluidHeaterRecipes); + if (Automagy.isModLoaded()) { + GTValues.RA.stdBuilder().fluidInputs(getFluidStack("fluidmilk", 250)) + .itemInputs(GTUtility.getIntegratedCircuit(24)) + .itemOutputs(getModItem(PamsHarvestCraft.ID, "freshmilkItem", 1, 0, missing)) + .duration(2 * SECONDS).eut(TierEU.RECIPE_ULV).addTo(fluidHeaterRecipes); + } + } } } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java index 8a3d12afb..2060fb176 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java @@ -37,7 +37,7 @@ public void run() { GTValues.RA.stdBuilder().itemInputs(ItemList.Tesseract.get(1), GregtechItemList.Laser_Lens_Special.get(0)) .itemOutputs(ItemList.EnergisedTesseract.get(1)) .fluidOutputs(MaterialsUEVplus.ExcitedDTEC.getFluid(100)).requiresCleanRoom().duration(30 * SECONDS) - .eut(TierEU.RECIPE_UIV).noOptimize().addTo(laserEngraverRecipes); + .eut(TierEU.RECIPE_UIV).addTo(laserEngraverRecipes); // Mysterious crystal upgrading @@ -246,15 +246,15 @@ public void run() { // Protomatter recipes GTValues.RA.stdBuilder().fluidInputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(100L)) .duration(10 * SECONDS).eut(TierEU.RECIPE_UIV).fluidOutputs(MaterialsUEVplus.Protomatter.getFluid(100L)) - .requiresCleanRoom().noOptimize().addTo(laserEngraverRecipes); + .requiresCleanRoom().addTo(laserEngraverRecipes); GTValues.RA.stdBuilder().fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(100L)).duration(10 * SECONDS) .eut(TierEU.RECIPE_UMV).fluidOutputs(MaterialsUEVplus.Protomatter.getFluid(1000L)).requiresCleanRoom() - .noOptimize().addTo(laserEngraverRecipes); + .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder().fluidInputs(MaterialsUEVplus.PrimordialMatter.getFluid(100L)).duration(10 * SECONDS) .eut(TierEU.RECIPE_UXV).fluidOutputs(MaterialsUEVplus.Protomatter.getFluid(10000L)).requiresCleanRoom() - .noOptimize().addTo(laserEngraverRecipes); + .addTo(laserEngraverRecipes); // Bootstrap antimatter recipe GTValues.RA.stdBuilder() diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java index b904ed20f..a11e4f677 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java @@ -61,27 +61,27 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bauxite, 16L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 48L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bauxite, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 12L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 64L)) - .duration(5 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 16L)) + .duration(1 * SECONDS + 5 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Bauxite, 16L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 48L), + GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Bauxite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 64L)) - .duration(15 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(18 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Bauxite, 16L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 48L), + GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Bauxite, 2L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 64L)) - .duration(10 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 8L)) + .duration(1 * SECONDS + 5 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -101,251 +101,251 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodalite, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodalite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), + GTUtility.getIntegratedCircuit(5)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(1 * SECONDS + 13 * TICKS).eut(48).addTo(mixerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Sodalite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) .duration(5 * SECONDS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Sodalite, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), + GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Sodalite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) - .duration(15 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(3 * SECONDS + 6 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Sodalite, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Alunite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) - .duration(10 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(1 * SECONDS + 13 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Alunite, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), + GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Alunite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) .duration(5 * SECONDS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Alunite, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), + GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Alunite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) - .duration(15 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(3 * SECONDS + 6 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Alunite, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lepidolite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) - .duration(10 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(1 * SECONDS + 5 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lepidolite, 4L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 12L), + GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Lepidolite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 16L)) - .duration(5 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(3 * SECONDS + 15 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Lepidolite, 4L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 12L), + GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Lepidolite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 16L)) - .duration(15 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(2 * SECONDS + 10 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Lepidolite, 4L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 12L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Mica, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 16L)) - .duration(10 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(1 * SECONDS + 13 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Mica, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), + GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Mica, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) .duration(5 * SECONDS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Mica, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), + GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Mica, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) - .duration(15 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(3 * SECONDS + 6 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Mica, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tanzanite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) - .duration(10 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(1 * SECONDS + 13 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tanzanite, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), + GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Tanzanite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) .duration(5 * SECONDS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Tanzanite, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), + GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Tanzanite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) - .duration(15 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(3 * SECONDS + 6 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Tanzanite, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Biotite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) - .duration(10 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(1 * SECONDS + 13 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Biotite, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lazurite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 2L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) - .duration(5 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(1 * SECONDS + 13 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lazurite, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), + GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Lazurite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) .duration(5 * SECONDS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Lazurite, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), - GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) - .duration(15 * SECONDS).eut(48).addTo(mixerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Lazurite, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9L), + GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Lazurite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 12L)) - .duration(10 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(3 * SECONDS + 6 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 4L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 12L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 16L)) - .duration(5 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(1 * SECONDS + 5 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Glauconite, 4L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 12L), + GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Glauconite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 16L)) - .duration(15 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(3 * SECONDS + 15 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Glauconite, 4L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 12L), + GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Glauconite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 16L)) - .duration(10 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(2 * SECONDS + 10 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 4L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 12L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 16L)) - .duration(5 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(1 * SECONDS + 5 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.GlauconiteSand, 4L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 12L), + GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.GlauconiteSand, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 16L)) - .duration(15 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(3 * SECONDS + 15 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.GlauconiteSand, 4L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 12L), + GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.GlauconiteSand, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 16L)) - .duration(10 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(2 * SECONDS + 10 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Vermiculite, 4L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 12L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Vermiculite, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 16L)) - .duration(5 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(1 * SECONDS + 5 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Vermiculite, 4L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 12L), + GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Vermiculite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 16L)) - .duration(15 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(3 * SECONDS + 15 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Vermiculite, 4L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 12L), + GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Vermiculite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 16L)) - .duration(10 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(2 * SECONDS + 10 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zeolite, 9L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zeolite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 36L)) - .duration(5 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(10 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Zeolite, 9L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27L), + GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Zeolite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 36L)) - .duration(15 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(1 * SECONDS + 10 * TICKS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Zeolite, 9L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27L), + GTOreDictUnificator.get(OrePrefixes.dustPure, Materials.Zeolite, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 3L), GTUtility.getIntegratedCircuit(5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 36L)) - .duration(10 * SECONDS).eut(48).addTo(mixerRecipes); + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 4L)) + .duration(1 * SECONDS).eut(48).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -795,10 +795,10 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Clay, 8L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Clay, 2L), GTUtility.getIntegratedCircuit(2)) - .itemOutputs(new ItemStack(Items.clay_ball, 4, 0)).fluidInputs(GTModHandler.getWater(1000L)) - .duration(5 * SECONDS).eut(8).addTo(mixerRecipes); + .itemOutputs(new ItemStack(Items.clay_ball, 1, 0)).fluidInputs(GTModHandler.getWater(250L)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -842,10 +842,10 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 16L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 1L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.RawNeutronium.get(16L)).fluidInputs(Materials.Helium.getPlasma(2304L)) - .duration(3 * MINUTES).eut(TierEU.RECIPE_ZPM).addTo(mixerRecipes); + .itemOutputs(CustomItemList.RawNeutronium.get(1L)).fluidInputs(Materials.Helium.getPlasma(144L)) + .duration(11 * SECONDS + 5 * TICKS).eut(TierEU.RECIPE_ZPM).addTo(mixerRecipes); // One Step Alloy Dust Mixer diff --git a/src/main/java/com/dreammaster/gthandler/recipes/VacuumFurnaceRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/VacuumFurnaceRecipes.java index 8f905eb89..791eaa46a 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/VacuumFurnaceRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/VacuumFurnaceRecipes.java @@ -4,20 +4,20 @@ import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.vacuumFurnaceRecipes; -import static gtPlusPlus.core.item.chemistry.MilledOreProcessing.ChalcopyriteFlotationFroth; -import static gtPlusPlus.core.item.chemistry.MilledOreProcessing.SphaleriteFlotationFroth; + +import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; +import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; import gregtech.common.items.CombType; import gregtech.loaders.misc.GTBees; -import gtPlusPlus.core.item.chemistry.AgriculturalChem; +import gtPlusPlus.core.fluids.GTPPFluids; import gtPlusPlus.core.material.MaterialsElements; -import gtPlusPlus.core.util.minecraft.FluidUtils; public class VacuumFurnaceRecipes implements Runnable { @@ -42,8 +42,8 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 64L), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 64L), MaterialsElements.getInstance().GERMANIUM.getDust(15)) - .fluidInputs(FluidUtils.getFluidStack(SphaleriteFlotationFroth, 4000)) - .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) + .fluidInputs(new FluidStack(GTPPFluids.SphaleriteFlotationFroth, 4000)) + .fluidOutputs(new FluidStack(GTPPFluids.RedMud, 2000), GTModHandler.getWater(2000)) .eut((int) TierEU.RECIPE_LuV).metadata(COIL_HEAT, 5500).duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); @@ -57,8 +57,8 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 56L), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 50L), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 30L)) - .fluidInputs(FluidUtils.getFluidStack(ChalcopyriteFlotationFroth, 4000)) - .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) + .fluidInputs(new FluidStack(GTPPFluids.ChalcopyriteFlotationFroth, 4000)) + .fluidOutputs(new FluidStack(GTPPFluids.RedMud, 2000), GTModHandler.getWater(2000)) .eut((int) TierEU.RECIPE_IV).metadata(COIL_HEAT, 4500).duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); } diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index ed83cea00..0ef93aa01 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -104,7 +104,6 @@ import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; -import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.ModItems; public class RecipeRemover { @@ -1163,7 +1162,6 @@ public static void run() { removeRecipeByOutputDelayed(getModItem(Forestry.ID, "fences", 1, wildcard, missing)); removeRecipeByOutputDelayed(getModItem(Forestry.ID, "cart.beehouse", 1, wildcard, missing)); removeRecipeByOutputDelayed(new ItemStack(ModItems.itemPersonalCloakingDevice)); - removeRecipeByOutputDelayed(new ItemStack(ModBlocks.blockCompressedObsidian, 1, 5)); removeRecipeByOutputDelayed(getModItem(Gendustry.ID, "IndustrialApiary", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Gendustry.ID, "MutagenProducer", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Gendustry.ID, "Mutatron", 1, 0, missing)); diff --git a/src/main/java/com/dreammaster/recipes/ShapelessUniversalRecipe.java b/src/main/java/com/dreammaster/recipes/ShapelessUniversalRecipe.java index 7ccf29228..b50658508 100644 --- a/src/main/java/com/dreammaster/recipes/ShapelessUniversalRecipe.java +++ b/src/main/java/com/dreammaster/recipes/ShapelessUniversalRecipe.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.init.Items; @@ -47,6 +48,19 @@ public ShapelessUniversalRecipe(ItemStack result, Object... recipe) { } this.recipe.add(oresHashes); this.recipeXY.add(ores); + } else if (value instanceof Listlist) { + List items = new ArrayList<>(); + HashSet itemHash = new HashSet<>(); + for (Object o : list) { + if (!(o instanceof ItemStack itemStack)) { + throw new IllegalArgumentException("Invalid item stack: " + o); + } + ItemStack i = itemStack.copy(); + items.add(i); + itemHash.add(GTUtility.ItemId.createNoCopy(i)); + } + this.recipe.add(itemHash); + this.recipeXY.add(items); } else if (value instanceof ItemStack) { ItemStack i = ((ItemStack) value).copy(); this.recipe.add(i); diff --git a/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java b/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java index 0c6098b09..b05aa50c0 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java @@ -462,8 +462,9 @@ public void loadRecipes() { .addTo(assemblerRecipes); // preconfigurated priorities for storage buses - ItemStack preconfiguredStorageBus = AE2FC_FLUID_STORAGE_BUS.copy(); + for (int i = 1; i < 25; i++) { + ItemStack preconfiguredStorageBus = AE2FC_FLUID_STORAGE_BUS.copy(); NBTTagCompound tag = new NBTTagCompound(); tag.setInteger("priority", i); preconfiguredStorageBus.setTagCompound(tag); diff --git a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java index d3e62d33a..1e3448d70 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java @@ -98,8 +98,9 @@ public void loadRecipes() { final ItemStack storageBus = getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 220, missing); // preconfigurated priorities for storage buses - ItemStack preconfiguredStorageBus = storageBus.copy(); + for (int i = 1; i < 25; i++) { + ItemStack preconfiguredStorageBus = storageBus.copy(); NBTTagCompound tag = new NBTTagCompound(); tag.setInteger("priority", i); preconfiguredStorageBus.setTagCompound(tag); @@ -2167,14 +2168,13 @@ public void loadRecipes() { getModItem(Minecraft.ID, "glass", 4, 0, missing), GTOreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 4)) .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzGlass", 4, 0, missing)) - .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).specialValue(1000).noOptimize() - .addTo(blastFurnaceRecipes); + .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).specialValue(1000).addTo(blastFurnaceRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(Minecraft.ID, "glass", 4, 0, missing), GTOreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 4)) .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzGlass", 4, 0, missing)) - .duration(20 * SECONDS).eut(16).noOptimize().addTo(alloySmelterRecipes); + .duration(20 * SECONDS).eut(16).addTo(alloySmelterRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "blockITNT", 1, 0, missing)) .itemOutputs( getModItem(AppliedEnergistics2.ID, "tile.BlockTinyTNT", 1, 0, missing), diff --git a/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java b/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java index cbe3dd932..efbf7eb6e 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java +++ b/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java @@ -3,15 +3,19 @@ import static com.dreammaster.main.MainRegistry.Module_CustomFuels; import static gregtech.api.enums.Mods.BiomesOPlenty; import static gregtech.api.enums.Mods.Botany; +import static gregtech.api.enums.Mods.Chisel; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.enums.Mods.IguanaTweaksTinkerConstruct; import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.enums.Mods.PamsHarvestCraft; +import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Mods.RandomThings; +import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; +import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.recipe.RecipeMaps.extractorRecipes; import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; @@ -27,7 +31,6 @@ import java.util.Arrays; import java.util.List; -import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import com.dreammaster.item.NHItemList; @@ -40,7 +43,7 @@ import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; -import gtPlusPlus.core.item.chemistry.AgriculturalChem; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class ScriptBiomesOPlenty implements IScriptLoader { @@ -127,7 +130,7 @@ public void loadRecipes() { "dustGlowstone"); addShapelessRecipe( getModItem(BiomesOPlenty.ID, "coral1", 1, 15, missing), - new ItemStack(AgriculturalChem.mAgrichemItem1, 1, 1), + GregtechItemList.GreenAlgaeBiomass.get(1), "dustGlowstone"); addShapelessRecipe( getModItem(BiomesOPlenty.ID, "coral1", 1, 12, missing), @@ -298,6 +301,13 @@ public void loadRecipes() { .itemOutputs(GTModHandler.getModItem(BiomesOPlenty.ID, "misc", 1L, 4)) .fluidInputs(FluidRegistry.getFluidStack("endergoo", 1000)).duration(15 * SECONDS).eut(TierEU.RECIPE_HV) .addTo(mixerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(TinkerConstruct.ID, "CraftedSoil", 2L, 6), + getModItem(Chisel.ID, "hempcretesand", 2L, 0)) + .itemOutputs(GTModHandler.getModItem(BiomesOPlenty.ID, "mud", 4L, 1)) + .fluidInputs(FluidRegistry.getFluidStack("glue", 1000)).duration(15 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 1L), @@ -312,6 +322,17 @@ public void loadRecipes() { GTValues.RA.stdBuilder().itemInputs(NHItemList.MushroomPowder.getIS(1), GTUtility.getIntegratedCircuit(16)) .itemOutputs(getModItem(BiomesOPlenty.ID, "food", 1, 1, missing)).eut(30).duration(2 * MINUTES) .addTo(chemicalDehydratorRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(BiomesOPlenty.ID, "hive", 1, 3, missing), GTUtility.getIntegratedCircuit(16)) + .itemOutputs(getModItem(BiomesOPlenty.ID, "hive", 1, 2, missing)).eut(30).duration(2 * MINUTES) + .addTo(chemicalDehydratorRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.ID, "cube", 1, 0, missing), GTUtility.getIntegratedCircuit(11)) + .itemOutputs(getModItem(BiomesOPlenty.ID, "misc", 1, 1, missing)).eut(30).duration(15 * SECONDS) + .addTo(chemicalDehydratorRecipes); + GTValues.RA.stdBuilder().itemInputs(getModItem(BiomesOPlenty.ID, "misc", 9, 1, missing)) + .itemOutputs(getModItem(BiomesOPlenty.ID, "ash", 1, 0, missing)).eut(30).duration(15 * SECONDS) + .addTo(compressorRecipes); } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptChisel.java b/src/main/java/com/dreammaster/scripts/ScriptChisel.java index f578d9cc7..60d67085f 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptChisel.java +++ b/src/main/java/com/dreammaster/scripts/ScriptChisel.java @@ -14,17 +14,21 @@ import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.enums.Mods.TwilightForest; +import static gregtech.api.recipe.RecipeMaps.formingPressRecipes; import static gregtech.api.util.GTModHandler.getModItem; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.Arrays; import java.util.List; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import com.cricketcraft.chisel.api.carving.CarvingUtils; import com.dreammaster.chisel.ChiselHelper; import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -202,6 +206,14 @@ public void loadRecipes() { getModItem(Chisel.ID, "voidstone", 1, 0, missing), getModItem(Chisel.ID, "voidstone", 1, 0, missing)); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(Natura.ID, "Cloud", 64, 0, missing), + getModItem(Botania.ID, "manaBottle", 1, 0, missing), + new ItemStack(Blocks.wooden_button, 1)) + .itemOutputs(getModItem(Chisel.ID, "cloudinabottle", 1, 0, missing)).duration(10 * SECONDS).eut(2) + .addTo(formingPressRecipes); + ChiselHelper.addGroup("glasswork"); CarvingUtils.getChiselRegistry().removeGroup("cobblestone"); CarvingUtils.getChiselRegistry().removeGroup("glowstone"); diff --git a/src/main/java/com/dreammaster/scripts/ScriptCompactKineticGenerators.java b/src/main/java/com/dreammaster/scripts/ScriptCompactKineticGenerators.java index f2f82bd64..b0f9d2aa0 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptCompactKineticGenerators.java +++ b/src/main/java/com/dreammaster/scripts/ScriptCompactKineticGenerators.java @@ -8,13 +8,11 @@ import java.util.Arrays; import java.util.List; -import net.minecraft.item.ItemStack; - import com.dreammaster.gthandler.CustomItemList; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import gregtech.api.enums.ItemList; -import gtPlusPlus.xmod.ic2.item.IC2Items; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class ScriptCompactKineticGenerators implements IScriptLoader { @@ -43,7 +41,7 @@ public void loadRecipes() { "plateAlloyIridium"); addShapedRecipe( getModItem(CompactKineticGenerators.ID, "IridiumRotor", 1, 0, missing), - new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0), + GregtechItemList.IridiumShaft.get(1), getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing), "craftingToolHardHammer", getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing), @@ -51,7 +49,7 @@ public void loadRecipes() { getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing), "craftingToolWrench", getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing), - new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0)); + GregtechItemList.IridiumShaft.get(1)); ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( getModItem(CompactKineticGenerators.ID, "BlockCkg", 1, 0, missing), @@ -283,7 +281,7 @@ public void loadRecipes() { 'a', "plateTripleTungstenSteel", 'b', - new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0), + GregtechItemList.TungstenSteelShaft.get(1), 'c', "rotorTungstenSteel", 'd', @@ -314,7 +312,7 @@ public void loadRecipes() { 'a', "plateTripleIridium", 'b', - new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0), + GregtechItemList.TungstenSteelShaft.get(1), 'c', "rotorIridium", 'd', @@ -345,7 +343,7 @@ public void loadRecipes() { 'a', "plateTripleNaquadah", 'b', - new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0), + GregtechItemList.IridiumShaft.get(1), 'c', "rotorOsmium", 'd', @@ -376,7 +374,7 @@ public void loadRecipes() { 'a', "plateTripleNeutronium", 'b', - new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0), + GregtechItemList.IridiumShaft.get(1), 'c', "rotorNeutronium", 'd', diff --git a/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java b/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java index a77897933..2c53aa492 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java +++ b/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java @@ -22,14 +22,21 @@ import static gregtech.api.enums.Mods.RemoteIO; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.TinkerConstruct; +import static gregtech.api.recipe.RecipeCategories.alloySmelterMolding; +import static gregtech.api.recipe.RecipeCategories.fluidExtractorRecycling; +import static gregtech.api.recipe.RecipeCategories.maceratorRecycling; +import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; import static gregtech.api.recipe.RecipeMaps.brewingRecipes; +import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.distilleryRecipes; import static gregtech.api.recipe.RecipeMaps.extractorRecipes; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; import static gregtech.api.recipe.RecipeMaps.fermentingRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.formingPressRecipes; import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; @@ -44,6 +51,7 @@ import java.util.List; import java.util.stream.Stream; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; @@ -1180,8 +1188,8 @@ public void loadRecipes() { .itemOutputs(NHItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(3)) - .fluidInputs(FluidRegistry.getFluidStack("fermentedbacterialsludge", 100)) - .fluidOutputs(FluidRegistry.getFluidStack("mutagen", 10)).duration(30 * SECONDS).eut(1920) + .fluidInputs(FluidRegistry.getFluidStack("fermentedbacterialsludge", 10)) + .fluidOutputs(FluidRegistry.getFluidStack("mutagen", 1)).duration(3 * SECONDS).eut(1920) .addTo(distilleryRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -1362,8 +1370,6 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4L)) .itemOutputs(CustomItemList.BedrockiumIronPlate.get(1L)).duration(30 * SECONDS).eut(TierEU.RECIPE_UEV) .addTo(formingPressRecipes); - GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "obsidian", 1, 0, missing)) - .itemOutputs(NHItemList.LongObsidianRod.getIS(4)).duration(32 * SECONDS).eut(16).addTo(latheRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "stone", 1, 0, missing)) .itemOutputs(NHItemList.LongStoneRod.getIS(4)).duration(16 * SECONDS).eut(16).addTo(latheRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "sandstone", 1, wildcard, missing)) @@ -1417,5 +1423,59 @@ public void loadRecipes() { .duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 1, 55, missing)) .itemOutputs(NHItemList.ElectrotineWire.getIS(2)).duration(5 * SECONDS).eut(4).addTo(wiremillRecipes); + + // Obsidian Stuff + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian)) + .itemOutputs(NHItemList.LongObsidianRod.getIS(2)).duration(32 * SECONDS).eut(16).addTo(latheRecipes); + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 2)) + .fluidInputs(Materials.Lubricant.getFluid(5)).duration(11 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(cutterRecipes); + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 2)) + .fluidInputs(Materials.Water.getFluid(20)).duration(22 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(cutterRecipes); + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 2)) + .fluidInputs(GTModHandler.getDistilledWater(15)).duration(22 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(cutterRecipes); + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian)) + .fluidOutputs(Materials.Obsidian.getMolten(288)).duration(10 * SECONDS + 16 * TICKS).eut(35) + .recipeCategory(fluidExtractorRecycling).addTo(fluidExtractionRecipes); + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2)) + .duration(9 * SECONDS + 18 * TICKS).eut(4).recipeCategory(maceratorRecycling).addTo(maceratorRecipes); + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian), ItemList.Shape_Mold_Ingot.get(0)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Obsidian, 2)) + .duration(6 * SECONDS + 10 * TICKS).eut(3).recipeCategory(alloySmelterMolding) + .addTo(alloySmelterRecipes); + GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Obsidian, 2)) + .itemOutputs(new ItemStack(Blocks.obsidian)).duration(15 * SECONDS).eut(2).addTo(compressorRecipes); + GTValues.RA.stdBuilder().fluidInputs(Materials.Obsidian.getMolten(288)) + .itemInputs(ItemList.Shape_Mold_Block.get(0)).itemOutputs(new ItemStack(Blocks.obsidian)) + .duration(14 * SECONDS + 8 * TICKS).eut(8).addTo(fluidSolidifierRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2), + ItemList.Shape_Extruder_Block.get(0)) + .itemOutputs(new ItemStack(Blocks.obsidian)).duration(10 * TICKS).eut(24).addTo(extruderRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Obsidian, 2), + ItemList.Shape_Extruder_Block.get(0)) + .itemOutputs(new ItemStack(Blocks.obsidian)).duration(10 * TICKS).eut(24).addTo(extruderRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2), + ItemList.Shape_Mold_Block.get(0)) + .itemOutputs(new ItemStack(Blocks.obsidian)).duration(5 * TICKS).eut(12) + .recipeCategory(alloySmelterMolding).addTo(alloySmelterRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Obsidian, 2), + ItemList.Shape_Mold_Block.get(0)) + .itemOutputs(new ItemStack(Blocks.obsidian)).duration(5 * TICKS).eut(12) + .recipeCategory(alloySmelterMolding).addTo(alloySmelterRecipes); + } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptEFR.java b/src/main/java/com/dreammaster/scripts/ScriptEFR.java index 4b4fd4bb2..c73cd2bbb 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEFR.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEFR.java @@ -2,27 +2,40 @@ import static gregtech.api.enums.Mods.AdventureBackpack; import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.BiomesOPlenty; +import static gregtech.api.enums.Mods.Botania; import static gregtech.api.enums.Mods.DraconicEvolution; +import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.EtFuturumRequiem; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.enums.Mods.PamsHarvestCraft; +import static gregtech.api.enums.Mods.StevesCarts2; import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.ThaumicBases; import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; +import static gregtech.api.recipe.RecipeMaps.hammerRecipes; +import static gregtech.api.recipe.RecipeMaps.mixerRecipes; +import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.Arrays; import java.util.List; +import java.util.Objects; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import com.dreammaster.recipes.CustomItem; +import com.dreammaster.thaumcraft.TCHelper; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; @@ -31,6 +44,12 @@ import gregtech.api.enums.TierEU; import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.research.ResearchItem; +import thaumcraft.api.research.ResearchPage; public class ScriptEFR implements IScriptLoader { @@ -160,7 +179,7 @@ public void loadRecipes() { GTModHandler.getModItem(TinkerConstruct.ID, "CraftingSlab", 1, 5), 'G', GTModHandler.getModItem(Thaumcraft.ID, "blockWoodenDevice", 1, 6), }); - GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "magma_cream", 4, 0, missing)) + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Items.magma_cream, 4)) .fluidInputs(new FluidStack(FluidRegistry.getFluid("lava"), 1000)) .itemOutputs(getModItem(EtFuturumRequiem.ID, "magma", 1, 0, missing)).duration(10 * SECONDS).eut(2) .addTo(compressorRecipes); @@ -170,8 +189,106 @@ public void loadRecipes() { .addTo(compressorRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(EtFuturumRequiem.ID, "magma", 1, 0, missing)) - .itemOutputs(getModItem(Minecraft.ID, "magma_cream", 4, 0, missing)) + .itemOutputs(new ItemStack(Items.magma_cream, 4)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("lava"), 1000)).duration(10 * SECONDS).eut(48) .addTo(fluidExtractionRecipes); + + GTValues.RA.stdBuilder().itemInputs(getModItem(BiomesOPlenty.ID, "hardIce", 4, 0, missing)) + .itemOutputs(getModItem(EtFuturumRequiem.ID, "blue_ice", 1, 0, missing)).duration(8 * SECONDS).eut(2) + .addTo(compressorRecipes); + + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Items.nether_wart, 9)) + .itemOutputs(getModItem(EtFuturumRequiem.ID, "nether_wart", 1L)).duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.gravel, 4), getModItem(TinkerConstruct.ID, "CraftedSoil", 4L, 1)) + .itemOutputs(getModItem(EtFuturumRequiem.ID, "old_gravel", 8L)).duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(EtFuturumRequiem.ID, "old_gravel", 4L), + getModItem(BiomesOPlenty.ID, "driedDirt", 4L)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("steam"), 400)) + .itemOutputs(getModItem(EtFuturumRequiem.ID, "coarse_dirt", 8, 0, missing)).duration(8 * SECONDS).eut(2) + .addTo(mixerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(TinkerConstruct.ID, "slime.gel", 4L, 1), + getModItem(TinkerConstruct.ID, "GlueBlock", 4L, 0)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("steam"), 4000)) + .itemOutputs(getModItem(EtFuturumRequiem.ID, "slime", 16, 0, missing)).duration(40 * SECONDS).eut(2) + .addTo(mixerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(HardcoreEnderExpansion.ID, "laboratory_obsidian", 16L), + getModItem(HardcoreEnderExpansion.ID, "spectral_tear", 1L, 0)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2distilledwater"), 4000)) + .itemOutputs(getModItem(EtFuturumRequiem.ID, "crying_obsidian", 16L)).duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); + + GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 9L)) + .itemOutputs(getModItem(EtFuturumRequiem.ID, "calcite", 1, 0, missing)).duration(8 * SECONDS).eut(2) + .addTo(compressorRecipes); + + GTValues.RA.stdBuilder().itemInputs(getModItem(EtFuturumRequiem.ID, "calcite", 1, 0, missing)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 9L)).duration(8 * SECONDS) + .eut(2).addTo(hammerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.dust, Materials.MelodicAlloy, 8L), + getModItem(Botania.ID, "fertilizer", 3, 0, missing), + getModItem(ThaumicBases.ID, "genLeaves", 1, 3, missing), + GTUtility.getIntegratedCircuit(24)) + .itemOutputs(getModItem(EtFuturumRequiem.ID, "chorus_flower", 1, 0, missing)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("endergoo"), 4000), + new FluidStack(FluidRegistry.getFluid("ender"), 1000)) + .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes); + + new ResearchItem( + "UNDYINGTOTEM", + "NEWHORIZONS", + new AspectList().add(Aspect.getAspect("infernus"), 15).add(Aspect.getAspect("lucrum"), 12) + .add(Aspect.getAspect("praecantatio"), 12).add(Aspect.getAspect("spiritus"), 9) + .add(Aspect.getAspect("fames"), 6).add(Aspect.getAspect("corpus"), 3), + -6, + -7, + 3, + getModItem(EtFuturumRequiem.ID, "totem_of_undying", 1, 0, missing)).setParents("GREENHEART") + .setConcealed().setRound().setPages(new ResearchPage("TConstruct.research_page.UNDYINGTOTEM.1")) + .registerResearchItem(); + ThaumcraftApi.addInfusionCraftingRecipe( + "UNDYINGTOTEM", + getModItem(EtFuturumRequiem.ID, "totem_of_undying", 1, 0, missing), + 15, + new AspectList().add(Aspect.getAspect("exanimis"), 100).add(Aspect.getAspect("ignis"), 150) + .add(Aspect.getAspect("lucrum"), 150).add(Aspect.getAspect("sano"), 200) + .add(Aspect.getAspect("praecantatio"), 200), + getModItem(TinkerConstruct.ID, "heartCanister", 1, 5, missing), + new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.plate, Materials.InfusedGold, 1L), + GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Emerald, 1L), + getModItem(ThaumicBases.ID, "oldGold", 1, 0, missing), + getModItem(StevesCarts2.ID, "BlockMetalStorage", 1, 2, missing), + getModItem(ThaumicBases.ID, "oldGold", 1, 0, missing), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.InfusedGold, 1L), + getModItem(EnderIO.ID, "itemFrankenSkull", 1, 5, missing), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.InfusedGold, 1L), + getModItem(ThaumicBases.ID, "oldGold", 1, 0, missing), + getModItem(StevesCarts2.ID, "BlockMetalStorage", 1, 2, missing), + getModItem(ThaumicBases.ID, "oldGold", 1, 0, missing), + GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.GreenSapphire, 1L), }); + TCHelper.addResearchPage( + "UNDYINGTOTEM", + new ResearchPage( + Objects.requireNonNull( + TCHelper.findInfusionRecipe( + getModItem(EtFuturumRequiem.ID, "totem_of_undying", 1, 0, missing))))); + ThaumcraftApi.addWarpToResearch("UNDYINGTOTEM", 3); + } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java b/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java index 359b02988..138feb11e 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java +++ b/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java @@ -54,8 +54,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; -import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -1016,7 +1015,7 @@ public void loadRecipes() { getModItem(ExtraUtilities.ID, "extractor_base", 1, 12, missing))); EnderConstructorRecipesHandler.registerRecipe( new ShapedOreRecipe( - new ItemStack(ModBlocks.blockCompressedObsidian, 1, 5), + GregtechItemList.InvertedObsidian.get(1), "abc", "def", "ghi", @@ -1414,12 +1413,10 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.screw, Materials.Tritanium, 1L), NHItemList.EngravedGoldChip.getIS(1), getModItem(ExtraUtilities.ID, "angelBlock", 1, 0, missing), - getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing), - new ItemStack(ModItems.itemMagicFeather), + getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing), GregtechItemList.MagicFeather.get(1), getModItem(Minecraft.ID, "nether_star", 1, 0, missing), getModItem(Avaritia.ID, "big_pearl", 1, 0, missing), - getModItem(Minecraft.ID, "nether_star", 1, 0, missing), - new ItemStack(ModItems.itemMagicFeather), + getModItem(Minecraft.ID, "nether_star", 1, 0, missing), GregtechItemList.MagicFeather.get(1), getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing), getModItem(ExtraUtilities.ID, "angelBlock", 1, 0, missing), NHItemList.EngravedGoldChip.getIS(1), diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtech.java b/src/main/java/com/dreammaster/scripts/ScriptGregtech.java index 1293421ad..233525a11 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGregtech.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGregtech.java @@ -34,11 +34,14 @@ import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gregtech.api.util.GTRecipeConstants.UniversalChemical; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.oredict.OreDictionary; import com.dreammaster.gthandler.CustomItemList; import com.dreammaster.item.NHItemList; @@ -115,10 +118,16 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Glass, 1L), "craftingToolMortar", getModItem(TinkerConstruct.ID, "GlassPane", 1, 0, missing)); + List meatItems = new ArrayList<>(OreDictionary.getOres("listAllmeatraw")).stream() + .filter( + itemStack -> !ItemStack.areItemStacksEqual( + itemStack, + GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1L))) + .collect(Collectors.toList()); addShapelessRecipe( GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1L), "craftingToolMortar", - "listAllmeatraw"); + meatItems); addShapelessRecipe( GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1L), "craftingToolMortar", @@ -127,10 +136,16 @@ public void loadRecipes() { getModItem(Minecraft.ID, "sugar", 4, 0, missing), "craftingToolMortar", getModItem(CropsPlusPlus.ID, "foodBerries", 1, 1, missing)); + List cookedMeatItems = new ArrayList<>(OreDictionary.getOres("listAllmeatcooked")).stream() + .filter( + itemStack -> !ItemStack.areItemStacksEqual( + itemStack, + GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1L))) + .collect(Collectors.toList()); addShapelessRecipe( GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1L), "craftingToolMortar", - "listAllmeatcooked"); + cookedMeatItems); addShapelessRecipe( GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1L), "craftingToolMortar", diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java index df82bd9b2..bc635835f 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java @@ -17,10 +17,10 @@ import java.util.Arrays; import java.util.List; -import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import cpw.mods.fml.common.Optional; import forestry.api.recipes.RecipeManagers; @@ -33,10 +33,8 @@ import gregtech.api.enums.TierEU; import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; -import gregtech.api.util.GTUtility; -import gtPlusPlus.core.item.chemistry.GenericChem; import gtPlusPlus.core.material.MaterialsAlloy; -import gtPlusPlus.xmod.forestry.bees.items.FRItemRegistry; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class ScriptGregtechPlusPlus implements IScriptLoader { @@ -94,6 +92,19 @@ public void loadRecipes() { MaterialsAlloy.TUMBAGA.getPlate(1), MaterialsAlloy.TUMBAGA.getRod(1)); + // Fish Trap + addShapedRecipe( + GregtechItemList.FishTrap.get(1), + NHItemList.SteelBars.getIS(), + NHItemList.SteelBars.getIS(), + NHItemList.SteelBars.getIS(), + NHItemList.SteelBars.getIS(), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.WroughtIron, 1), + NHItemList.SteelBars.getIS(), + NHItemList.SteelBars.getIS(), + NHItemList.SteelBars.getIS(), + NHItemList.SteelBars.getIS()); + // Shirabon and Eternity GTValues.RA.stdBuilder() .itemInputs( @@ -102,9 +113,8 @@ public void loadRecipes() { .itemOutputs(GTOreDictUnificator.get("dustShirabon", 64), ItemList.Timepiece.get(1)) .fluidInputs(MaterialsUEVplus.PrimordialMatter.getFluid(1152)) .fluidOutputs(MaterialsUEVplus.Eternity.getMolten(9216), MaterialsUEVplus.Time.getMolten(18432)) - .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.TemporalHarmonyCatalyst)) - .metadata(QFT_FOCUS_TIER, 4).duration(20 * SECONDS).eut(TierEU.RECIPE_UMV) - .addTo(quantumForceTransformerRecipes); + .metadata(QFT_CATALYST, GregtechItemList.TemporalHarmonyCatalyst.get(0)).metadata(QFT_FOCUS_TIER, 4) + .duration(20 * SECONDS).eut(TierEU.RECIPE_UMV).addTo(quantumForceTransformerRecipes); addForestryRecipes(); } @@ -118,9 +128,8 @@ private void addForestryRecipes() { GTOreDictUnificator.get(OrePrefixes.stick, Materials.WoodSealed, 4), GTModHandler.getModItem(Minecraft.ID, "paper", 1, 0, missing), GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) - .fluidInputs(Materials.Redstone.getMolten(576)) - .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameArborist)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + .fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(GregtechItemList.HiveFrameArborist.get(1)) + .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); // Stabilization Frame GTValues.RA.stdBuilder() @@ -129,9 +138,8 @@ private void addForestryRecipes() { GTOreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 4), GTOreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1), GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) - .fluidInputs(Materials.Redstone.getMolten(576)) - .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameStalilize)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + .fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(GregtechItemList.HiveFrameStabilize.get(1)) + .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); // Slowing Frame GTValues.RA.stdBuilder() @@ -140,9 +148,8 @@ private void addForestryRecipes() { MaterialsAlloy.TUMBAGA.getRod(4), GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 1), GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) - .fluidInputs(Materials.Redstone.getMolten(576)) - .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameSlow, 1, 0)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + .fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(GregtechItemList.HiveFrameSlow.get(1)) + .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); // Decaying Frame GTValues.RA.stdBuilder() @@ -151,9 +158,8 @@ private void addForestryRecipes() { GTOreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 4), GTOreDictUnificator.get(OrePrefixes.foil, Materials.WroughtIron, 1), GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) - .fluidInputs(Materials.Redstone.getMolten(576)) - .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameDecay)).duration(30 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(assemblerRecipes); + .fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(GregtechItemList.HiveFrameDecay.get(1)) + .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); // Working Frame GTValues.RA.stdBuilder() @@ -162,7 +168,7 @@ private void addForestryRecipes() { GTOreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4), GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1), GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) - .fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(new ItemStack(FRItemRegistry.hiveFrameBusy)) + .fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(GregtechItemList.HiveFrameBusy.get(1)) .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); // Mutagenic Frame @@ -172,9 +178,8 @@ private void addForestryRecipes() { GTOreDictUnificator.get(OrePrefixes.stick, Materials.Plutonium241, 4), GTOreDictUnificator.get(OrePrefixes.foil, Materials.Plutonium241, 1), GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) - .fluidInputs(Materials.Redstone.getMolten(576)) - .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameMutagenic)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + .fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(GregtechItemList.HiveFrameMutagenic.get(1)) + .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); // Accelerated Frame GTValues.RA.stdBuilder() @@ -184,15 +189,15 @@ private void addForestryRecipes() { GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 1), GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) .fluidInputs(Materials.Redstone.getMolten(576)) - .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameAccelerated)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + .itemOutputs(GregtechItemList.HiveFrameAccelerated.get(1)).duration(30 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); - addShapelessRecipe(CustomItemList.CoinBeesI.get(16L), new ItemStack(FRItemRegistry.hiveFrameVoid)); + addShapelessRecipe(CustomItemList.CoinBeesI.get(16L), GregtechItemList.HiveFrameVoid.get(1)); RecipeManagers.carpenterManager.addRecipe( 60, FluidRegistry.getFluidStack("molten.redstone", 576), getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing), - new ItemStack(FRItemRegistry.hiveFrameAccelerated, 1, 0), + GregtechItemList.HiveFrameAccelerated.get(1), "abc", "def", "ghi", @@ -218,7 +223,7 @@ private void addForestryRecipes() { 60, FluidRegistry.getFluidStack("molten.redstone", 576), getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing), - new ItemStack(FRItemRegistry.hiveFrameMutagenic, 1, 0), + GregtechItemList.HiveFrameMutagenic.get(1), "abc", "def", "ghi", @@ -244,7 +249,7 @@ private void addForestryRecipes() { 60, FluidRegistry.getFluidStack("molten.redstone", 576), getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing), - new ItemStack(FRItemRegistry.hiveFrameBusy), + GregtechItemList.HiveFrameBusy.get(1), "abc", "def", "ghi", @@ -270,7 +275,7 @@ private void addForestryRecipes() { 60, FluidRegistry.getFluidStack("molten.redstone", 576), getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing), - new ItemStack(FRItemRegistry.hiveFrameDecay), + GregtechItemList.HiveFrameDecay.get(1), "abc", "def", "ghi", @@ -296,7 +301,7 @@ private void addForestryRecipes() { 60, FluidRegistry.getFluidStack("molten.redstone", 576), getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing), - new ItemStack(FRItemRegistry.hiveFrameSlow), + GregtechItemList.HiveFrameSlow.get(1), "abc", "def", "ghi", @@ -322,7 +327,7 @@ private void addForestryRecipes() { 60, FluidRegistry.getFluidStack("molten.redstone", 576), getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing), - new ItemStack(FRItemRegistry.hiveFrameStalilize), + GregtechItemList.HiveFrameStabilize.get(1), "abc", "def", "ghi", @@ -348,7 +353,7 @@ private void addForestryRecipes() { 60, FluidRegistry.getFluidStack("molten.redstone", 576), getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing), - new ItemStack(FRItemRegistry.hiveFrameArborist), + GregtechItemList.HiveFrameArborist.get(1), "abc", "def", "ghi", diff --git a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java index 4499f5e72..8276d17a2 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java @@ -51,7 +51,7 @@ import gregtech.api.objects.ItemData; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; -import gtPlusPlus.xmod.ic2.item.IC2Items; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class ScriptIndustrialCraft implements IScriptLoader { @@ -313,7 +313,7 @@ public void loadRecipes() { getModItem(IndustrialCraft2.ID, "itemPartCarbonPlate", 1, 0, missing)); addShapedRecipe( getModItem(IndustrialCraft2.ID, "itemwcarbonrotor", 1, 1, missing), - new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0), + GregtechItemList.TungstenSteelShaft.get(1), getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing), "craftingToolHardHammer", getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing), @@ -321,7 +321,7 @@ public void loadRecipes() { getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing), "craftingToolWrench", getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing), - new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0)); + GregtechItemList.TungstenSteelShaft.get(1)); addShapedRecipe( getModItem(IndustrialCraft2.ID, "blockKineticGenerator", 1, 5, missing), ItemList.Electric_Motor_MV.get(1L), diff --git a/src/main/java/com/dreammaster/scripts/ScriptLoader.java b/src/main/java/com/dreammaster/scripts/ScriptLoader.java index 18441b9e9..f6228da45 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptLoader.java +++ b/src/main/java/com/dreammaster/scripts/ScriptLoader.java @@ -85,6 +85,7 @@ public static void run() { new ScriptLogisticPipes(), new ScriptMagicBees(), new ScriptMalisDoors(), + new ScriptMatterManipulator(), new ScriptMechworks(), new ScriptMinecraft(), new ScriptNatura(), diff --git a/src/main/java/com/dreammaster/scripts/ScriptMatterManipulator.java b/src/main/java/com/dreammaster/scripts/ScriptMatterManipulator.java new file mode 100644 index 000000000..8509e2ea0 --- /dev/null +++ b/src/main/java/com/dreammaster/scripts/ScriptMatterManipulator.java @@ -0,0 +1,468 @@ +package com.dreammaster.scripts; + +import static gregtech.api.enums.GTValues.L; +import static gregtech.api.enums.Mods.AE2FluidCraft; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.GraviSuite; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.MatterManipulator; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.util.GTModHandler.getModItem; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.AssemblyLine; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM; +import static gregtech.api.util.GTRecipeConstants.SCANNING; + +import java.util.Arrays; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import com.recursive_pineapple.matter_manipulator.common.items.MMItemList; + +import appeng.api.AEApi; +import bartworks.system.material.WerkstoffLoader; +import gregtech.api.enums.GTValues; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; +import gregtech.api.recipe.RecipeMaps; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.api.util.recipe.Scanning; +import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.core.material.MaterialsAlloy; +import tectech.recipe.TTRecipeAdder; +import tectech.thing.CustomItemList; + +public class ScriptMatterManipulator implements IScriptLoader { + + @Override + public String getScriptName() { + return "Matter Manipulator"; + } + + @Override + public List getDependencies() { + return Arrays.asList(MatterManipulator.ID, Thaumcraft.ID, EnderIO.ID, GraviSuite.ID, AppliedEnergistics2.ID); + } + + @Override + public void loadRecipes() { + addMK0Recipes(); + addMK1Recipes(); + addMK2Recipes(); + addMK3Recipe(); + addUplinkRecipes(); + } + + private static void addMK0Recipes() { + // Power core MK0 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(5), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.StainlessSteel, 8), + getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1), // energy crystal + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 12), + new Object[] { OrePrefixes.circuit.get(Materials.HV), 2 }, + GTOreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 16)) + .fluidInputs(Materials.SolderingAlloy.getMolten(L * 4)).itemOutputs(MMItemList.PowerCore0.get(1)) + .eut((int) TierEU.RECIPE_HV).duration(20 * SECONDS).addTo(RecipeMaps.assemblerRecipes); + + // Computer core MK0 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(5), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.StainlessSteel, 8), + new Object[] { OrePrefixes.circuit.get(Materials.IV), 2 }, + getModItem(EnderIO.ID, "blockEndermanSkull", 1, 2), // tormented enderman skull + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 12), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 16)) + .fluidInputs(Materials.SolderingAlloy.getMolten(L * 8)).itemOutputs(MMItemList.ComputerCore0.get(1)) + .eut((int) TierEU.RECIPE_HV).duration(20 * SECONDS).addTo(RecipeMaps.circuitAssemblerRecipes); + + // Teleporter core MK0 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(5), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), + ItemList.Emitter_HV.get(2), + getModItem(Thaumcraft.ID, "ItemResource", 1, 15), // primal charm + ItemList.QuantumEye.get(2), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Thaumium, 8), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.Thaumium, 16)) + .fluidInputs(FluidRegistry.getFluidStack("ender", 2000)).itemOutputs(MMItemList.TeleporterCore0.get(1)) + .eut((int) TierEU.RECIPE_HV).duration(20 * SECONDS).addTo(RecipeMaps.assemblerRecipes); + + // Frame MK0 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(10), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 16)) + .itemOutputs(MMItemList.Frame0.get(1)).eut((int) TierEU.RECIPE_HV).duration(20 * SECONDS) + .addTo(RecipeMaps.benderRecipes); + + // Lens MK0 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(5), + GTOreDictUnificator.get(OrePrefixes.ring, Materials.StainlessSteel, 4), + getModItem(Thaumcraft.ID, "FocusTrade", 1), // equal trade focus + ItemList.Field_Generator_MV.get(1), + ItemList.Electric_Piston_HV.get(2), + ItemList.Electric_Motor_HV.get(2)) + .fluidInputs(Materials.SolderingAlloy.getMolten(L * 4)).itemOutputs(MMItemList.Lens0.get(1)) + .eut((int) TierEU.RECIPE_HV).duration(20 * SECONDS).addTo(RecipeMaps.assemblerRecipes); + + // Manipulator MK0 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(5), + MMItemList.Lens0.get(1), + MMItemList.TeleporterCore0.get(1), + MMItemList.ComputerCore0.get(1), + MMItemList.PowerCore0.get(1), + MMItemList.Frame0.get(1)) + .fluidInputs(Materials.SolderingAlloy.getMolten(L * 8)).itemOutputs(MMItemList.MK0.get(1)) + .eut((int) TierEU.RECIPE_HV).duration(30 * SECONDS).addTo(RecipeMaps.assemblerRecipes); + + } + + private static void addMK1Recipes() { + // Power core MK1 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(5), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.TungstenSteel, 8), + ItemList.Energy_LapotronicOrb.get(1), + ItemList.Circuit_Chip_PIC.get(4), + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorIV, 6), + new Object[] { OrePrefixes.circuit.get(Materials.IV), 2 }, + GTOreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 16)) + .fluidInputs(MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 8))) + .itemOutputs(MMItemList.PowerCore1.get(1)).eut((int) TierEU.RECIPE_IV).duration(20 * SECONDS) + .addTo(RecipeMaps.assemblerRecipes); + + // Computer core MK1 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(5), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 2 }, + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 12), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.TungstenSteel, 8), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 16)) + .fluidInputs(MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 16))) + .itemOutputs(MMItemList.ComputerCore1.get(1)).eut((int) TierEU.RECIPE_IV).duration(20 * SECONDS) + .addTo(RecipeMaps.circuitAssemblerRecipes); + + // Teleporter core MK1 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(5), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Enderium, 1), + getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 0), // teleporter + ItemList.Emitter_IV.get(2), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.TungstenSteel, 8), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 16)) + .fluidInputs(MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 16))) + .itemOutputs(MMItemList.TeleporterCore1.get(1)).eut((int) TierEU.RECIPE_IV).duration(20 * SECONDS) + .addTo(RecipeMaps.assemblerRecipes); + + // Frame MK1 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(10), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 32)) + .itemOutputs(MMItemList.Frame1.get(1)).eut((int) TierEU.RECIPE_IV).duration(20 * SECONDS) + .addTo(RecipeMaps.benderRecipes); + + // Lens MK1 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(5), + GTOreDictUnificator.get(OrePrefixes.lens, Materials.NetherStar, 2), + GTOreDictUnificator.get(OrePrefixes.ring, Materials.TungstenSteel, 4), + ItemList.Field_Generator_IV.get(1), + ItemList.Electric_Piston_IV.get(2), + ItemList.Electric_Motor_IV.get(2)) + .fluidInputs(MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 4))) + .itemOutputs(MMItemList.Lens1.get(1)).eut((int) TierEU.RECIPE_IV).duration(20 * SECONDS) + .addTo(RecipeMaps.assemblerRecipes); + + // Manipulator MK1 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(5), + MMItemList.Lens1.get(1), + MMItemList.TeleporterCore1.get(1), + MMItemList.ComputerCore1.get(1), + MMItemList.PowerCore1.get(1), + MMItemList.Frame1.get(1), + MMItemList.AEDownlink.get(1)) + .fluidInputs(MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 16))) + .itemOutputs(MMItemList.MK1.get(1)).eut((int) TierEU.RECIPE_IV).duration(30 * SECONDS) + .addTo(RecipeMaps.assemblerRecipes); + } + + private static void addMK2Recipes() { + // Power core MK2 + GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Circuit_Chip_HPIC.get(1)) + .metadata(SCANNING, new Scanning(1 * MINUTES, TierEU.RECIPE_LuV)) + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.HSSS, 8), + ItemList.Energy_LapotronicOrb2.get(1), + ItemList.Circuit_Chip_HPIC.get(4), + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorLuV, 6), + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 2 }, + GTOreDictUnificator.get(OrePrefixes.screw, Materials.HSSS, 16)) + .fluidInputs( + MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 8)), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)) + .itemOutputs(MMItemList.PowerCore2.get(1)).duration(1 * MINUTES).eut((int) TierEU.RECIPE_LuV) + .addTo(AssemblyLine); + + // Computer core MK2 + GTValues.RA.stdBuilder() + .metadata(RESEARCH_ITEM, GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1)) + .metadata(SCANNING, new Scanning(1 * MINUTES, TierEU.RECIPE_LuV)) + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1), + new Object[] { OrePrefixes.circuit.get(Materials.UV), 2 }, + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 18), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.HSSS, 8), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.HSSS, 16)) + .fluidInputs( + MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 16)), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000)) + .itemOutputs(MMItemList.ComputerCore2.get(1)).duration(1 * MINUTES).eut((int) TierEU.RECIPE_LuV) + .addTo(AssemblyLine); + + // Teleporter core MK2 + GTValues.RA.stdBuilder() + .metadata(RESEARCH_ITEM, GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Quantium, 1)) + .metadata(SCANNING, new Scanning(1 * MINUTES, TierEU.RECIPE_LuV)) + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Quantium, 1), + ItemList.Emitter_LuV.get(2), + ItemList.Field_Generator_LuV.get(1), + ItemList.QuantumStar.get(4), + getModItem(GraviSuite.ID, "itemSimpleItem", 4, 3), // gravitation engine + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.HSSS, 8), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.HSSS, 16)) + .fluidInputs( + MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 16)), + Materials.Quantium.getMolten(L * 16), + Materials.Duranium.getMolten(L * 8), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000)) + .itemOutputs(MMItemList.TeleporterCore2.get(1)).duration(1 * MINUTES).eut((int) TierEU.RECIPE_LuV) + .addTo(AssemblyLine); + + // Frame MK2 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(10), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 48)) + .itemOutputs(MMItemList.Frame2.get(1)).eut((int) TierEU.RECIPE_LuV).duration(30 * SECONDS) + .addTo(RecipeMaps.benderRecipes); + + // Lens MK2 + GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, WerkstoffLoader.RedZircon.get(OrePrefixes.lens, 1)) + .metadata(SCANNING, new Scanning(1 * MINUTES, TierEU.RECIPE_LuV)) + .itemInputs( + WerkstoffLoader.RedZircon.get(OrePrefixes.lens, 2), + GTOreDictUnificator.get(OrePrefixes.ring, Materials.HSSS, 4), + ItemList.Field_Generator_LuV.get(1), + ItemList.Electric_Motor_LuV.get(2), + ItemList.Electric_Piston_LuV.get(2)) + .fluidInputs(MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 4))) + .itemOutputs(MMItemList.Lens2.get(1)).duration(1 * MINUTES).eut((int) TierEU.RECIPE_LuV) + .addTo(AssemblyLine); + + // Manipulator MK2 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(5), + MMItemList.Lens2.get(1), + MMItemList.TeleporterCore2.get(1), + MMItemList.ComputerCore2.get(1), + MMItemList.PowerCore2.get(1), + MMItemList.Frame2.get(1), + MMItemList.AEDownlink.get(1)) + .fluidInputs(MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 16))) + .itemOutputs(MMItemList.MK2.get(1)).eut((int) TierEU.RECIPE_LuV).duration(30 * SECONDS) + .addTo(RecipeMaps.assemblerRecipes); + } + + private static void addMK3Recipe() { + // Power core MK3 + GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Circuit_Chip_UHPIC.get(1)) + .metadata(SCANNING, new Scanning(2 * MINUTES, TierEU.RECIPE_ZPM)) + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.NaquadahAlloy, 8), + ItemList.Energy_Module.get(1), + ItemList.Circuit_Chip_UHPIC.get(8), + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 12), + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 2 }, + GTOreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 16)) + .fluidInputs( + MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 16)), + Materials.SuperCoolant.getFluid(32000)) + .itemOutputs(MMItemList.PowerCore3.get(1)).duration(1 * MINUTES).eut((int) TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); + + // Computer core MK3 + GTValues.RA.stdBuilder() + .metadata(RESEARCH_ITEM, GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1)) + .metadata(SCANNING, new Scanning(2 * MINUTES, TierEU.RECIPE_ZPM)) + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), + new Object[] { OrePrefixes.circuit.get(Materials.UV), 2 }, + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 30), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.NaquadahAlloy, 8), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 16)) + .fluidInputs( + MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 32)), + Materials.SuperCoolant.getFluid(64000)) + .itemOutputs(MMItemList.ComputerCore3.get(1)).duration(1 * MINUTES).eut((int) TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); + + // Teleporter core MK3 + GTValues.RA.stdBuilder() + .metadata(RESEARCH_ITEM, GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.MysteriousCrystal, 1)) + .metadata(SCANNING, new Scanning(2 * MINUTES, TierEU.RECIPE_ZPM)) + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.MysteriousCrystal, 1), + ItemList.Emitter_ZPM.get(2), + ItemList.Field_Generator_ZPM.get(1), + ItemList.Gravistar.get(4), + new ItemStack(ModItems.itemStandarParticleBase, 16, 0), // gravitons + getModItem(GraviSuite.ID, "itemSimpleItem", 16, 3), // gravitation engine + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Trinium, 8), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.Trinium, 16)) + .fluidInputs( + MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 16)), + Materials.MysteriousCrystal.getMolten(L * 16), + Materials.Tritanium.getMolten(L * 16), + Materials.SuperCoolant.getFluid(32000)) + .itemOutputs(MMItemList.TeleporterCore3.get(1)).duration(1 * MINUTES).eut((int) TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); + + // Frame MK3 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(10), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 64)) + .itemOutputs(MMItemList.Frame3.get(1)).eut((int) TierEU.RECIPE_ZPM).duration(30 * SECONDS) + .addTo(RecipeMaps.benderRecipes); + + // Lens MK3 + GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.lens, 1)) + .metadata(SCANNING, new Scanning(2 * MINUTES, TierEU.RECIPE_ZPM)) + .itemInputs( + WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.lens, 2), + GTOreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4), + ItemList.Field_Generator_ZPM.get(1), + ItemList.Electric_Piston_ZPM.get(2), + ItemList.Electric_Motor_ZPM.get(2)) + .fluidInputs(MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 16))) + .itemOutputs(MMItemList.Lens3.get(1)).duration(1 * MINUTES).eut((int) TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); + + // ME Downlink + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(5), + AEApi.instance().definitions().blocks().wireless().maybeStack(1).get(), + AEApi.instance().definitions().blocks().energyCell().maybeStack(1).get(), + AEApi.instance().definitions().materials().cell256kPart().maybeStack(1).get(), + getModItem(AE2FluidCraft.ID, "fluid_interface", 1), + ItemList.Conveyor_Module_IV.get(2), + ItemList.Electric_Pump_IV.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.IV), 1 }) + .fluidInputs(MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 8))) + .itemOutputs(MMItemList.AEDownlink.get(1)).eut((int) TierEU.RECIPE_IV).duration(20 * SECONDS) + .addTo(RecipeMaps.assemblerRecipes); + + // Quantum Downlink + GTValues.RA.stdBuilder() + .metadata(RESEARCH_ITEM, AEApi.instance().definitions().blocks().quantumRing().maybeStack(1).get()) + .metadata(SCANNING, new Scanning(4 * MINUTES, TierEU.RECIPE_LuV)) + .itemInputs( + AEApi.instance().definitions().blocks().quantumRing().maybeStack(8).get(), + AEApi.instance().definitions().blocks().quantumLink().maybeStack(1).get(), + AEApi.instance().definitions().blocks().controller().maybeStack(1).get(), + AEApi.instance().definitions().blocks().energyCellDense().maybeStack(1).get(), + AEApi.instance().definitions().materials().cell4096kPart().maybeStack(1).get(), + getModItem(AE2FluidCraft.ID, "fluid_interface", 1), + ItemList.Conveyor_Module_ZPM.get(2), + ItemList.Electric_Pump_ZPM.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 }) + .fluidInputs(MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 32))) + .itemOutputs(MMItemList.QuantumDownlink.get(1)).duration(1 * MINUTES).eut((int) TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); + + // Manipulator MK3 + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(5), + MMItemList.Lens3.get(1), + MMItemList.TeleporterCore3.get(1), + MMItemList.ComputerCore3.get(1), + MMItemList.PowerCore3.get(1), + MMItemList.Frame3.get(1), + MMItemList.AEDownlink.get(1), + MMItemList.QuantumDownlink.get(1)) + .fluidInputs(MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 16))) + .itemOutputs(MMItemList.MK3.get(1)).eut((int) TierEU.RECIPE_ZPM).duration(30 * SECONDS) + .addTo(RecipeMaps.assemblerRecipes); + } + + private static void addUplinkRecipes() { + // Quantum Uplink ME Connector Hatch + TTRecipeAdder.addResearchableAssemblylineRecipe( + AEApi.instance().definitions().parts().patternTerminal().maybeStack(1).get(), + 80_000, + 32, + (int) TierEU.RECIPE_UV, + 2, + new Object[] { CustomItemList.dataIn_Hatch.get(1), + AEApi.instance().definitions().materials().cell16384kPart().maybeStack(1).get(), + getModItem(AE2FluidCraft.ID, "fluid_interface", 1), + AEApi.instance().definitions().parts().patternTerminal().maybeStack(1).get(), + ItemList.Robot_Arm_UV.get(1), + AEApi.instance().definitions().materials().blankPattern().maybeStack(64).get(), + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 } }, + new FluidStack[] { MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 32)), + Materials.Naquadria.getMolten(L * 16), }, + MMItemList.UplinkHatch.get(1), + 60 * SECONDS, + (int) TierEU.RECIPE_UV); + + // Matter Manipulator Quantum Uplink + TTRecipeAdder.addResearchableAssemblylineRecipe( + AEApi.instance().definitions().blocks().quantumLink().maybeStack(1).get(), + 160_000, + 32, + (int) TierEU.RECIPE_UV, + 4, + new Object[] { CustomItemList.Machine_Multi_DataBank.get(1), + AEApi.instance().definitions().blocks().controller().maybeStack(4).get(), + AEApi.instance().definitions().blocks().quantumRing().maybeStack(8).get(), + AEApi.instance().definitions().blocks().quantumLink().maybeStack(1).get(), + AEApi.instance().definitions().blocks().iOPort().maybeStack(1).get(), + AEApi.instance().definitions().materials().cardSuperSpeed().maybeStack(2).get(), + CustomItemList.dataOut_Hatch.get(1), CustomItemList.DATApipe.get(32), + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 2 } }, + new FluidStack[] { MaterialsAlloy.INDALLOY_140.getFluidStack((int) (L * 64)), + Materials.Naquadria.getMolten(L * 32), }, + MMItemList.UplinkController.get(1), + 60 * SECONDS, + (int) TierEU.RECIPE_UV); + } +} diff --git a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java index 10a388510..f004266ba 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java @@ -4,6 +4,7 @@ import static gregtech.api.enums.Mods.Backpack; import static gregtech.api.enums.Mods.BiomesOPlenty; import static gregtech.api.enums.Mods.BloodArsenal; +import static gregtech.api.enums.Mods.Botania; import static gregtech.api.enums.Mods.CarpentersBlocks; import static gregtech.api.enums.Mods.ExtraTrees; import static gregtech.api.enums.Mods.ExtraUtilities; @@ -42,6 +43,7 @@ import java.util.Arrays; import java.util.List; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import com.dreammaster.gthandler.CustomItemList; @@ -2159,6 +2161,25 @@ public void loadRecipes() { GTUtility.getIntegratedCircuit(1)) .itemOutputs(getModItem(Minecraft.ID, "saddle", 1, 0, missing)).duration(5 * SECONDS).eut(24) .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.dirt, 16), + getModItem(Botania.ID, "grassSeeds", 1, 0, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(new ItemStack(Blocks.grass, 16)).duration(5 * SECONDS).eut(24).addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.dirt, 16), + getModItem(Botania.ID, "grassSeeds", 1, 1, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(new ItemStack(Blocks.dirt, 16, 2)).duration(5 * SECONDS).eut(24).addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.dirt, 16), + getModItem(Botania.ID, "grassSeeds", 1, 2, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(new ItemStack(Blocks.mycelium, 16)).duration(5 * SECONDS).eut(24).addTo(assemblerRecipes); + GTValues.RA.stdBuilder() .itemInputs( CustomItemList.ArtificialLeather.get(4L), diff --git a/src/main/java/com/dreammaster/scripts/ScriptNatura.java b/src/main/java/com/dreammaster/scripts/ScriptNatura.java index b42adb999..e398e7582 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptNatura.java +++ b/src/main/java/com/dreammaster/scripts/ScriptNatura.java @@ -9,6 +9,7 @@ import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.extractorRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; +import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; @@ -16,6 +17,8 @@ import java.util.Arrays; import java.util.List; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import com.dreammaster.chisel.ChiselHelper; @@ -3367,6 +3370,23 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) .outputChances(10000, 8000).duration(20 * SECONDS).eut(2).addTo(maceratorRecipes); + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.snow, 4), GTUtility.getIntegratedCircuit(4)) + .itemOutputs(getModItem(Natura.ID, "Cloud", 4, 0)) + .fluidInputs(FluidRegistry.getFluidStack("cloud_seed", 1000)).duration(20 * TICKS).eut(16) + .addTo(mixerRecipes); + GTValues.RA.stdBuilder().itemInputs(getModItem(Natura.ID, "Cloud", 4, 0), GTUtility.getIntegratedCircuit(4)) + .itemOutputs(getModItem(Natura.ID, "Cloud", 4, 1)) + .fluidInputs(FluidRegistry.getFluidStack("cloud_seed_concentrated", 1000)).duration(20 * TICKS).eut(16) + .addTo(mixerRecipes); + GTValues.RA.stdBuilder().itemInputs(getModItem(Natura.ID, "Cloud", 4, 1), GTUtility.getIntegratedCircuit(4)) + .itemOutputs(getModItem(Natura.ID, "Cloud", 4, 2)) + .fluidInputs(FluidRegistry.getFluidStack("woodtar", 2000)).duration(20 * TICKS).eut(16) + .addTo(mixerRecipes); + GTValues.RA.stdBuilder().itemInputs(getModItem(Natura.ID, "Cloud", 4, 1), GTUtility.getIntegratedCircuit(4)) + .itemOutputs(getModItem(Natura.ID, "Cloud", 4, 3)) + .fluidInputs(FluidRegistry.getFluidStack("sulfurdioxide", 4000)).duration(20 * TICKS).eut(16) + .addTo(mixerRecipes); + Module_CustomFuels .registerCustomFuelValue(getModItem(Natura.ID, "NetherPressurePlate", 1, 0, missing), (short) 75); Module_CustomFuels diff --git a/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java b/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java index 1e48f9828..16221b8c8 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java +++ b/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java @@ -46,6 +46,7 @@ import java.util.Arrays; import java.util.List; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -3007,746 +3008,746 @@ private void recipes2() { .duration(20 * SECONDS).eut(30).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 15, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 15, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 19, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 19, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 0, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 0, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 19, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 19, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(BiomesOPlenty.ID, "misc", 2, 8, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(BiomesOPlenty.ID, "misc", 1, 8, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 19, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 19, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Color_15.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Color_15.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 19, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 19, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ExtraBees.ID, "misc", 2, 23, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ExtraBees.ID, "misc", 1, 23, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 19, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 19, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 0, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 0, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 19, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 19, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 25, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 25, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 19, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 19, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 14, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 14, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 20, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 20, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 1, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 1, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 20, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 20, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Color_14.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Color_14.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 20, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 20, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 1, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 1, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 20, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 20, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 24, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 24, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 20, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 20, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 13, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 13, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 21, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 21, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 2, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 2, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 21, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 21, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Color_13.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Color_13.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 21, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 21, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 2, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 2, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 21, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 21, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 23, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 23, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 21, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 21, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 12, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 12, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 22, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 22, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 3, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 3, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 22, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 22, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Color_12.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Color_12.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 22, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 22, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 3, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 3, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 22, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 22, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 22, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 22, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 22, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 22, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 11, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 11, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 23, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 23, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 4, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 4, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 23, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 23, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.YellowLimonite, 2L), + new ItemStack(Items.glowstone_dust, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.YellowLimonite, 1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 23, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 23, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Color_11.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Color_11.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 23, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 23, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ExtraBees.ID, "misc", 2, 20, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ExtraBees.ID, "misc", 1, 20, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 23, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 23, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 4, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 4, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 23, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 23, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 21, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 21, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 23, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 23, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 10, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 10, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 24, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 24, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 5, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 5, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 24, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 24, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Color_10.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Color_10.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 24, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 24, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 5, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 5, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 24, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 24, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 20, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 20, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 24, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 24, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 2L), + new ItemStack(Items.glowstone_dust, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 24, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 24, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 9, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 9, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 25, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 25, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 6, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 6, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 25, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 25, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Color_09.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Color_09.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 25, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 25, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 6, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 6, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 25, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 25, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 19, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 19, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 25, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 25, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 8, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 8, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 26, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 26, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 7, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 7, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 26, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 26, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Color_08.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Color_08.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 26, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 26, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 7, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 7, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 26, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 26, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 18, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 18, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 26, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 26, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 7, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 7, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 27, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 27, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 8, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 8, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 27, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 27, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Color_07.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Color_07.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 27, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 27, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 8, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 8, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 27, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 27, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 17, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 17, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 27, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 27, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 6, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 6, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 28, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 28, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 9, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 9, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 28, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 28, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lazurite, 2L), + new ItemStack(Items.glowstone_dust, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lazurite, 1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 28, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 28, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - GTOreDictUnificator.get(OrePrefixes.gem, Materials.Lazurite, 2L), + new ItemStack(Items.glowstone_dust, 1), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.Lazurite, 1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 28, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 28, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Color_06.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Color_06.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 28, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 28, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 9, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 9, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 28, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 28, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 16, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 16, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 28, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 28, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 5, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 5, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 29, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 29, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 10, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 10, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 29, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 29, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Color_05.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Color_05.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 29, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 29, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 10, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 10, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 29, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 29, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 15, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 15, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 29, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 29, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 4, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 4, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 30, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 30, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 11, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 11, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 30, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 30, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Natura.ID, "barleyFood", 2, 8, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Natura.ID, "barleyFood", 1, 8, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 30, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 30, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(BiomesOPlenty.ID, "misc", 2, 5, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(BiomesOPlenty.ID, "misc", 1, 5, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 30, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 30, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodalite, 2L), + new ItemStack(Items.glowstone_dust, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodalite, 1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 30, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 30, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 2L), + new ItemStack(Items.glowstone_dust, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 30, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 30, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - GTOreDictUnificator.get(OrePrefixes.gem, Materials.Sodalite, 2L), + new ItemStack(Items.glowstone_dust, 1), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.Sodalite, 1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 30, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 30, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Dye_Indigo.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Dye_Indigo.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 30, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 30, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Color_04.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Color_04.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 30, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 30, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ExtraBees.ID, "misc", 2, 21, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ExtraBees.ID, "misc", 1, 21, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 30, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 30, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 11, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 11, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 30, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 30, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 14, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 14, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 30, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 30, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 3, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 3, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 31, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 31, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(GalacticraftAmunRa.ID, "item.baseItem", 2, 29, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(GalacticraftAmunRa.ID, "item.baseItem", 1, 29, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 31, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 31, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 12, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 12, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 31, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 31, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(BiomesOPlenty.ID, "misc", 2, 6, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(BiomesOPlenty.ID, "misc", 1, 6, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 31, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 31, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 2), + new ItemStack(Items.glowstone_dust, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 31, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 31, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 2), + new ItemStack(Items.glowstone_dust, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 31, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 31, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.BrownLimonite, 2L), + new ItemStack(Items.glowstone_dust, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.BrownLimonite, 1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 31, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 31, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ExtraBees.ID, "misc", 2, 25, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ExtraBees.ID, "misc", 1, 25, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 31, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 31, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 12, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 12, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 31, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 31, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 13, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 13, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 31, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 31, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 2, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 2, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 32, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 32, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 13, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 13, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 32, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 32, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(BiomesOPlenty.ID, "misc", 2, 7, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(BiomesOPlenty.ID, "misc", 1, 7, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 32, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 32, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Color_02.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Color_02.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 32, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 32, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ExtraBees.ID, "misc", 2, 22, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ExtraBees.ID, "misc", 1, 22, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 32, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 32, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 13, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 13, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 32, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 32, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 12, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 12, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 32, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 32, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 1, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 1, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 33, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 33, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 14, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 14, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 33, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 33, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Color_01.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Color_01.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 33, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 33, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ExtraBees.ID, "misc", 2, 19, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ExtraBees.ID, "misc", 1, 19, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 33, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 33, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 14, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 14, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 33, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 33, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 11, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 11, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 33, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 33, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Minecraft.ID, "dye", 2, 0, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Minecraft.ID, "dye", 1, 0, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 34, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 34, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Botania.ID, "dye", 2, 15, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Botania.ID, "dye", 1, 15, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 34, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 34, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(BiomesOPlenty.ID, "misc", 2, 9, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(BiomesOPlenty.ID, "misc", 1, 9, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 34, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 34, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - ItemList.Color_00.get(2L), + new ItemStack(Items.glowstone_dust, 1), + ItemList.Color_00.get(1L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 34, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 34, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ForbiddenMagic.ID, "FMResource", 2, 1, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ForbiddenMagic.ID, "FMResource", 1, 1, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 34, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 34, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ThaumicHorizons.ID, "inkEgg", 2, 0, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ThaumicHorizons.ID, "inkEgg", 1, 0, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 34, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 34, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ExtraBees.ID, "misc", 2, 24, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ExtraBees.ID, "misc", 1, 24, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 34, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 34, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 2, 15, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(ProjectRedExploration.ID, "projectred.exploration.lilyseed", 1, 15, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 34, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 34, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(Minecraft.ID, "glowstone_dust", 2, 0, missing), - getModItem(Gendustry.ID, "HoneyDrop", 2, 10, missing), + new ItemStack(Items.glowstone_dust, 1), + getModItem(Gendustry.ID, "HoneyDrop", 1, 10, missing), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 8, 34, missing)) - .duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(mixerRecipes); + .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 4, 34, missing)) + .duration(1 * SECONDS + 5 * TICKS).eut(8).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 0, missing), diff --git a/src/main/java/com/dreammaster/scripts/ScriptRailcraft.java b/src/main/java/com/dreammaster/scripts/ScriptRailcraft.java index 24ed1dc22..4db5babd4 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptRailcraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptRailcraft.java @@ -16,6 +16,7 @@ import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; +import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; @@ -2045,22 +2046,6 @@ public void loadRecipes() { CustomItemList.MoldBoots.get(0L)) .itemOutputs(getModItem(Railcraft.ID, "armor.steel.boots", 1, 0, missing)).duration(30 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(alloySmelterRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - getModItem(Railcraft.ID, "firestone.cut", 1, 0, missing), - getModItem(Minecraft.ID, "redstone_block", 2, 0, missing), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Railcraft.ID, "firestone.refined", 1, 5000, missing)) - .fluidInputs(FluidRegistry.getFluidStack("lava", 576)).duration(10 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - getModItem(Railcraft.ID, "firestone.cracked", 1, wildcard, missing), - getModItem(Minecraft.ID, "redstone_block", 2, 0, missing), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Railcraft.ID, "firestone.refined", 1, 5000, missing)) - .fluidInputs(FluidRegistry.getFluidStack("lava", 576)).duration(10 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(Minecraft.ID, "minecart", 1, 0, missing), @@ -2131,6 +2116,24 @@ public void loadRecipes() { GTUtility.getIntegratedCircuit(1)) .itemOutputs(getModItem(Railcraft.ID, "tool.surveyor", 1, 0, missing)).duration(15 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(Railcraft.ID, "firestone.cut", 1, 0, missing), + getModItem(Minecraft.ID, "redstone_block", 16, 0, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Railcraft.ID, "firestone.refined", 1, 5000, missing)) + .fluidInputs(FluidRegistry.getFluidStack("lava", 16000)).duration(10 * MINUTES).eut(TierEU.RECIPE_MV) + .specialValue(1200).addTo(blastFurnaceRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(Railcraft.ID, "firestone.cracked", 1, 0, missing), + getModItem(Minecraft.ID, "redstone_block", 16, 0, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Railcraft.ID, "firestone.refined", 1, 5000, missing)) + .fluidInputs(FluidRegistry.getFluidStack("lava", 8000)).duration(5 * MINUTES).eut(TierEU.RECIPE_MV) + .specialValue(1200).addTo(blastFurnaceRecipes); + GTValues.RA.stdBuilder().itemInputs(getModItem(Railcraft.ID, "cube", 1, 8, missing)) .itemOutputs(getModItem(Railcraft.ID, "slab", 4, 38, missing)) .fluidInputs(FluidRegistry.getFluidStack("water", 4)).duration(10 * SECONDS).eut(TierEU.RECIPE_LV) @@ -2158,8 +2161,15 @@ public void loadRecipes() { .itemInputs( GTUtility.copyAmount(0L, GTOreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1L)), getModItem(Railcraft.ID, "firestone.raw", 1, 0, missing)) + .itemOutputs(getModItem(Railcraft.ID, "firestone.cut", 1, 0, missing)).duration(8 * MINUTES) + .eut(TierEU.RECIPE_LV).addTo(laserEngraverRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.copyAmount(0L, GTOreDictUnificator.get(OrePrefixes.lens, Materials.Firestone, 1L)), + getModItem(Railcraft.ID, "firestone.raw", 1, 0, missing)) .itemOutputs(getModItem(Railcraft.ID, "firestone.cut", 1, 0, missing)).duration(2 * MINUTES) - .eut(TierEU.RECIPE_HV).addTo(laserEngraverRecipes); + .eut(TierEU.RECIPE_LV).addTo(laserEngraverRecipes); TCHelper.removeArcaneRecipe(getModItem(Railcraft.ID, "tool.crowbar.magic", 1, 0, missing)); TCHelper.removeArcaneRecipe(getModItem(Railcraft.ID, "tool.crowbar.void", 1, 0, missing)); diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumicBases.java b/src/main/java/com/dreammaster/scripts/ScriptThaumicBases.java index 8c3d1a841..9e90a27ff 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptThaumicBases.java +++ b/src/main/java/com/dreammaster/scripts/ScriptThaumicBases.java @@ -33,7 +33,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; -import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -664,7 +664,7 @@ public void loadRecipes() { 5, new AspectList().add(Aspect.getAspect("iter"), 32).add(Aspect.getAspect("vinculum"), 32) .add(Aspect.getAspect("desidia"), 16).add(Aspect.getAspect("sensus"), 16), - new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1), + GregtechItemList.DoubleCompressedObsidian.get(1), new ItemStack[] { getModItem(IndustrialCraft2.ID, "itemDensePlates", 1, 8, missing), getModItem(CarpentersBlocks.ID, "itemCarpentersBed", 1, 0, missing), GTOreDictUnificator.get(OrePrefixes.gemFlawless, Materials.Diamond, 1L), @@ -1137,11 +1137,11 @@ public void loadRecipes() { getModItem(Thaumcraft.ID, "blockMetalDevice", 1, 12, missing), new ItemStack[] { getModItem(Thaumcraft.ID, "FocusPrimal", 1, 0, missing), getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing), - new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1), + GregtechItemList.DoubleCompressedObsidian.get(1), getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing), - new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1), + GregtechItemList.DoubleCompressedObsidian.get(1), getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing), - new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1), + GregtechItemList.DoubleCompressedObsidian.get(1), getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing), }); ThaumcraftApi.addInfusionCraftingRecipe( "TB.NodeFoci.Efficiency", diff --git a/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java b/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java index 6347f5d5d..9f4aaa510 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java +++ b/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java @@ -4,6 +4,7 @@ import static com.dreammaster.scripts.GameRegistryProxy.shapelessRecipes; import static com.dreammaster.tinkersConstruct.SmelteryFluidTypes.getMoltenPatternFluidTypeName; import static gregtech.api.enums.Mods.Backpack; +import static gregtech.api.enums.Mods.BiomesOPlenty; import static gregtech.api.enums.Mods.BloodArsenal; import static gregtech.api.enums.Mods.BuildCraftCore; import static gregtech.api.enums.Mods.ElectroMagicTools; @@ -2468,6 +2469,12 @@ public void loadRecipes() { ItemList.Shape_Mold_Ingot.get(0L)) .itemOutputs(getModItem(TinkerConstruct.ID, "materials", 1, 37, missing)).duration(10 * SECONDS).eut(16) .addTo(alloySmelterRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(TinkerConstruct.ID, "slime.gel", 1, 0, missing), + getModItem(BiomesOPlenty.ID, "mud", 1, 1, missing)) + .itemOutputs(getModItem(TinkerConstruct.ID, "CraftedSoil", 1, 5, missing)).duration(10 * SECONDS).eut(2) + .addTo(alloySmelterRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(ForgeMicroblocks.ID, "stoneRod", 7, 0, missing), @@ -2493,6 +2500,9 @@ public void loadRecipes() { GTUtility.getIntegratedCircuit(16)) .itemOutputs(getModItem(TinkerConstruct.ID, "jerky", 1, 3, missing)).eut(30).duration(2 * MINUTES) .addTo(chemicalDehydratorRecipes); + GTValues.RA.stdBuilder().itemInputs(NHItemList.SnowQueenBlood.getIS(16), GTUtility.getIntegratedCircuit(16)) + .itemOutputs(getModItem(TinkerConstruct.ID, "strangeFood", 16, 1, missing)).eut(30) + .duration(2 * MINUTES).addTo(chemicalDehydratorRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(Thaumcraft.ID, "ItemZombieBrain", 1, 0, missing), diff --git a/src/main/java/com/dreammaster/scripts/ScriptTwilightForest.java b/src/main/java/com/dreammaster/scripts/ScriptTwilightForest.java index e75ccfc43..81bfe3e17 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptTwilightForest.java +++ b/src/main/java/com/dreammaster/scripts/ScriptTwilightForest.java @@ -3,11 +3,13 @@ import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.TwilightForest; +import static gregtech.api.enums.Mods.ZTones; import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.mixerNonCellRecipes; import java.util.Arrays; import java.util.List; @@ -15,10 +17,13 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import com.dreammaster.item.NHItemList; + import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GTOreDictUnificator; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; @@ -204,6 +209,12 @@ public void loadRecipes() { .itemOutputs(getModItem(TwilightForest.ID, "item.carminite", 1, 0, missing)) .duration(1 * MINUTES + 15 * SECONDS).eut(4096).addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(ZTones.ID, "auroraBlock", 1, 0, missing), NHItemList.StonePlate.getIS(16)) + .itemOutputs(getModItem(TwilightForest.ID, "tile.TFAuroraBrick", 16, 0, missing)) + .fluidInputs(Materials.Helium_3.getGas(1600), Materials.Helium.getGas(16000)).duration(3 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(mixerNonCellRecipes); + ThaumcraftApi.registerObjectTag( getModItem(TwilightForest.ID, "tile.TFRoots", 1, 0, missing), new AspectList().add(Aspect.getAspect("arbor"), 2)); diff --git a/src/main/java/com/dreammaster/scripts/ScriptWitchery.java b/src/main/java/com/dreammaster/scripts/ScriptWitchery.java index f4feee04c..22c9f6d23 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptWitchery.java +++ b/src/main/java/com/dreammaster/scripts/ScriptWitchery.java @@ -265,8 +265,8 @@ public void loadRecipes() { .fluidInputs(FluidRegistry.getFluidStack("lubricant", 8)).duration(2 * SECONDS + 10 * TICKS).eut(24) .addTo(cutterRecipes); GTValues.RA.stdBuilder() - .itemInputs(getModItem(Minecraft.ID, "clay_ball", 4, 0, missing), ItemList.Shape_Mold_Bottle.get(0L)) - .itemOutputs(getModItem(Witchery.ID, "ingredient", 4, 26, missing)).duration(20 * SECONDS).eut(30) + .itemInputs(getModItem(Minecraft.ID, "clay_ball", 1, 0, missing), ItemList.Shape_Mold_Bottle.get(0L)) + .itemOutputs(getModItem(Witchery.ID, "ingredient", 1, 26, missing)).duration(5 * SECONDS).eut(30) .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( diff --git a/src/main/resources/assets/dreamcraft/lang/en_US.lang b/src/main/resources/assets/dreamcraft/lang/en_US.lang index f8dd75b36..61a0a90be 100644 --- a/src/main/resources/assets/dreamcraft/lang/en_US.lang +++ b/src/main/resources/assets/dreamcraft/lang/en_US.lang @@ -973,6 +973,9 @@ TConstruct.research_page.YELLOWHEARTCANISTER.1=The Yellow Heart Canister which i tc.research_name.GREENHEART=Green Heart tc.research_text.GREENHEART=[TC] 30 Hearts are not enough. TConstruct.research_page.GREENHEART.1=The Miniature Green Heart is an item from Tinkers Construct. It can be made via Infusion. Its primary use is in crafting the Geen Heart Canister, but it can also be eaten to restore 30 life. +tc.research_name.UNDYINGTOTEM=Totem of Undying +tc.research_text.UNDYINGTOTEM=Revival of the future +TConstruct.research_page.UNDYINGTOTEM.1=What is better than having strong health? Reviving from death itself. If the player is holding a totem of undying in their off-hand or main-hand slot and receives otherwise fatal damage, the totem saves the player from death. The totem of undying must be in the player's hand for it to work—it does not work if it is in the hotbar, unless selected. Any mob that can hold a totem of undying, can use it while holding it. The totem can be used only once, it disappears after use. When activated, the totem of undying restores 1♥, removes all existing status effects, then grants 45 seconds of Regeneration II, 40 seconds of Fire Resistance I and 5 seconds of Absorption II. tc.research_name.GREENHEARTCANISTER=Green Heart Canister tc.research_text.GREENHEARTCANISTER=[TC] Bound in a big box. TConstruct.research_page.GREENHEARTCANISTER.1=The Green Heart Canister which increases the amount of hearts that the player has. To have an effect the canisters must be equipped in the Armor Tab, in the slot on the right with the symbol that looks like the green heart canister. Up to 10 can be stacked in this slot to allow for a total of 10 extra hearts (or 20 extra health points). These will not appear above the regular health bar like from the Absorption effect, instead once the health bar is full with yellow hearts and will gradually be replaced by green hearts.