diff --git a/CHANGELOG-2.1.1.0.md b/CHANGELOG-2.1.1.0.md deleted file mode 100644 index 40f930d..0000000 --- a/CHANGELOG-2.1.1.0.md +++ /dev/null @@ -1,29 +0,0 @@ - -# Crops-plus-plus - -Changelog of Crops-plus-plus. - - -### [#23 Typo fix](https://github.com/GTNewHorizons/Crops-plus-plus/pull/23) -**Merge pull request #23 from Prometheus0000/name** -* Typo fix - -[a266e53b5056f3b](https://github.com/GTNewHorizons/Crops-plus-plus/commit/a266e53b5056f3b) -by Martin Robertz *2021-05-09 08:05:04* -### [#24 Fix build script and update ignore file](https://github.com/GTNewHorizons/Crops-plus-plus/pull/24) -**Merge pull request #24 from Prometheus0000/build_fix** -* Fix build script and update ignore file - -[55ff6e634f1d562](https://github.com/GTNewHorizons/Crops-plus-plus/commit/55ff6e634f1d562) -by Martin Robertz *2021-05-09 18:07:09* -### No issue -**bump version** - -[7d96470a10c57e4](https://github.com/GTNewHorizons/Crops-plus-plus/commit/7d96470a10c57e4) -by DreamMasterXXL *2021-05-16 09:23:46* - -**Fix build script and update ignore file** - -[58f452b49f92412](https://github.com/GTNewHorizons/Crops-plus-plus/commit/58f452b49f92412) -by Prometheus0000 *2021-05-09 17:15:41* - diff --git a/dependencies.gradle b/dependencies.gradle index 266da79..dc510d6 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,7 +4,7 @@ dependencies { api("com.github.GTNewHorizons:CropLoadCore:0.1.10:dev") api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") - devOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.91:dev") + devOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.96:dev") compileOnly(deobf("https://media.forgecdn.net/files/2499/612/BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar")) compileOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") { transitive = false @@ -13,7 +13,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:Natura:2.5.7:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.41:dev") { + compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.43:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Galacticraft:3.0.74-GTNH:dev") { @@ -26,6 +26,6 @@ dependencies { //runtimeOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") //runtimeOnly("com.github.GTNewHorizons:TinkersConstruct:1.10.12-GTNH:dev") //runtimeOnly("com.github.GTNewHorizons:Natura:2.5.7:dev") - //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.41:dev") + //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.43:dev") //runtimeOnly("com.github.GTNewHorizons:Galacticraft:3.0.74-GTNH:dev") } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/CCropUtility.java b/src/main/java/com/github/bartimaeusnek/cropspp/CCropUtility.java index 5b857ae..1359b79 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/CCropUtility.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/CCropUtility.java @@ -43,26 +43,25 @@ public static boolean isRainingOn(ICropTile crop) { return false; } - // If somthing goin on - if (world.isRaining()) { - BiomeGenBase biomegenbase = world.getBiomeGenForCoords(cord.posX, cord.posZ); + if (!world.isRaining()) { + return false; + } - if (biomegenbase == null) { - return false; - } + // If somthing goin on + BiomeGenBase biomegenbase = world.getBiomeGenForCoords(cord.posX, cord.posZ); - // No rain - if (!biomegenbase.canSpawnLightningBolt()) { - return false; - } + if (biomegenbase == null) { + return false; + } - // Is raining on block - if (world.canBlockSeeTheSky(cord.posX, cord.posY + 1, cord.posZ)) { - return true; - } + // No rain + if (!biomegenbase.canSpawnLightningBolt()) { + return false; } - return false; + // Is raining on block + return world.canBlockSeeTheSky(cord.posX, cord.posY + 1, cord.posZ); + } public static void damageEntity(Entity ent, float damage) { diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/Cropspp.java b/src/main/java/com/github/bartimaeusnek/cropspp/Cropspp.java index 55c4ba9..fca5c27 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/Cropspp.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/Cropspp.java @@ -3,7 +3,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; import com.github.bartimaeusnek.cropspp.GTHandler.CropItemList; import com.github.bartimaeusnek.cropspp.GTHandler.GTHandler; import com.github.bartimaeusnek.cropspp.GTHandler.machines.CropGeneExtractor; @@ -51,109 +50,90 @@ public final class Cropspp { @EventHandler public void preInit(FMLPreInitializationEvent preinit) { CropLoader.load(preinit); - if (ModsLoaded.GT) { - new CropWeedPicker(12528, "Basic CropWeedPicker", "Basic CropWeedPicker", 1); - CropItemList.cropGeneExtractorLV.set( - new CropGeneExtractor(12501, "Basic Crop Gene Extractor", "Basic Crop Gene Extractor", 1) - .getStackForm(1L)); - CropItemList.cropGeneExtractorMV.set( - new CropGeneExtractor(12502, "Advanced Crop Gene Extractor I", "Advanced Crop Gene Extractor I", 2) - .getStackForm(1L)); - CropItemList.cropGeneExtractorHV.set( - new CropGeneExtractor( - 12503, - "Advanced Crop Gene Extractor II", - "Advanced Crop Gene Extractor II", - 3).getStackForm(1L)); - CropItemList.cropGeneExtractorEV.set( - new CropGeneExtractor( - 12504, - "Advanced Crop Gene Extractor III", - "Advanced Crop Gene Extractor III", - 4).getStackForm(1L)); - CropItemList.cropGeneExtractorIV.set( - new CropGeneExtractor( - 12505, - "Advanced Crop Gene Extractor IV", - "Advanced Crop Gene Extractor IV", - 5).getStackForm(1L)); - CropItemList.cropGeneExtractorLuV.set( - new CropGeneExtractor(12506, "Advanced Crop Gene Extractor V", "Advanced Crop Gene Extractor V", 6) - .getStackForm(1L)); - CropItemList.cropGeneExtractorZPM.set( - new CropGeneExtractor( - 12507, - "Advanced Crop Gene Extractor VI", - "Advanced Crop Gene Extractor VI", - 7).getStackForm(1L)); - CropItemList.cropGeneExtractorUV.set( - new CropGeneExtractor( - 12508, - "Advanced Crop Gene Extractor VII", - "Advanced Crop Gene Extractor VII", - 8).getStackForm(1L)); - if (ModsLoaded.dreamcraft) CropItemList.cropGeneExtractorUHV.set( - new CropGeneExtractor( - 12509, - "Advanced Crop Gene Extractor IIX", - "Advanced Crop Gene Extractor IIX", - 9).getStackForm(1L)); + new CropWeedPicker(12528, "Basic CropWeedPicker", "Basic CropWeedPicker", 1); + CropItemList.cropGeneExtractorLV.set( + new CropGeneExtractor(12501, "Basic Crop Gene Extractor", "Basic Crop Gene Extractor", 1) + .getStackForm(1L)); + CropItemList.cropGeneExtractorMV.set( + new CropGeneExtractor(12502, "Advanced Crop Gene Extractor I", "Advanced Crop Gene Extractor I", 2) + .getStackForm(1L)); + CropItemList.cropGeneExtractorHV.set( + new CropGeneExtractor(12503, "Advanced Crop Gene Extractor II", "Advanced Crop Gene Extractor II", 3) + .getStackForm(1L)); + CropItemList.cropGeneExtractorEV.set( + new CropGeneExtractor(12504, "Advanced Crop Gene Extractor III", "Advanced Crop Gene Extractor III", 4) + .getStackForm(1L)); + CropItemList.cropGeneExtractorIV.set( + new CropGeneExtractor(12505, "Advanced Crop Gene Extractor IV", "Advanced Crop Gene Extractor IV", 5) + .getStackForm(1L)); + CropItemList.cropGeneExtractorLuV.set( + new CropGeneExtractor(12506, "Advanced Crop Gene Extractor V", "Advanced Crop Gene Extractor V", 6) + .getStackForm(1L)); + CropItemList.cropGeneExtractorZPM.set( + new CropGeneExtractor(12507, "Advanced Crop Gene Extractor VI", "Advanced Crop Gene Extractor VI", 7) + .getStackForm(1L)); + CropItemList.cropGeneExtractorUV.set( + new CropGeneExtractor(12508, "Advanced Crop Gene Extractor VII", "Advanced Crop Gene Extractor VII", 8) + .getStackForm(1L)); + CropItemList.cropGeneExtractorUHV.set( + new CropGeneExtractor(12509, "Advanced Crop Gene Extractor IIX", "Advanced Crop Gene Extractor IIX", 9) + .getStackForm(1L)); - CropItemList.cropReplicatorLV.set( - new CropReplicator(12510, "Basic Crop Replicator", "Basic Crop Replicator", 1).getStackForm(1L)); - CropItemList.cropReplicatorMV.set( - new CropReplicator(12511, "Advanced Crop Replicator I", "Advanced Crop Replicator I", 2) - .getStackForm(1L)); - CropItemList.cropReplicatorHV.set( - new CropReplicator(12512, "Advanced Crop Replicator II", "Advanced Crop Replicator II", 3) - .getStackForm(1L)); - CropItemList.cropReplicatorEV.set( - new CropReplicator(12513, "Advanced Crop Replicator III", "Advanced Crop Replicator III", 4) - .getStackForm(1L)); - CropItemList.cropReplicatorIV.set( - new CropReplicator(12514, "Advanced Crop Replicator IV", "Advanced Crop Replicator IV", 5) - .getStackForm(1L)); - CropItemList.cropReplicatorLuV.set( - new CropReplicator(12515, "Advanced Crop Replicator V", "Advanced Crop Replicator V", 6) - .getStackForm(1L)); - CropItemList.cropReplicatorZPM.set( - new CropReplicator(12516, "Advanced Crop Replicator VI", "Advanced Crop Replicator VI", 7) - .getStackForm(1L)); - CropItemList.cropReplicatorUV.set( - new CropReplicator(12517, "Advanced Crop Replicator VII", "Advanced Crop Replicator VII", 8) - .getStackForm(1L)); - if (ModsLoaded.dreamcraft) CropItemList.cropReplicatorUHV.set( - new CropReplicator(12518, "Advanced Crop Replicator IIX", "Advanced Crop Replicator IIX", 9) - .getStackForm(1L)); + CropItemList.cropReplicatorLV + .set(new CropReplicator(12510, "Basic Crop Replicator", "Basic Crop Replicator", 1).getStackForm(1L)); + CropItemList.cropReplicatorMV.set( + new CropReplicator(12511, "Advanced Crop Replicator I", "Advanced Crop Replicator I", 2) + .getStackForm(1L)); + CropItemList.cropReplicatorHV.set( + new CropReplicator(12512, "Advanced Crop Replicator II", "Advanced Crop Replicator II", 3) + .getStackForm(1L)); + CropItemList.cropReplicatorEV.set( + new CropReplicator(12513, "Advanced Crop Replicator III", "Advanced Crop Replicator III", 4) + .getStackForm(1L)); + CropItemList.cropReplicatorIV.set( + new CropReplicator(12514, "Advanced Crop Replicator IV", "Advanced Crop Replicator IV", 5) + .getStackForm(1L)); + CropItemList.cropReplicatorLuV.set( + new CropReplicator(12515, "Advanced Crop Replicator V", "Advanced Crop Replicator V", 6) + .getStackForm(1L)); + CropItemList.cropReplicatorZPM.set( + new CropReplicator(12516, "Advanced Crop Replicator VI", "Advanced Crop Replicator VI", 7) + .getStackForm(1L)); + CropItemList.cropReplicatorUV.set( + new CropReplicator(12517, "Advanced Crop Replicator VII", "Advanced Crop Replicator VII", 8) + .getStackForm(1L)); + CropItemList.cropReplicatorUHV.set( + new CropReplicator(12518, "Advanced Crop Replicator IIX", "Advanced Crop Replicator IIX", 9) + .getStackForm(1L)); + + CropItemList.cropSynthesiserLV.set( + new CropSynthesiser(12519, "Basic Crop Synthesiser", "Basic Crop Synthesiser", 1).getStackForm(1L)); + CropItemList.cropSynthesiserMV.set( + new CropSynthesiser(12520, "Advanced Crop Synthesiser I", "Advanced Crop Synthesiser I", 2) + .getStackForm(1L)); + CropItemList.cropSynthesiserHV.set( + new CropSynthesiser(12521, "Advanced Crop Synthesiser II", "Advanced Crop Synthesiser II", 3) + .getStackForm(1L)); + CropItemList.cropSynthesiserEV.set( + new CropSynthesiser(12522, "Advanced Crop Synthesiser III", "Advanced Crop Synthesiser III", 4) + .getStackForm(1L)); + CropItemList.cropSynthesiserIV.set( + new CropSynthesiser(12523, "Advanced Crop Synthesiser IV", "Advanced Crop Synthesiser IV", 5) + .getStackForm(1L)); + CropItemList.cropSynthesiserLuV.set( + new CropSynthesiser(12524, "Advanced Crop Synthesiser V", "Advanced Crop Synthesiser V", 6) + .getStackForm(1L)); + CropItemList.cropSynthesiserZPM.set( + new CropSynthesiser(12525, "Advanced Crop Synthesiser VI", "Advanced Crop Synthesiser VI", 7) + .getStackForm(1L)); + CropItemList.cropSynthesiserUV.set( + new CropSynthesiser(12526, "Advanced Crop Synthesiser VII", "Advanced Crop Synthesiser VII", 8) + .getStackForm(1L)); + CropItemList.cropSynthesiserUHV.set( + new CropSynthesiser(12527, "Advanced Crop Synthesiser IIX", "Advanced Crop Synthesiser IIX", 9) + .getStackForm(1L)); + new CppFluids(); - CropItemList.cropSynthesiserLV.set( - new CropSynthesiser(12519, "Basic Crop Synthesiser", "Basic Crop Synthesiser", 1).getStackForm(1L)); - CropItemList.cropSynthesiserMV.set( - new CropSynthesiser(12520, "Advanced Crop Synthesiser I", "Advanced Crop Synthesiser I", 2) - .getStackForm(1L)); - CropItemList.cropSynthesiserHV.set( - new CropSynthesiser(12521, "Advanced Crop Synthesiser II", "Advanced Crop Synthesiser II", 3) - .getStackForm(1L)); - CropItemList.cropSynthesiserEV.set( - new CropSynthesiser(12522, "Advanced Crop Synthesiser III", "Advanced Crop Synthesiser III", 4) - .getStackForm(1L)); - CropItemList.cropSynthesiserIV.set( - new CropSynthesiser(12523, "Advanced Crop Synthesiser IV", "Advanced Crop Synthesiser IV", 5) - .getStackForm(1L)); - CropItemList.cropSynthesiserLuV.set( - new CropSynthesiser(12524, "Advanced Crop Synthesiser V", "Advanced Crop Synthesiser V", 6) - .getStackForm(1L)); - CropItemList.cropSynthesiserZPM.set( - new CropSynthesiser(12525, "Advanced Crop Synthesiser VI", "Advanced Crop Synthesiser VI", 7) - .getStackForm(1L)); - CropItemList.cropSynthesiserUV.set( - new CropSynthesiser(12526, "Advanced Crop Synthesiser VII", "Advanced Crop Synthesiser VII", 8) - .getStackForm(1L)); - if (ModsLoaded.dreamcraft) CropItemList.cropSynthesiserUHV.set( - new CropSynthesiser(12527, "Advanced Crop Synthesiser IIX", "Advanced Crop Synthesiser IIX", 9) - .getStackForm(1L)); - new CppFluids(); - } CppItems.register_Items(); CppItems.OreDictItems(); } @@ -168,10 +148,8 @@ public void init(FMLInitializationEvent init) { public void postInit(FMLPostInitializationEvent postinit) { CropLoader.register(); CropLoader.registerBaseSeed(); - if (ModsLoaded.GT) { - final GTHandler GTHandler = new GTHandler(); - GTHandler.run(); - } + final GTHandler GTHandler = new GTHandler(); + GTHandler.run(); } @EventHandler diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTCraftingRecipeLoader.java b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTCraftingRecipeLoader.java index 709e928..ec1e1cd 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTCraftingRecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTCraftingRecipeLoader.java @@ -6,7 +6,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; import com.github.bartimaeusnek.cropspp.items.CppItems; import gregtech.api.enums.ItemList; @@ -88,7 +87,7 @@ public void run() { CropItemList.cropGeneExtractorZPM.get(1L), bitsd, new Object[] { "RTR", aTextWireHull, "CRC", 'M', ItemList.Hull_ZPM, 'T', ItemList.Emitter_ZPM, 'R', - ItemList.Sensor_ZPM, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', + ItemList.Sensor_ZPM, 'C', OrePrefixes.circuit.get(Materials.SuperconductorUHV), 'W', OrePrefixes.cableGt01.get(Materials.Naquadah) }); GT_ModHandler.addCraftingRecipe( CropItemList.cropGeneExtractorUV.get(1L), @@ -96,7 +95,7 @@ public void run() { new Object[] { "RTR", aTextWireHull, "CRC", 'M', ItemList.Hull_UV, 'T', ItemList.Emitter_UV, 'R', ItemList.Sensor_UV, 'C', OrePrefixes.circuit.get(Materials.Infinite), 'W', OrePrefixes.cableGt01.get(Materials.NaquadahAlloy) }); - if (ModsLoaded.dreamcraft) GT_ModHandler.addCraftingRecipe( + GT_ModHandler.addCraftingRecipe( CropItemList.cropGeneExtractorUHV.get(1L), bitsd, new Object[] { "RTR", aTextWireHull, "CRC", 'M', ItemList.Hull_MAX, 'T', ItemList.Emitter_UHV, 'R', @@ -148,7 +147,7 @@ public void run() { bitsd, new Object[] { "CFC", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_ZPM, 'F', ItemList.Field_Generator_ZPM, 'E', ItemList.Emitter_ZPM, 'C', - OrePrefixes.circuit.get(Materials.Superconductor), 'W', + OrePrefixes.circuit.get(Materials.SuperconductorUHV), 'W', OrePrefixes.cableGt04.get(Materials.Naquadah) }); GT_ModHandler.addCraftingRecipe( CropItemList.cropReplicatorUV.get(1L), @@ -157,7 +156,7 @@ public void run() { ItemList.Field_Generator_UV, 'E', ItemList.Emitter_UV, 'C', OrePrefixes.circuit.get(Materials.Infinite), 'W', OrePrefixes.cableGt04.get(Materials.NaquadahAlloy) }); - if (ModsLoaded.dreamcraft) GT_ModHandler.addCraftingRecipe( + GT_ModHandler.addCraftingRecipe( CropItemList.cropReplicatorUHV.get(1L), bitsd, new Object[] { "CFC", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_MAX, 'F', @@ -205,7 +204,7 @@ public void run() { CropItemList.cropSynthesiserZPM.get(1L), bitsd, new Object[] { "FCF", aTextCableHull, "EEE", 'M', ItemList.Hull_ZPM, 'F', ItemList.Field_Generator_ZPM, - 'E', ItemList.Emitter_ZPM, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', + 'E', ItemList.Emitter_ZPM, 'C', OrePrefixes.circuit.get(Materials.SuperconductorUHV), 'W', OrePrefixes.cableGt04.get(Materials.Naquadah) }); GT_ModHandler.addCraftingRecipe( CropItemList.cropSynthesiserUV.get(1L), @@ -213,7 +212,7 @@ public void run() { new Object[] { "FCF", aTextCableHull, "EEE", 'M', ItemList.Hull_UV, 'F', ItemList.Field_Generator_UV, 'E', ItemList.Emitter_UV, 'C', OrePrefixes.circuit.get(Materials.Infinite), 'W', OrePrefixes.cableGt04.get(Materials.NaquadahAlloy) }); - if (ModsLoaded.dreamcraft) GT_ModHandler.addCraftingRecipe( + GT_ModHandler.addCraftingRecipe( CropItemList.cropSynthesiserUHV.get(1L), bitsd, new Object[] { "FCF", aTextCableHull, "EEE", 'M', ItemList.Hull_MAX, 'F', ItemList.Field_Generator_UHV, diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTHandler.java b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTHandler.java index 1c7f2f3..51b87bc 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTHandler.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTHandler.java @@ -1,7 +1,5 @@ package com.github.bartimaeusnek.cropspp.GTHandler; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; - public class GTHandler implements Runnable { private static Runnable MachineReps; @@ -9,8 +7,7 @@ public class GTHandler implements Runnable { public GTHandler() { super(); - if (ModsLoaded.dreamcraft) MachineReps = new GTNHMachineRecipeLoader(); - else MachineReps = new GTVanillaMachineRecipeLoader(); + MachineReps = new GTNHMachineRecipeLoader(); CraftingReps = new GTCraftingRecipeLoader(); } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTNHMachineRecipeLoader.java b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTNHMachineRecipeLoader.java index 32dba3b..3c566fb 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTNHMachineRecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTNHMachineRecipeLoader.java @@ -1,5 +1,29 @@ package com.github.bartimaeusnek.cropspp.GTHandler; +import static gregtech.api.enums.Mods.Avaritia; +import static gregtech.api.enums.Mods.BiomesOPlenty; +import static gregtech.api.enums.Mods.GalacticraftCore; +import static gregtech.api.enums.Mods.Natura; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.recipe.RecipeMaps.brewingRecipes; +import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; +import static gregtech.api.recipe.RecipeMaps.chemicalReactorRecipes; +import static gregtech.api.recipe.RecipeMaps.compressorRecipes; +import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes; +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.fluidCannerRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; +import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; +import static gregtech.api.recipe.RecipeMaps.mixerRecipes; +import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; +import static gregtech.api.util.GT_RecipeBuilder.HOURS; +import static gregtech.api.util.GT_RecipeBuilder.MINUTES; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeBuilder.TICKS; + import java.util.Locale; import net.minecraft.init.Blocks; @@ -9,22 +33,22 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; import com.github.bartimaeusnek.croploadcore.OreDict; import com.github.bartimaeusnek.cropspp.fluids.CppFluids; import com.github.bartimaeusnek.cropspp.items.CppItems; import com.github.bartimaeusnek.cropspp.items.CppPotions; -import cpw.mods.fml.common.Loader; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; +import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import ic2.api.item.IC2Items; import ic2.core.Ic2Items; public class GTNHMachineRecipeLoader implements Runnable { @@ -37,924 +61,666 @@ public GTNHMachineRecipeLoader() { public final void run() { // Space Modifier = Space Plant (Tier13, Naquadah plant +1 tier) - // Magic Modifier = Primordial Pearl, + // Magic Modifier = Primordial Pear, // StonePlant - GT_Values.RA.addCompressorRecipe(Materials.Marble.getDust(9), Materials.Marble.getBlocks(1), 300, 2); // Materials.Marble.getPlates(1), - // 300, - // 2); - GT_Values.RA.addCompressorRecipe(Materials.GraniteRed.getDust(1), Materials.GraniteRed.getPlates(1), 300, 2); - GT_Values.RA - .addCompressorRecipe(Materials.GraniteBlack.getDust(1), Materials.GraniteBlack.getPlates(1), 300, 2); - GT_Values.RA.addCompressorRecipe(Materials.Stone.getPlates(9), new ItemStack(Blocks.stone), 300, 2); - // GT_Values.RA.addCompressorRecipe(Materials.Marble.getPlates(9), Materials.Marble.getBlocks(1),300,2); - GT_Values.RA.addCompressorRecipe( - Materials.GraniteRed.getPlates(9), - new ItemStack(GregTech_API.sBlockGranites, 1, 8), - 300, - 2); - GT_Values.RA.addCompressorRecipe( - Materials.GraniteBlack.getPlates(9), - new ItemStack(GregTech_API.sBlockGranites), - 300, - 2); + GT_Values.RA.stdBuilder().itemInputs(Materials.Marble.getDust(9)).itemOutputs(Materials.Marble.getBlocks(1)) + .duration(15 * SECONDS).eut(2).addTo(compressorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(Materials.GraniteRed.getDust(1)) + .itemOutputs(Materials.GraniteRed.getPlates(1)).duration(15 * SECONDS).eut(2).addTo(compressorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(Materials.GraniteBlack.getDust(1)) + .itemOutputs(Materials.GraniteBlack.getPlates(1)).duration(15 * SECONDS).eut(2) + .addTo(compressorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Stone.getPlates(9)).itemOutputs(new ItemStack(Blocks.stone)) + .duration(15 * SECONDS).eut(2).addTo(compressorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(Materials.GraniteRed.getPlates(9)) + .itemOutputs(new ItemStack(GregTech_API.sBlockGranites, 1, 8)).duration(15 * SECONDS).eut(2) + .addTo(compressorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(Materials.GraniteBlack.getPlates(9)) + .itemOutputs(new ItemStack(GregTech_API.sBlockGranites)).duration(15 * SECONDS).eut(2) + .addTo(compressorRecipes); // honey related - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(9), - GT_Values.NI, - new FluidStack(FluidRegistry.getFluid("for.honey"), 1000), - GT_Values.NF, - new ItemStack(Items.sugar, 9, 0), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - new int[] { 10000 }, - 1020, - 8, - false); - if (ModsLoaded.BoP) { - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(9), - GT_Values.NI, - new FluidStack(FluidRegistry.getFluid("honey"), 1000), - GT_Values.NF, - new ItemStack(Items.sugar, 9, 0), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - new int[] { 10000 }, - 1020, - 8, - false); - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(1), - GT_Values.NI, - new FluidStack(FluidRegistry.getFluid("honey"), 1000), - new FluidStack(FluidRegistry.getFluid("for.honey"), 1000), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - new int[] {}, - 1020, - 8, - false); + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(new ItemStack(Items.sugar, 9, 0)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("for.honey"), 1000)).duration(51 * SECONDS).eut(8) + .addTo(centrifugeRecipes); + + if (BiomesOPlenty.isModLoaded()) { + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(new ItemStack(Items.sugar, 9, 0)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("honey"), 1000)).duration(51 * SECONDS).eut(8) + .addTo(centrifugeRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("honey"), 1000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("for.honey"), 1000)).duration(51 * SECONDS) + .eut(8).addTo(centrifugeRecipes); + } // Ethanol related - // GT_Values.RA.addFluidCannerRecipe(new - // ItemStack(IC2Items.getItem("mugBooze").getItem(),1,OreDictionary.WILDCARD_VALUE), - // IC2Items.getItem("mugEmpty"), GT_Values.NF,new FluidStack(FluidRegistry.getFluid("potion.rum"), 250)); for (int i = 0; i < CppPotions.textureNames.length; i++) { - GT_Values.RA.addFluidCannerRecipe( - new ItemStack(CppItems.CppPotions, 1, i), - new ItemStack(Items.glass_bottle), - GT_Values.NF, - new FluidStack( - FluidRegistry.getFluid("potion." + CppPotions.textureNames[i].toLowerCase(Locale.ENGLISH)), - 250)); - GT_Values.RA.addFluidCannerRecipe( - new ItemStack(Items.glass_bottle), - new ItemStack(CppItems.CppPotions, 1, i), - new FluidStack( - FluidRegistry.getFluid("potion." + CppPotions.textureNames[i].toLowerCase(Locale.ENGLISH)), - 250), - GT_Values.NF); + + GT_Values.RA.stdBuilder().itemInputs(new ItemStack(CppItems.CppPotions, 1, i)) + .itemOutputs(new ItemStack(Items.glass_bottle)) + .fluidOutputs( + new FluidStack( + FluidRegistry.getFluid( + "potion." + CppPotions.textureNames[i].toLowerCase(Locale.ENGLISH)), + 250)) + .duration(4 * TICKS).eut(1).addTo(fluidCannerRecipes); + + GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.glass_bottle)) + .itemOutputs(new ItemStack(CppItems.CppPotions, 1, i)) + .fluidInputs( + new FluidStack( + FluidRegistry.getFluid( + "potion." + CppPotions.textureNames[i].toLowerCase(Locale.ENGLISH)), + 250)) + .duration(4 * TICKS).eut(1).addTo(fluidCannerRecipes); + } - GT_Values.RA.addFermentingRecipe( - new FluidStack(CppFluids.Mash, 10), - new FluidStack(CppFluids.Wash, 8), - 1000, - false); - GT_Values.RA.addFermentingRecipe( - new FluidStack(CppFluids.Wash, 20), - new FluidStack(FluidRegistry.getFluid("potion.wine"), 8), - 1000, - false); - GT_Values.RA.addFermentingRecipe( - new FluidStack(FluidRegistry.getFluid("potion.wheatyjuice"), 10), - new FluidStack(CppFluids.FWheat, 8), - 1020, - false); - GT_Values.RA.addFermentingRecipe( - new FluidStack(FluidRegistry.getFluid("potion.reedwater"), 10), - new FluidStack(CppFluids.FReed, 8), - 1020, - false); - - GT_Values.RA.addDistillationTowerRecipe( - new FluidStack(FluidRegistry.getFluid("potion.rum"), 1000), - new FluidStack[] { Materials.Ethanol.getFluid(580L), Materials.Water.getFluid(420L) }, - new ItemStack(Items.sugar), - 80, - 180); - GT_Values.RA.addDistillationTowerRecipe( - new FluidStack(FluidRegistry.getFluid("potion.piratebrew"), 1000), - new FluidStack[] { Materials.Ethanol.getFluid(800L), Materials.Water.getFluid(200L) }, - GT_Values.NI, - 80, - 180); - GT_Values.RA.addDistillationTowerRecipe( - new FluidStack(FluidRegistry.getFluid("potion.beer"), 1000), - new FluidStack[] { Materials.Ethanol.getFluid(45L), Materials.Water.getFluid(955L) }, - IC2Items.getItem("fertilizer"), - 80, - 180); - GT_Values.RA.addDistillationTowerRecipe( - new FluidStack(FluidRegistry.getFluid("potion.darkbeer"), 1000), - new FluidStack[] { Materials.Ethanol.getFluid(75L), Materials.Water.getFluid(925L) }, - IC2Items.getItem("fertilizer"), - 80, - 180); - GT_Values.RA.addDistillationTowerRecipe( - new FluidStack(FluidRegistry.getFluid("potion.cider"), 1000), - new FluidStack[] { Materials.Ethanol.getFluid(100L), Materials.Water.getFluid(900L) }, - IC2Items.getItem("fertilizer"), - 80, - 180); - GT_Values.RA.addDistillationTowerRecipe( - new FluidStack(FluidRegistry.getFluid("potion.wine"), 1000), - new FluidStack[] { Materials.Ethanol.getFluid(120L), Materials.Water.getFluid(880L) }, - IC2Items.getItem("fertilizer"), - 80, - 180); - GT_Values.RA.addDistillationTowerRecipe( - new FluidStack(FluidRegistry.getFluid("potion.vodka"), 1000), - new FluidStack[] { Materials.Ethanol.getFluid(400L), Materials.Water.getFluid(600L) }, - GT_Values.NI, - 80, - 180); - GT_Values.RA.addDistillationTowerRecipe( - new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 1000), - new FluidStack[] { Materials.Ethanol.getFluid(160L), Materials.Water.getFluid(840L) }, - new ItemStack(Items.sugar, 8, 0), - 80, - 180); - GT_Values.RA.addDistillationTowerRecipe( - new FluidStack(CppFluids.Korn, 1000), - new FluidStack[] { Materials.Ethanol.getFluid(320L), Materials.Water.getFluid(680L) }, - GT_Values.NI, - 80, - 180); - GT_Values.RA.addDistillationTowerRecipe( - new FluidStack(CppFluids.DKorn, 1000), - new FluidStack[] { Materials.Ethanol.getFluid(380L), Materials.Water.getFluid(620L) }, - GT_Values.NI, - 80, - 180); - GT_Values.RA.addDistillationTowerRecipe( - new FluidStack(CppFluids.SWhine, 1000), - new FluidStack[] { Materials.Ethanol.getFluid(700L), Materials.Water.getFluid(300L) }, - GT_Values.NI, - 80, - 180); - GT_Values.RA.addDistillationTowerRecipe( - new FluidStack(CppFluids.GHP, 1000), - new FluidStack[] { Materials.Ethanol.getFluid(750L), Materials.Water.getFluid(250L) }, - GT_Values.NI, - 80, - 180); - GT_Values.RA.addDistillationTowerRecipe( - new FluidStack(CppFluids.jagi, 1000), - new FluidStack[] { Materials.Ethanol.getFluid(350L), Materials.Water.getFluid(650L) }, - GT_Values.NI, - 80, - 180); - GT_Values.RA.addDistillationTowerRecipe( - new FluidStack(CppFluids.njagi, 1000), - new FluidStack[] { Materials.Ethanol.getFluid(350L), Materials.Water.getFluid(650L) }, - GT_Values.NI, - 80, - 180); - - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(1), - new FluidStack(FluidRegistry.getFluid("potion.rum"), 100), - Materials.Ethanol.getFluid(50L), - 16, - 24, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(2), - new FluidStack(FluidRegistry.getFluid("potion.rum"), 100), - Materials.Water.getFluid(42L), - 16, - 24, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(1), - new FluidStack(FluidRegistry.getFluid("potion.vodka"), 100), - Materials.Ethanol.getFluid(35L), - 16, - 24, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(2), - new FluidStack(FluidRegistry.getFluid("potion.vodka"), 100), - Materials.Water.getFluid(60L), - 16, - 24, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(1), - new FluidStack(CppFluids.Korn, 100), - Materials.Ethanol.getFluid(25L), - 16, - 24, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(2), - new FluidStack(CppFluids.Korn, 100), - Materials.Water.getFluid(68L), - 16, - 24, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(1), - new FluidStack(CppFluids.DKorn, 100), - Materials.Ethanol.getFluid(30L), - 16, - 24, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(2), - new FluidStack(CppFluids.DKorn, 100), - Materials.Water.getFluid(62L), - 16, - 24, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(1), - new FluidStack(CppFluids.FWheat, 80), - new FluidStack(CppFluids.Korn, 1), - 22, - 24, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(2), - new FluidStack(CppFluids.FWheat, 95), - new FluidStack(CppFluids.DKorn, 1), - 24, - 24, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(3), - new FluidStack(CppFluids.FWheat, 100), - new FluidStack(FluidRegistry.getFluid("potion.vodka"), 1), - 28, - 64, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(4), - new FluidStack(CppFluids.FWheat, 200), - new FluidStack(FluidRegistry.getFluid("fermentedbiomass"), 3), - 28, - 64, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(5), - new FluidStack(CppFluids.FWheat, 1000), - Materials.Ethanol.getFluid(4L), - 220, - 120, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(1), - new FluidStack(CppFluids.FReed, 100), - new FluidStack(CppFluids.SWhine, 7), - 22, - 24, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(4), - new FluidStack(CppFluids.FReed, 200), - new FluidStack(FluidRegistry.getFluid("fermentedbiomass"), 4), - 24, - 24, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(5), - new FluidStack(CppFluids.FReed, 1000), - Materials.Ethanol.getFluid(5L), - 220, - 120, - false); - // GT_Values.RA.addDistilleryRecipe(GT_Utility.getIntegratedCircuit(1), new FluidStack(BppFluids.Mash,100), new - // FluidStack(FluidRegistry.getFluid("potion.wine"), 20), 22, 24, false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(4), - new FluidStack(CppFluids.Mash, 200), - new FluidStack(FluidRegistry.getFluid("biomass"), 4), - 24, - 24, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(1), - new FluidStack(CppFluids.Wash, 100), - new FluidStack(CppFluids.GHP, 6), - 22, - 24, - false); - GT_Values.RA.addDistilleryRecipe( - GT_Utility.getIntegratedCircuit(4), - new FluidStack(CppFluids.Wash, 100), - new FluidStack(FluidRegistry.getFluid("fermentedbiomass"), 14), - 24, - 24, - false); - - GT_Values.RA.addMixerRecipe( - new ItemStack(Items.sugar, 32, 0), - new ItemStack(Items.dye, 4, 1), - new ItemStack(Items.dye, 4, 11), - new ItemStack(Items.dye, 4, 2), - Materials.Water.getCells(4), - GT_Values.NI, - new FluidStack(CppFluids.GHP, 375), - new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 4375), - Materials.Empty.getCells(4), - 10, - 8); - GT_Values.RA.addMixerRecipe( - new ItemStack(Items.sugar, 8, 0), - new ItemStack(Items.dye, 1, 1), - new ItemStack(Items.dye, 1, 11), - new ItemStack(Items.dye, 1, 2), - Materials.Water.getCells(1), - GT_Values.NI, - new FluidStack(FluidRegistry.getFluid("potion.vodka"), 500), - new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 1500), - Materials.Empty.getCells(1), - 10, - 8); - GT_Values.RA.addMixerRecipe( - new ItemStack(Items.sugar, 8, 0), - new ItemStack(Items.dye, 1, 1), - new ItemStack(Items.dye, 1, 11), - new ItemStack(Items.dye, 1, 2), - Materials.Water.getCells(1), - GT_Values.NI, - new FluidStack(CppFluids.Korn, 1000), - new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 2000), - Materials.Empty.getCells(1), - 10, - 8); - GT_Values.RA.addMixerRecipe( - new ItemStack(Items.sugar, 8, 0), - new ItemStack(Items.dye, 1, 1), - new ItemStack(Items.dye, 1, 11), - new ItemStack(Items.dye, 1, 2), - Materials.Water.getCells(1), - GT_Values.NI, - new FluidStack(CppFluids.DKorn, 750), - new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 1750), - Materials.Empty.getCells(1), - 10, - 8); - GT_Values.RA.addMixerRecipe( - Materials.Water.getCells(1), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - Materials.Ethanol.getFluid(1000L), - new FluidStack(FluidRegistry.getFluid("potion.vodka"), 2500), - Materials.Empty.getCells(1), - 10, - 8); - // GT_Values.RA.addMixerRecipe(new ItemStack(Items.reeds,64),GT_Values.NI, GT_Values.NI, GT_Values.NI, - // GT_Values.NI, GT_Values.NI, Materials.Water.getFluid(1000L),new - // FluidStack(FluidRegistry.getFluid("potion.reedwater"),1000),GT_Values.NI, 1200,8); - GT_Values.RA.addMixerRecipe( - Materials.Water.getCells(1), - new ItemStack(Items.sugar), - GT_Values.NI, - GT_Values.NI, - new FluidStack(CppFluids.SWhine, 5000), - new FluidStack(FluidRegistry.getFluid("potion.rum"), 6000), - Materials.Empty.getCells(1), - 10, - 8); - GT_Values.RA.addMixerRecipe( - new ItemStack(Items.sugar, 8, 0), - OreDict.ISget("cropSpiceleaf"), - OreDict.ISget("cropGinger"), - new ItemStack(Items.dye, 1, 2), - Materials.Water.getCells(1), - GT_Values.NI, - new FluidStack(FluidRegistry.getFluid("potion.vodka"), 4000), - new FluidStack(CppFluids.njagi, 5000), - Materials.Empty.getCells(1), - 10, - 8); - - GT_Values.RA.addMixerRecipe( - ItemList.Crop_Drop_Chilly.get(1), - Materials.CosmicNeutronium.getDustTiny(1), - ItemList.Crop_Drop_Lemon.get(64), - ItemList.Crop_Drop_TeaLeaf.get(64), - CppItems.ModifierMagic.splitStack(8), - CppItems.ModifierSpace.splitStack(9), - new FluidStack(CppFluids.njagi, 50000), - new FluidStack(CppFluids.jagi, 250), - GT_Values.NI, - 1, - 30720); + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.Mash, 10)) + .fluidOutputs(new FluidStack(CppFluids.Wash, 8)).duration(50 * SECONDS).eut(2).addTo(fermentingRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.Wash, 20)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.wine"), 8)).duration(50 * SECONDS).eut(2) + .addTo(fermentingRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.wheatyjuice"), 10)) + .fluidOutputs(new FluidStack(CppFluids.FWheat, 8)).duration(51 * SECONDS).eut(2) + .addTo(fermentingRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.reedwater"), 10)) + .fluidOutputs(new FluidStack(CppFluids.FReed, 8)).duration(51 * SECONDS).eut(2) + .addTo(fermentingRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.rum"), 1000)) + .fluidOutputs(Materials.Ethanol.getFluid(580), Materials.Water.getFluid(420)).duration(4 * SECONDS) + .eut(180).addTo(distillationTowerRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.piratebrew"), 1000)) + .fluidOutputs(Materials.Ethanol.getFluid(800), Materials.Water.getFluid(200)).duration(4 * SECONDS) + .eut(180).addTo(distillationTowerRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.beer"), 1000)) + .fluidOutputs(Materials.Ethanol.getFluid(45), Materials.Water.getFluid(955)).duration(4 * SECONDS) + .eut(180).addTo(distillationTowerRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.darkbeer"), 1000)) + .fluidOutputs(Materials.Ethanol.getFluid(75), Materials.Water.getFluid(925)).duration(4 * SECONDS) + .eut(180).addTo(distillationTowerRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.cider"), 1000)) + .fluidOutputs(Materials.Ethanol.getFluid(100), Materials.Water.getFluid(900)).duration(4 * SECONDS) + .eut(180).addTo(distillationTowerRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.wine"), 1000)) + .fluidOutputs(Materials.Ethanol.getFluid(120), Materials.Water.getFluid(880)).duration(4 * SECONDS) + .eut(180).addTo(distillationTowerRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 1000)) + .fluidOutputs(Materials.Ethanol.getFluid(400), Materials.Water.getFluid(600)).duration(4 * SECONDS) + .eut(180).addTo(distillationTowerRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 1000)) + .fluidOutputs(Materials.Ethanol.getFluid(160), Materials.Water.getFluid(840)).duration(4 * SECONDS) + .eut(180).addTo(distillationTowerRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.Korn, 1000)) + .fluidOutputs(Materials.Ethanol.getFluid(320), Materials.Water.getFluid(680)).duration(4 * SECONDS) + .eut(180).addTo(distillationTowerRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.DKorn, 1000)) + .fluidOutputs(Materials.Ethanol.getFluid(380), Materials.Water.getFluid(620)).duration(4 * SECONDS) + .eut(180).addTo(distillationTowerRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.SWhine, 1000)) + .fluidOutputs(Materials.Ethanol.getFluid(700), Materials.Water.getFluid(300)).duration(4 * SECONDS) + .eut(180).addTo(distillationTowerRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.GHP, 1000)) + .fluidOutputs(Materials.Ethanol.getFluid(750), Materials.Water.getFluid(250)).duration(4 * SECONDS) + .eut(180).addTo(distillationTowerRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.jagi, 1000)) + .fluidOutputs(Materials.Ethanol.getFluid(350), Materials.Water.getFluid(650)).duration(4 * SECONDS) + .eut(180).addTo(distillationTowerRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.njagi, 1000)) + .fluidOutputs(Materials.Ethanol.getFluid(350), Materials.Water.getFluid(650)).duration(4 * SECONDS) + .eut(180).addTo(distillationTowerRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.rum"), 100)) + .fluidOutputs(Materials.Ethanol.getFluid(50)).duration(16 * TICKS).eut(24).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.rum"), 100)) + .fluidOutputs(Materials.Water.getFluid(42)).duration(16 * TICKS).eut(24).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 100)) + .fluidOutputs(Materials.Ethanol.getFluid(35)).duration(16 * TICKS).eut(24).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 100)) + .fluidOutputs(Materials.Water.getFluid(60)).duration(16 * TICKS).eut(24).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(new FluidStack(CppFluids.Korn, 100)).fluidOutputs(Materials.Ethanol.getFluid(25)) + .duration(16 * TICKS).eut(24).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)) + .fluidInputs(new FluidStack(CppFluids.Korn, 100)).fluidOutputs(Materials.Water.getFluid(68)) + .duration(16 * TICKS).eut(24).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(new FluidStack(CppFluids.DKorn, 100)).fluidOutputs(Materials.Ethanol.getFluid(30)) + .duration(16 * TICKS).eut(24).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)) + .fluidInputs(new FluidStack(CppFluids.DKorn, 100)).fluidOutputs(Materials.Water.getFluid(62)) + .duration(16 * TICKS).eut(24).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(new FluidStack(CppFluids.FWheat, 80)).fluidOutputs(new FluidStack(CppFluids.Korn, 1)) + .duration(1 * SECONDS + 2 * TICKS).eut(24).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)) + .fluidInputs(new FluidStack(CppFluids.FWheat, 95)).fluidOutputs(new FluidStack(CppFluids.DKorn, 1)) + .duration(1 * SECONDS + 4 * TICKS).eut(24).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(3)) + .fluidInputs(new FluidStack(CppFluids.FWheat, 100)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 1)) + .duration(1 * SECONDS + 8 * TICKS).eut(64).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)) + .fluidInputs(new FluidStack(CppFluids.FWheat, 200)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("fermentedbiomass"), 3)) + .duration(1 * SECONDS + 8 * TICKS).eut(64).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(5)) + .fluidInputs(new FluidStack(CppFluids.FWheat, 1000)).fluidOutputs(Materials.Ethanol.getFluid(4)) + .duration(11 * SECONDS).eut(TierEU.RECIPE_MV).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(new FluidStack(CppFluids.FReed, 100)).fluidOutputs(new FluidStack(CppFluids.SWhine, 7)) + .duration(1 * SECONDS + 2 * TICKS).eut(24).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)) + .fluidInputs(new FluidStack(CppFluids.FReed, 200)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("fermentedbiomass"), 4)) + .duration(1 * SECONDS + 4 * TICKS).eut(24).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(5)) + .fluidInputs(new FluidStack(CppFluids.FReed, 1000)).fluidOutputs(Materials.Ethanol.getFluid(5)) + .duration(11 * SECONDS).eut(TierEU.RECIPE_MV).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)) + .fluidInputs(new FluidStack(CppFluids.Mash, 200)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("biomass"), 4)).duration(1 * SECONDS + 4 * TICKS) + .eut(24).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(new FluidStack(CppFluids.Wash, 100)).fluidOutputs(new FluidStack(CppFluids.GHP, 6)) + .duration(1 * SECONDS + 2 * TICKS).eut(24).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)) + .fluidInputs(new FluidStack(CppFluids.Wash, 100)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("fermentedbiomass"), 14)) + .duration(1 * SECONDS + 4 * TICKS).eut(24).addTo(distilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Items.sugar, 32, 0), + new ItemStack(Items.dye, 4, 1), + new ItemStack(Items.dye, 4, 11), + new ItemStack(Items.dye, 4, 2), + Materials.Water.getCells(4)) + .itemOutputs(Materials.Empty.getCells(4)).fluidInputs(new FluidStack(CppFluids.GHP, 375)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 4375)).duration(10 * TICKS) + .eut(8).addTo(mixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Items.sugar, 8, 0), + new ItemStack(Items.dye, 1, 1), + new ItemStack(Items.dye, 1, 11), + new ItemStack(Items.dye, 1, 2), + Materials.Water.getCells(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 500)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 1500)).duration(10 * TICKS) + .eut(8).addTo(mixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Items.sugar, 8, 0), + new ItemStack(Items.dye, 1, 1), + new ItemStack(Items.dye, 1, 11), + new ItemStack(Items.dye, 1, 2), + Materials.Water.getCells(1)) + .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(new FluidStack(CppFluids.Korn, 1000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 2000)).duration(10 * TICKS) + .eut(8).addTo(mixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Items.sugar, 8, 0), + new ItemStack(Items.dye, 1, 1), + new ItemStack(Items.dye, 1, 11), + new ItemStack(Items.dye, 1, 2), + Materials.Water.getCells(1)) + .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(new FluidStack(CppFluids.DKorn, 750)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 1750)).duration(10 * TICKS) + .eut(8).addTo(mixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Items.sugar, 8, 0), + OreDict.ISget("cropSpiceleaf"), + OreDict.ISget("cropGinger"), + new ItemStack(Items.dye, 1, 2), + Materials.Water.getCells(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 4000)) + .fluidOutputs(new FluidStack(CppFluids.njagi, 5000)).duration(10 * TICKS).eut(8).addTo(mixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.Crop_Drop_Chilly.get(1), + Materials.CosmicNeutronium.getDustTiny(1), + ItemList.Crop_Drop_Lemon.get(64), + ItemList.Crop_Drop_TeaLeaf.get(64), + CppItems.ModifierMagic.splitStack(8), + CppItems.ModifierSpace.splitStack(9)) + .fluidInputs(new FluidStack(CppFluids.njagi, 50000)).fluidOutputs(new FluidStack(CppFluids.jagi, 250)) + .duration(1 * TICKS).eut(TierEU.RECIPE_LuV).addTo(mixerRecipes); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1)).itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Ethanol.getFluid(1000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 2500)).duration(10 * TICKS).eut(8) + .addTo(mixerRecipes); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1), new ItemStack(Items.sugar)) + .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(new FluidStack(CppFluids.SWhine, 5000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.rum"), 6000)).duration(10 * TICKS).eut(8) + .addTo(mixerRecipes); // Brewery - if (OreDictionary.getOres("listAllberry").size() >= 1) - for (int i = 0; i < OreDictionary.getOres("listAllberry").size(); i++) GT_Values.RA.addBrewingRecipe( - OreDictionary.getOres("listAllberry").get(i).splitStack(16), - Materials.Water.getFluid(1000L).getFluid(), - CppFluids.Mash, - false); - GT_Values.RA.addBrewingRecipe( - new ItemStack(Items.sugar, 8), - FluidRegistry.getFluid("potion.weakness"), - CppFluids.Mash, - false); - // GT_Values.RA.addBrewingRecipe(new ItemStack(BppItems.BppBerries,1,1), - // Materials.Water.getFluid(1000L).getFluid(), FluidRegistry.getFluid("potion.reedwater"), false); + for (ItemStack itemStack : OreDictionary.getOres("listAllberry")) { + GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16)).fluidInputs(Materials.Water.getFluid(750)) + .fluidOutputs(new FluidStack(CppFluids.Mash, 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) + .addTo(brewingRecipes); + + } + + GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.sugar, 8)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.weakness"), 750)) + .fluidOutputs(new FluidStack(CppFluids.Mash, 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) + .addTo(brewingRecipes); // Sugar Related - GT_Values.RA - .addExtractorRecipe(new ItemStack(CppItems.CppBerries, 1, 1), new ItemStack(Items.sugar, 8, 0), 160, 8); + + GT_Values.RA.stdBuilder().itemInputs(new ItemStack(CppItems.CppBerries, 1, 1)) + .itemOutputs(new ItemStack(Items.sugar, 8, 0)).duration(6 * SECONDS + 8 * TICKS).eut(4) + .addTo(extractorRecipes); // Dyes from Plants - for (int i = 0; i < OreDictionary.getOres("cropBlackberry").size(); i++) GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropBlackberry").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeblack"), 288), - new ItemStack(Items.sugar), - 600, - 48); - for (int i = 0; i < OreDictionary.getOres("cropBlueberry").size(); i++) GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropBlueberry").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeblue"), 288), - new ItemStack(Items.sugar), - 600, - 48); - for (int i = 0; i < OreDictionary.getOres("cropRaspberry").size(); i++) GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropRaspberry").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyepink"), 288), - new ItemStack(Items.sugar), - 600, - 48); - for (int i = 0; i < OreDictionary.getOres("cropVine").size(); i++) { - if (!OreDictionary.getOres("cropVine").get(i).getUnlocalizedName().equals("tile.Thornvines")) - GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropVine").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyegreen"), 288), - GT_Values.NI, - 600, - 48); - else GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropVine").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeyellow"), 288), - GT_Values.NI, - 600, - 48); + for (ItemStack itemStack : OreDictionary.getOres("cropBlackberry")) { + GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeblack"), 288)) + .duration(30 * SECONDS).eut(48).addTo(chemicalReactorRecipes); + + } + for (ItemStack itemStack : OreDictionary.getOres("cropBlueberry")) { + GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeblue"), 288)) + .duration(30 * SECONDS).eut(48).addTo(chemicalReactorRecipes); + } - for (int i = 0; i < OreDictionary.getOres("cropCacti").size(); i++) GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropCacti").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyegreen"), 288), - GT_Values.NI, - 600, - 48); - for (int i = 0; i < OreDictionary.getOres("cropGooseberry").size(); i++) GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropGooseberry").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeyellow"), 288), - new ItemStack(Items.sugar), - 600, - 48); - for (int i = 0; i < OreDictionary.getOres("cropStrawberry").size(); i++) GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropStrawberry").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyered"), 288), - new ItemStack(Items.sugar), - 600, - 48); - - if (ModsLoaded.BoP) GT_Values.RA.addChemicalRecipe( - GT_ModHandler.getModItem("BiomesOPlenty", "food", 16L), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyered"), 288), - new ItemStack(Items.sugar), - 600, - 48); - - GT_Values.RA.addChemicalRecipe( - new ItemStack(CppItems.CppBerries, 16, 0), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyepurple"), 288), - new ItemStack(Items.sugar), - 600, - 48); - - if (ModsLoaded.Natura) { - GT_Values.RA.addChemicalRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 0), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelime"), 288), - new ItemStack(Items.sugar), - 600, - 48); - GT_Values.RA.addChemicalRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 1), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelightgray"), 288), - new ItemStack(Items.sugar), - 600, - 48); - GT_Values.RA.addChemicalRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 2), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelightblue"), 288), - new ItemStack(Items.sugar), - 600, - 48); - GT_Values.RA.addChemicalRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 3), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelime"), 288), - new ItemStack(Items.sugar), - 600, - 48); + for (ItemStack itemStack : OreDictionary.getOres("cropRaspberry")) { + GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyepink"), 288)) + .duration(30 * SECONDS).eut(48).addTo(chemicalReactorRecipes); + } + for (ItemStack itemStack : OreDictionary.getOres("cropVine")) { + if (!itemStack.getUnlocalizedName().equals("tile.Thornvines")) { + GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + .fluidInputs(Materials.SulfuricAcid.getFluid(432)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyegreen"), 288)) + .duration(30 * SECONDS).eut(48).addTo(chemicalReactorRecipes); + } else { + GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + .fluidInputs(Materials.SulfuricAcid.getFluid(432)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeyellow"), 288)) + .duration(30 * SECONDS).eut(48).addTo(chemicalReactorRecipes); + + } + } + for (ItemStack itemStack : OreDictionary.getOres("cropCacti")) { + GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + .fluidInputs(Materials.SulfuricAcid.getFluid(432)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyegreen"), 288)) + .duration(30 * SECONDS).eut(48).addTo(chemicalReactorRecipes); + + } + for (ItemStack itemStack : OreDictionary.getOres("cropGooseberry")) { + GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeyellow"), 288)) + .duration(30 * SECONDS).eut(48).addTo(chemicalReactorRecipes); + + } + for (ItemStack itemStack : OreDictionary.getOres("cropStrawberry")) { + GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyered"), 288)) + .duration(30 * SECONDS).eut(48).addTo(chemicalReactorRecipes); + + } + + if (BiomesOPlenty.isModLoaded()) { + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getModItem(BiomesOPlenty.ID, "food", 16), Materials.Salt.getDust(2)) + .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyered"), 288)) + .duration(30 * SECONDS).eut(48).addTo(chemicalReactorRecipes); + + } + + GT_Values.RA.stdBuilder().itemInputs(new ItemStack(CppItems.CppBerries, 16, 0), Materials.Salt.getDust(2)) + .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyepurple"), 288)) + .duration(30 * SECONDS).eut(48).addTo(chemicalReactorRecipes); + + if (Natura.isModLoaded()) { + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getModItem(Natura.ID, "berry.nether", 16, 0), Materials.Salt.getDust(2)) + .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelime"), 288)) + .duration(30 * SECONDS).eut(48).addTo(chemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getModItem(Natura.ID, "berry.nether", 16, 1), Materials.Salt.getDust(2)) + .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelightgray"), 288)) + .duration(30 * SECONDS).eut(48).addTo(chemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getModItem(Natura.ID, "berry.nether", 16, 2), Materials.Salt.getDust(2)) + .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelightblue"), 288)) + .duration(30 * SECONDS).eut(48).addTo(chemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getModItem(Natura.ID, "berry.nether", 16, 3), Materials.Salt.getDust(2)) + .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelime"), 288)) + .duration(30 * SECONDS).eut(48).addTo(chemicalReactorRecipes); + } // Goldfish - GT_Values.RA.addFluidExtractionRecipe( - CppItems.GoldfischS, - new ItemStack(Items.gold_nugget), - Materials.FishOil.getFluid(100L), - 1, - 16, - 8); - GT_Values.RA.addPulveriserRecipe( - CppItems.GoldfischS, - new ItemStack[] { Materials.MeatRaw.getDust(1), Materials.Gold.getDustTiny(1) }, - new int[] { 10000, 100 }, - 3, - 8, - false); + GT_Values.RA.stdBuilder().itemInputs(CppItems.GoldfischS).itemOutputs(new ItemStack(Items.gold_nugget)) + .outputChances(1).fluidOutputs(Materials.FishOil.getFluid(100)).duration(16 * TICKS).eut(8) + .addTo(fluidExtractionRecipes); + + GT_Values.RA.stdBuilder().itemInputs(CppItems.GoldfischS) + .itemOutputs(Materials.MeatRaw.getDust(1), Materials.Gold.getDustTiny(1)).outputChances(10000, 100) + .duration(3 * TICKS).eut(8).addTo(maceratorRecipes); // Space Modifier - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Iron.getDust(1), new ItemStack(CppItems.Modifier, 16, 0) }, - new FluidStack[] { Materials.UUMatter - .getFluid(Materials.MeteoricIron.getNeutrons() + Materials.MeteoricIron.getProtons()) }, - new FluidStack[] {}, - new ItemStack[] { Materials.MeteoricIron.getDust(1) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Steel.getDust(1), new ItemStack(CppItems.Modifier, 16, 0) }, - new FluidStack[] { Materials.UUMatter - .getFluid(Materials.MeteoricSteel.getNeutrons() + Materials.MeteoricSteel.getProtons()) }, - new FluidStack[] {}, - new ItemStack[] { Materials.MeteoricSteel.getDust(1) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Bismuth.getDust(1), new ItemStack(CppItems.Modifier, 16, 0) }, - new FluidStack[] { Materials.UUMatter - .getFluid(Materials.Oriharukon.getNeutrons() + Materials.Oriharukon.getProtons()) }, - new FluidStack[] {}, - new ItemStack[] { Materials.Oriharukon.getDust(1) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Titanium.getDust(1), new ItemStack(CppItems.Modifier, 16, 0) }, - new FluidStack[] { - Materials.UUMatter.getFluid(Materials.Desh.getNeutrons() + Materials.Desh.getProtons()) }, - new FluidStack[] {}, - new ItemStack[] { Materials.Desh.getDust(1) }, - 240, - 480); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Iron.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) + .itemOutputs(Materials.MeteoricIron.getDust(1)) + .fluidInputs( + Materials.UUMatter + .getFluid(Materials.MeteoricIron.getNeutrons() + Materials.MeteoricIron.getProtons())) + .duration(12 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Steel.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) + .itemOutputs(Materials.MeteoricSteel.getDust(1)) + .fluidInputs( + Materials.UUMatter + .getFluid(Materials.MeteoricSteel.getNeutrons() + Materials.MeteoricSteel.getProtons())) + .duration(12 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Bismuth.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) + .itemOutputs(Materials.Oriharukon.getDust(1)) + .fluidInputs( + Materials.UUMatter + .getFluid(Materials.Oriharukon.getNeutrons() + Materials.Oriharukon.getProtons())) + .duration(12 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Titanium.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) + .itemOutputs(Materials.Desh.getDust(1)) + .fluidInputs(Materials.UUMatter.getFluid(Materials.Desh.getNeutrons() + Materials.Desh.getProtons())) + .duration(12 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes); // Non-elements - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Ice.getDust(1), new ItemStack(CppItems.Modifier, 16, 0) }, - new FluidStack[] { Materials.UUMatter - .getFluid((Materials.Water.getProtons() + Materials.Water.getNeutrons()) * 10) }, - new FluidStack[] {}, - new ItemStack[] { Materials.CallistoIce.getDust(1) }, - 240, - 7680); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Lead.getDust(1), new ItemStack(CppItems.Modifier, 16, 0) }, - new FluidStack[] { Materials.UUMatter - .getFluid((Materials.Water.getProtons() + Materials.Water.getNeutrons()) * 10) }, - new FluidStack[] {}, - new ItemStack[] { Materials.Ledox.getDust(1) }, - 240, - 7680); - if (Loader.isModLoaded("Avaritia")) GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { GT_ModHandler.getModItem("Avaritia", "Resource", 1L, 1), - new ItemStack(CppItems.Modifier, 32, 0) }, - new FluidStack[] { Materials.UUMatter.getFluid(100L) }, - null, - new ItemStack[] { Materials.MysteriousCrystal.getDust(1) }, - 240, - 122880); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.MeteoricIron.getDust(1), new ItemStack(CppItems.Modifier, 64, 0) }, - new FluidStack[] { Materials.UUMatter - .getFluid((Materials.Neutronium.getNeutrons() + Materials.Neutronium.getProtons())) }, - new FluidStack[] {}, - new ItemStack[] { Materials.DeepIron.getDust(1) }, - 120, - 122880); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Plutonium241.getDust(1), new ItemStack(CppItems.Modifier, 64, 0) }, - new FluidStack[] { Materials.UUMatter - .getFluid((Materials.Neutronium.getNeutrons() + Materials.Neutronium.getProtons())) }, - new FluidStack[] {}, - new ItemStack[] { Materials.BlackPlutonium.getDust(1) }, - 120, - 500000); - - if (ModsLoaded.TC) { + + GT_Values.RA.stdBuilder().itemInputs(Materials.Ice.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) + .itemOutputs(Materials.CallistoIce.getDust(1)) + .fluidInputs( + Materials.UUMatter + .getFluid((Materials.Water.getProtons() + Materials.Water.getNeutrons()) * 10)) + .duration(12 * SECONDS).eut(TierEU.RECIPE_IV).addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Lead.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) + .itemOutputs(Materials.Ledox.getDust(1)) + .fluidInputs( + Materials.UUMatter + .getFluid((Materials.Water.getProtons() + Materials.Water.getNeutrons()) * 10)) + .duration(12 * SECONDS).eut(TierEU.RECIPE_IV).addTo(multiblockChemicalReactorRecipes); + + if (Mods.Avaritia.isModLoaded()) { + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem(Avaritia.ID, "Resource", 1, 1), + new ItemStack(CppItems.Modifier, 32, 0)) + .itemOutputs(Materials.MysteriousCrystal.getDust(1)).fluidInputs(Materials.UUMatter.getFluid(100)) + .duration(12 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(multiblockChemicalReactorRecipes); + + } + + GT_Values.RA.stdBuilder().itemInputs(Materials.MeteoricIron.getDust(1), new ItemStack(CppItems.Modifier, 64, 0)) + .itemOutputs(Materials.DeepIron.getDust(1)) + .fluidInputs( + Materials.UUMatter + .getFluid((Materials.Neutronium.getNeutrons() + Materials.Neutronium.getProtons()))) + .duration(6 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Plutonium241.getDust(1), new ItemStack(CppItems.Modifier, 64, 0)) + .itemOutputs(Materials.BlackPlutonium.getDust(1)) + .fluidInputs( + Materials.UUMatter + .getFluid((Materials.Neutronium.getNeutrons() + Materials.Neutronium.getProtons()))) + .duration(6 * SECONDS).eut(500000).addTo(multiblockChemicalReactorRecipes); + + if (Mods.Thaumcraft.isModLoaded()) { // Magic Modifier PrimP - GT_Values.RA.addExtractorRecipe( - GT_ModHandler.getModItem("Thaumcraft", "ItemEldritchObject", 1, 3), - new ItemStack(CppItems.Modifier, 8, 1), - 2000, - 128); - GT_Values.RA.addExtractorRecipe( - new ItemStack(CppItems.Modifier, 1, 1), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 16L, 14), - 2400, - 128); - if (!ModsLoaded.dreamcraft) GT_Values.RA.addAutoclaveRecipe( - new ItemStack(CppItems.Modifier, 16, 1), - Materials.UUMatter.getFluid(52L), - GT_ModHandler.getModItem("Thaumcraft", "ItemEldritchObject", 1, 3), - 10000, - 24000, - 384, - false); - else GT_Values.RA.addAutoclaveRecipe( - new ItemStack(CppItems.Modifier, 16, 1), - Materials.UUMatter.getFluid(52L), - com.dreammaster.item.ItemList.PrimordialPearlFragment.getIS().splitStack(3), - 10000, - 24000, - 384, - false); - GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 32L, 14), - Materials.UUMatter.getFluid(500L), - new ItemStack(CppItems.Modifier, 1, 1), - 3300, - 2400, - 120, - false); + + GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemEldritchObject", 1, 3)) + .itemOutputs(new ItemStack(CppItems.Modifier, 8, 1)).duration(6 * SECONDS + 8 * TICKS).eut(4) + .addTo(extractorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(new ItemStack(CppItems.Modifier, 1, 1)) + .itemOutputs(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 16, 14)) + .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(extractorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(new ItemStack(CppItems.Modifier, 16, 1)) + .itemOutputs(com.dreammaster.item.ItemList.PrimordialPearlFragment.getIS().splitStack(3)) + .fluidInputs(Materials.UUMatter.getFluid(52)).duration(20 * MINUTES).eut(384) + .addTo(RecipeMaps.autoclaveRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 32, 14)) + .itemOutputs(new ItemStack(CppItems.Modifier, 1, 1)).fluidInputs(Materials.UUMatter.getFluid(500)) + .duration(2 * MINUTES).eut(TierEU.RECIPE_MV).addTo(RecipeMaps.autoclaveRecipes); + // Magic Modifier - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Iron.getDust(1), new ItemStack(CppItems.Modifier, 1, 1) }, - new FluidStack[] { Materials.UUMatter - .getFluid(Materials.Thaumium.getNeutrons() + Materials.Thaumium.getProtons()) }, - new FluidStack[] {}, - new ItemStack[] { Materials.Thaumium.getDust(1) }, - 240, - 120); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Thaumium.getDust(1), new ItemStack(CppItems.Modifier, 1, 1) }, - new FluidStack[] { Materials.UUMatter - .getFluid(Materials.Arsenic.getNeutrons() + Materials.Arsenic.getProtons()) }, - new FluidStack[] {}, - new ItemStack[] { Materials.Void.getDust(1) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Void.getDust(1), new ItemStack(CppItems.Modifier, 2, 1) }, - new FluidStack[] { Materials.UUMatter - .getFluid(Materials.Indium.getNeutrons() + Materials.Indium.getProtons()) }, - new FluidStack[] {}, - new ItemStack[] { Materials.Shadow.getDust(1) }, - 240, - 7680); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Shadow.getDust(1), new ItemStack(CppItems.Modifier, 16, 1) }, - new FluidStack[] { Materials.UUMatter - .getFluid((Materials.Osmium.getNeutrons() + Materials.Osmium.getProtons()) * 1000) }, - new FluidStack[] {}, - new ItemStack[] { Materials.Ichorium.getIngots(1) }, - 1800, - 30720); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Iron.getDust(1), new ItemStack(CppItems.Modifier, 1, 1)) + .itemOutputs(Materials.Thaumium.getDust(1)) + .fluidInputs( + Materials.UUMatter + .getFluid(Materials.Thaumium.getNeutrons() + Materials.Thaumium.getProtons())) + .duration(12 * SECONDS).eut(TierEU.RECIPE_MV).addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Thaumium.getDust(1), new ItemStack(CppItems.Modifier, 1, 1)) + .itemOutputs(Materials.Void.getDust(1)) + .fluidInputs( + Materials.UUMatter + .getFluid(Materials.Arsenic.getNeutrons() + Materials.Arsenic.getProtons())) + .duration(12 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Void.getDust(1), new ItemStack(CppItems.Modifier, 2, 1)) + .itemOutputs(Materials.Shadow.getDust(1)) + .fluidInputs( + Materials.UUMatter.getFluid(Materials.Indium.getNeutrons() + Materials.Indium.getProtons())) + .duration(12 * SECONDS).eut(TierEU.RECIPE_IV).addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Shadow.getDust(1), new ItemStack(CppItems.Modifier, 16, 1)) + .itemOutputs(Materials.Ichorium.getIngots(1)) + .fluidInputs( + Materials.UUMatter + .getFluid((Materials.Osmium.getNeutrons() + Materials.Osmium.getProtons()) * 1000)) + .duration(1 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_LuV) + .addTo(multiblockChemicalReactorRecipes); + } // Magic Modifier + Space Modifier - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 16, 0), new ItemStack(CppItems.Modifier, 4, 1) }, - new FluidStack[] { Materials.Platinum.getMolten(288L), Materials.MeteoricIron.getMolten(144L), - Materials.UUMatter - .getFluid(Materials.Platinum.getProtons() + Materials.Platinum.getNeutrons()) }, - new FluidStack[] {}, - new ItemStack[] { Materials.Mytryl.getDust(1) }, - 1800, - 7680); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(CppItems.Modifier, 16, 0), new ItemStack(CppItems.Modifier, 4, 1)) + .itemOutputs(Materials.Mytryl.getDust(1)) + .fluidInputs( + Materials.Platinum.getMolten(288), + Materials.MeteoricIron.getMolten(144), + Materials.UUMatter.getFluid(Materials.Platinum.getProtons() + Materials.Platinum.getNeutrons())) + .duration(1 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_IV).addTo(multiblockChemicalReactorRecipes); + // coral buff - GT_Values.RA.addAutoclaveSpaceRecipe( - GT_ModHandler.getModItem("BiomesOPlenty", "coral1", 64L, 15), - Materials.UUMatter.getFluid(2L), - Materials.Sunnarium.getDust(4), - 10000, - 15000, - 7680, - true); - - if (ModsLoaded.BoP) GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem("BiomesOPlenty", "treeMoss", 8L), - Ic2Items.plantBall.copy()); - - if (!ModsLoaded.dreamcraft) { - if (ModsLoaded.BoP) { - GT_Values.RA.addExtractorRecipe( - GT_ModHandler.getModItem("BiomesOPlenty", "flowers", 2L, 3), - new ItemStack(Items.glowstone_dust, 1, 32767), - 300, - 2); - GT_Values.RA.addExtractorRecipe( - GT_ModHandler.getModItem("BiomesOPlenty", "mushrooms", 2L, 3), - new ItemStack(Items.glowstone_dust, 1, 32767), - 300, - 2); - GT_Values.RA.addExtractorRecipe( - GT_ModHandler.getModItem("BiomesOPlenty", "coral1", 2L, 15), - new ItemStack(Items.glowstone_dust, 8, 32767), - 300, - 2); - } - if (ModsLoaded.Natura) { - GT_Values.RA.addExtractorRecipe( - GT_ModHandler.getModItem("Natura", "Glowshroom", 2L, 0), - new ItemStack(Items.glowstone_dust, 1, 32767), - 300, - 2); - GT_Values.RA.addExtractorRecipe( - GT_ModHandler.getModItem("Natura", "Glowshroom", 2L, 1), - new ItemStack(Items.glowstone_dust, 1, 32767), - 300, - 2); - GT_Values.RA.addExtractorRecipe( - GT_ModHandler.getModItem("Natura", "Glowshroom", 2L, 2), - new ItemStack(Items.glowstone_dust, 1, 32767), - 300, - 2); - } + GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(BiomesOPlenty.ID, "coral1", 64, 15)) + .itemOutputs(Materials.Sunnarium.getDust(4)).fluidInputs(Materials.UUMatter.getFluid(2)) + .duration(12 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_IV).requiresCleanRoom() + .addTo(RecipeMaps.autoclaveRecipes); + + if (BiomesOPlenty.isModLoaded()) { + GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(BiomesOPlenty.ID, "treeMoss", 8)) + .itemOutputs(Ic2Items.plantBall.copy()).duration(15 * SECONDS).eut(2).addTo(compressorRecipes); } // Not a noob trophy. - GT_Values.RA.addExtruderRecipe( - Materials.Neutronium.getBlocks(64), - Materials.Neutronium.getBlocks(64), - CppItems.Trophy, - 2147483647, - 8); - - GT_Values.RA.addFluidExtractionRecipe( - new ItemStack(CppItems.Modifier, 1, 0), - GT_Values.NI, - Materials.UUMatter.getFluid(2L), - 5000, - 128, - 4); + GT_Values.RA.stdBuilder().itemInputs(Materials.Neutronium.getBlocks(64), Materials.Neutronium.getBlocks(64)) + .itemOutputs(CppItems.Trophy).duration(29826 * HOURS + 9 * MINUTES + 42 * SECONDS + 7 * TICKS).eut(8) + .addTo(extruderRecipes); // Chem Refine - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 9, 0), - GT_ModHandler.getModItem("GalacticraftCore", "item.meteoricIronRaw", 1L, 0) }, - new FluidStack[] { Materials.Water.getFluid(1000L) }, - new FluidStack[] {}, - new ItemStack[] { Materials.MeteoricIron.getDust(4) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 9, 0), - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 1L, 0) }, - new FluidStack[] { Materials.Water.getFluid(1000L) }, - new FluidStack[] {}, - new ItemStack[] { Materials.Desh.getDust(4) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.MeteoricIron), 1) }, - new FluidStack[] { Materials.Water.getFluid(1000L) }, - new FluidStack[] {}, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.MeteoricIron), 4) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.Desh), 1) }, - new FluidStack[] { Materials.Water.getFluid(1000L) }, - new FluidStack[] {}, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.Desh), 4) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.Oriharukon), 1) }, - new FluidStack[] { Materials.Water.getFluid(1000L) }, - new FluidStack[] {}, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.Oriharukon), 4) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.Ledox), 1) }, - new FluidStack[] { Materials.Water.getFluid(1000L) }, - new FluidStack[] {}, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.Ledox), 4) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.CallistoIce), 1) }, - new FluidStack[] { Materials.Water.getFluid(1000L) }, - new FluidStack[] {}, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.CallistoIce), 4) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.BlackPlutonium), 1) }, - new FluidStack[] { Materials.Water.getFluid(1000L) }, - new FluidStack[] {}, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.BlackPlutonium), 4) }, - 240, - 30720); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.DeepIron), 1) }, - new FluidStack[] { Materials.Water.getFluid(1000L) }, - new FluidStack[] {}, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.DeepIron), 4) }, - 240, - 30720); + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(CppItems.Modifier, 9, 0), + GT_ModHandler.getModItem(GalacticraftCore.ID, "item.meteoricIronRaw", 1, 0)) + .itemOutputs(Materials.MeteoricIron.getDust(4)).fluidInputs(Materials.Water.getFluid(1000)) + .duration(12 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder().itemOutputs(Materials.Desh.getDust(4)).fluidInputs(Materials.Water.getFluid(1000)) + .duration(12 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(CppItems.Modifier, 9, 0), + GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.MeteoricIron), 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.MeteoricIron), 4)) + .fluidInputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(CppItems.Modifier, 9, 0), + GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.Desh), 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.Desh), 4)) + .fluidInputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(CppItems.Modifier, 9, 0), + GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.Oriharukon), 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.Oriharukon), 4)) + .fluidInputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(CppItems.Modifier, 9, 0), + GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.Ledox), 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.Ledox), 4)) + .fluidInputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(CppItems.Modifier, 9, 0), + GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.CallistoIce), 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.CallistoIce), 4)) + .fluidInputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(CppItems.Modifier, 9, 0), + GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.BlackPlutonium), 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.BlackPlutonium), 4)) + .fluidInputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LuV) + .addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(CppItems.Modifier, 9, 0), + GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.DeepIron), 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.DeepIron), 4)) + .fluidInputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LuV) + .addTo(multiblockChemicalReactorRecipes); // Potions from Netherberries - GT_Values.RA.addBrewingRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 0), - Materials.Water.getFluid(1000L).getFluid(), - FluidRegistry.getFluid("potion.regen"), - false); - GT_Values.RA.addBrewingRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 1), - Materials.Water.getFluid(1000L).getFluid(), - FluidRegistry.getFluid("potion.nightvision"), - false); - GT_Values.RA.addBrewingRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 2), - Materials.Water.getFluid(1000L).getFluid(), - FluidRegistry.getFluid("potion.speed"), - false); - GT_Values.RA.addBrewingRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 3), - Materials.Water.getFluid(1000L).getFluid(), - FluidRegistry.getFluid("potion.strength"), - false); - - /* - * if (ModsLoaded.dreamcraft) for (int i=0; i= 1) - for (int i = 0; i < OreDictionary.getOres("listAllberry").size(); i++) GT_Values.RA.addBrewingRecipe( - OreDictionary.getOres("listAllberry").get(i).splitStack(16), - Materials.Water.getFluid(1000L).getFluid(), - CppFluids.Mash, - false); - GT_Values.RA.addBrewingRecipe( - new ItemStack(Items.sugar, 8), - FluidRegistry.getFluid("potion.weakness"), - CppFluids.Mash, - false); - // GT_Values.RA.addBrewingRecipe(new ItemStack(BppItems.BppBerries,1,1), - // Materials.Water.getFluid(1000L).getFluid(), FluidRegistry.getFluid("potion.reedwater"), false); - - // Sugar Related - GT_Values.RA - .addExtractorRecipe(new ItemStack(CppItems.CppBerries, 1, 1), new ItemStack(Items.sugar, 8, 0), 160, 8); - - // Dyes from Plants - for (int i = 0; i < OreDictionary.getOres("cropBlackberry").size(); i++) GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropBlackberry").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeblack"), 288), - new ItemStack(Items.sugar), - 600, - 48); - for (int i = 0; i < OreDictionary.getOres("cropBlueberry").size(); i++) GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropBlueberry").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeblue"), 288), - new ItemStack(Items.sugar), - 600, - 48); - for (int i = 0; i < OreDictionary.getOres("cropRaspberry").size(); i++) GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropRaspberry").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyepink"), 288), - new ItemStack(Items.sugar), - 600, - 48); - for (int i = 0; i < OreDictionary.getOres("cropVine").size(); i++) { - if (!OreDictionary.getOres("cropVine").get(i).getUnlocalizedName().equals("tile.Thornvines")) - GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropVine").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyegreen"), 288), - GT_Values.NI, - 600, - 48); - else GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropVine").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeyellow"), 288), - GT_Values.NI, - 600, - 48); - } - for (int i = 0; i < OreDictionary.getOres("cropCacti").size(); i++) GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropCacti").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyegreen"), 288), - GT_Values.NI, - 600, - 48); - for (int i = 0; i < OreDictionary.getOres("cropGooseberry").size(); i++) GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropGooseberry").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeyellow"), 288), - new ItemStack(Items.sugar), - 600, - 48); - for (int i = 0; i < OreDictionary.getOres("cropStrawberry").size(); i++) GT_Values.RA.addChemicalRecipe( - OreDictionary.getOres("cropStrawberry").get(i).splitStack(16), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyered"), 288), - new ItemStack(Items.sugar), - 600, - 48); - - if (ModsLoaded.BoP) GT_Values.RA.addChemicalRecipe( - GT_ModHandler.getModItem("BiomesOPlenty", "food", 16L), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyered"), 288), - new ItemStack(Items.sugar), - 600, - 48); - - GT_Values.RA.addChemicalRecipe( - new ItemStack(CppItems.CppBerries, 16, 0), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyepurple"), 288), - new ItemStack(Items.sugar), - 600, - 48); - - if (ModsLoaded.Natura) { - GT_Values.RA.addChemicalRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 0), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelime"), 288), - new ItemStack(Items.sugar), - 600, - 48); - GT_Values.RA.addChemicalRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 1), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelightgray"), 288), - new ItemStack(Items.sugar), - 600, - 48); - GT_Values.RA.addChemicalRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 2), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelightblue"), 288), - new ItemStack(Items.sugar), - 600, - 48); - GT_Values.RA.addChemicalRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 3), - Materials.Salt.getDust(2), - Materials.SulfuricAcid.getFluid(432L), - new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelime"), 288), - new ItemStack(Items.sugar), - 600, - 48); - } - - // Goldfish - GT_Values.RA.addFluidExtractionRecipe( - CppItems.GoldfischS, - new ItemStack(Items.gold_nugget), - Materials.FishOil.getFluid(100L), - 1, - 16, - 8); - GT_Values.RA.addPulveriserRecipe( - CppItems.GoldfischS, - new ItemStack[] { Materials.MeatRaw.getDust(1), Materials.Gold.getDustTiny(1) }, - new int[] { 10000, 100 }, - 3, - 8, - false); - - // Space Modifier - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Iron.getDust(1), new ItemStack(CppItems.Modifier, 16, 0) }, - new FluidStack[] { Materials.UUMatter - .getFluid(Materials.MeteoricIron.getNeutrons() + Materials.MeteoricIron.getProtons()) }, - new FluidStack[] {}, - new ItemStack[] { Materials.MeteoricIron.getDust(1) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Steel.getDust(1), new ItemStack(CppItems.Modifier, 16, 0) }, - new FluidStack[] { Materials.UUMatter - .getFluid(Materials.MeteoricSteel.getNeutrons() + Materials.MeteoricSteel.getProtons()) }, - new FluidStack[] {}, - new ItemStack[] { Materials.MeteoricSteel.getDust(1) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Bismuth.getDust(1), new ItemStack(CppItems.Modifier, 16, 0) }, - new FluidStack[] { Materials.UUMatter - .getFluid(Materials.Orichalcum.getNeutrons() + Materials.Orichalcum.getProtons()) }, - new FluidStack[] {}, - new ItemStack[] { Materials.Orichalcum.getDust(1) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Titanium.getDust(1), new ItemStack(CppItems.Modifier, 16, 0) }, - new FluidStack[] { - Materials.UUMatter.getFluid(Materials.Desh.getNeutrons() + Materials.Desh.getProtons()) }, - new FluidStack[] {}, - new ItemStack[] { Materials.Desh.getDust(1) }, - 240, - 480); - // NON-ELEMENTAR - // UV - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.MeteoricIron.getDust(1), new ItemStack(CppItems.Modifier, 64, 0) }, - new FluidStack[] { Materials.UUMatter - .getFluid((Materials.Neutronium.getNeutrons() + Materials.Neutronium.getProtons())) }, - new FluidStack[] {}, - new ItemStack[] { Materials.DeepIron.getDust(1) }, - 120, - 500000); - - if (ModsLoaded.TC) { - // Magic Modifier PrimP - GT_Values.RA.addExtractorRecipe( - GT_ModHandler.getModItem("Thaumcraft", "ItemEldritchObject", 1, 3), - new ItemStack(CppItems.Modifier, 8, 1), - 2000, - 128); - GT_Values.RA.addExtractorRecipe( - new ItemStack(CppItems.Modifier, 1, 1), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 16L, 14), - 2400, - 128); - if (!ModsLoaded.dreamcraft) GT_Values.RA.addAutoclaveRecipe( - new ItemStack(CppItems.Modifier, 16, 1), - Materials.UUMatter.getFluid(52L), - GT_ModHandler.getModItem("Thaumcraft", "ItemEldritchObject", 1, 3), - 10000, - 24000, - 384, - false); - else GT_Values.RA.addAutoclaveRecipe( - new ItemStack(CppItems.Modifier, 16, 1), - Materials.UUMatter.getFluid(52L), - com.dreammaster.item.ItemList.PrimordialPearlFragment.getIS().splitStack(3), - 10000, - 24000, - 384, - false); - GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 32L, 14), - Materials.UUMatter.getFluid(500L), - new ItemStack(CppItems.Modifier, 1, 1), - 3300, - 2400, - 120, - false); - // Magic Modifier - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Iron.getDust(1), new ItemStack(CppItems.Modifier, 1, 1) }, - new FluidStack[] { Materials.UUMatter - .getFluid(Materials.Thaumium.getNeutrons() + Materials.Thaumium.getProtons()) }, - new FluidStack[] {}, - new ItemStack[] { Materials.Thaumium.getDust(1) }, - 240, - 120); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Thaumium.getDust(1), new ItemStack(CppItems.Modifier, 1, 1) }, - new FluidStack[] { Materials.UUMatter - .getFluid(Materials.Arsenic.getNeutrons() + Materials.Arsenic.getProtons()) }, - new FluidStack[] {}, - new ItemStack[] { Materials.Void.getDust(1) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Void.getDust(1), new ItemStack(CppItems.Modifier, 2, 1) }, - new FluidStack[] { Materials.UUMatter - .getFluid(Materials.Indium.getNeutrons() + Materials.Indium.getProtons()) }, - new FluidStack[] {}, - new ItemStack[] { Materials.ShadowIron.getDust(1) }, - 240, - 7680); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.ShadowIron.getDust(1), new ItemStack(CppItems.Modifier, 16, 1) }, - new FluidStack[] { Materials.UUMatter - .getFluid((Materials.Osmium.getNeutrons() + Materials.Osmium.getProtons()) * 1000) }, - new FluidStack[] {}, - new ItemStack[] { GT_ModHandler.getModItem("ThaumicTinkerer", "kamiResource", 1L, 2) }, - 1800, - 30270); - } - - // Magic Modifier + Space Modifier - // GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[] { new ItemStack(CppItems.Modifier,16,0), new - // ItemStack(CppItems.Modifier,4,1)}, new FluidStack[] - // {Materials.Platinum.getMolten(288L),Materials.MeteoricIron.getMolten(144L), - // Materials.UUMatter.getFluid(Materials.Platinum.getProtons()+Materials.Platinum.getNeutrons())}, new - // FluidStack[] {}, new ItemStack[] {Materials.Mytryl.getDust(1)}, 1800, 7680); - // coral buff - GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem("BiomesOPlenty", "coral1", 64L, 15), - Materials.UUMatter.getFluid(2L), - Materials.Sunnarium.getDust(4), - 10000, - 15000, - 7680, - true); - - if (ModsLoaded.BoP) GT_ModHandler.addCompressionRecipe( - GT_ModHandler.getModItem("BiomesOPlenty", "tile.treeMoss", 8L), - Ic2Items.plantBall.copy()); - - if (ModsLoaded.BoP) { - GT_Values.RA.addExtractorRecipe( - GT_ModHandler.getModItem("BiomesOPlenty", "flowers", 2L, 3), - new ItemStack(Items.glowstone_dust, 1, 32767), - 300, - 2); - GT_Values.RA.addExtractorRecipe( - GT_ModHandler.getModItem("BiomesOPlenty", "mushrooms", 2L, 3), - new ItemStack(Items.glowstone_dust, 1, 32767), - 300, - 2); - GT_Values.RA.addExtractorRecipe( - GT_ModHandler.getModItem("BiomesOPlenty", "coral1", 2L, 15), - new ItemStack(Items.glowstone_dust, 8, 32767), - 300, - 2); - } - if (ModsLoaded.Natura) { - GT_Values.RA.addExtractorRecipe( - GT_ModHandler.getModItem("Natura", "Glowshroom", 2L, 0), - new ItemStack(Items.glowstone_dust, 1, 32767), - 300, - 2); - GT_Values.RA.addExtractorRecipe( - GT_ModHandler.getModItem("Natura", "Glowshroom", 2L, 1), - new ItemStack(Items.glowstone_dust, 1, 32767), - 300, - 2); - GT_Values.RA.addExtractorRecipe( - GT_ModHandler.getModItem("Natura", "Glowshroom", 2L, 2), - new ItemStack(Items.glowstone_dust, 1, 32767), - 300, - 2); - } - - // Trophy - GT_Values.RA.addExtruderRecipe( - Materials.Neutronium.getBlocks(64), - Materials.Neutronium.getBlocks(64), - CppItems.Trophy, - 2147483647, - 8); - GT_Values.RA.addFluidExtractionRecipe( - new ItemStack(CppItems.Modifier, 1, 0), - GT_Values.NI, - Materials.UUMatter.getFluid(2L), - 5000, - 128, - 4); - - // Chem Refine - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 9, 0), - GT_ModHandler.getModItem("GalacticraftCore", "item.meteoricIronRaw", 1L, 0) }, - new FluidStack[] { Materials.Water.getFluid(1000L) }, - new FluidStack[] {}, - new ItemStack[] { Materials.MeteoricIron.getDust(4) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 9, 0), - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 1L, 0) }, - new FluidStack[] { Materials.Water.getFluid(1000L) }, - new FluidStack[] {}, - new ItemStack[] { Materials.Desh.getDust(4) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.MeteoricIron), 1) }, - new FluidStack[] { Materials.Water.getFluid(1000L) }, - new FluidStack[] {}, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.MeteoricIron), 4) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.Desh), 1) }, - new FluidStack[] { Materials.Water.getFluid(1000L) }, - new FluidStack[] {}, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.Desh), 4) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.Orichalcum), 1) }, - new FluidStack[] { Materials.Water.getFluid(1000L) }, - new FluidStack[] {}, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.Orichalcum), 4) }, - 240, - 480); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.DeepIron), 1) }, - new FluidStack[] { Materials.Water.getFluid(1000L) }, - new FluidStack[] {}, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.DeepIron), 4) }, - 240, - 30720); - - // Potions from Netherberries - GT_Values.RA.addBrewingRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 0), - Materials.Water.getFluid(1000L).getFluid(), - FluidRegistry.getFluid("potion.regen"), - false); - GT_Values.RA.addBrewingRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 1), - Materials.Water.getFluid(1000L).getFluid(), - FluidRegistry.getFluid("potion.nightvision"), - false); - GT_Values.RA.addBrewingRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 2), - Materials.Water.getFluid(1000L).getFluid(), - FluidRegistry.getFluid("potion.speed"), - false); - GT_Values.RA.addBrewingRecipe( - GT_ModHandler.getModItem("Natura", "berry.nether", 16L, 3), - Materials.Water.getFluid(1000L).getFluid(), - FluidRegistry.getFluid("potion.strength"), - false); - } -} diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropGeneExtractor.java b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropGeneExtractor.java index a6d1868..0f74d8e 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropGeneExtractor.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropGeneExtractor.java @@ -1,6 +1,21 @@ package com.github.bartimaeusnek.cropspp.GTHandler.machines; -import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_GLOW; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -23,6 +38,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; +import gregtech.api.recipe.BasicUIProperties; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Utility; import gregtech.common.items.behaviors.Behaviour_DataOrb; @@ -171,12 +187,8 @@ public boolean allowSelectCircuit() { public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { super.addUIWidgets(builder, buildContext); builder.widget( - createProgressBar( - GT_UITextures.PROGRESSBAR_ARROW, - 20, - ProgressBar.Direction.RIGHT, - new Pos2d(78, 24), - new Size(20, 18))); + new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ARROW, 20) + .setDirection(ProgressBar.Direction.RIGHT).setPos(new Pos2d(78, 24)).setSize(new Size(20, 18))); } @Override @@ -186,8 +198,8 @@ protected SlotWidget createItemInputSlot(int index, IDrawable[] backgrounds, Pos } @Override - protected SlotWidget createSpecialSlot(IDrawable[] backgrounds, Pos2d pos) { - return (SlotWidget) super.createSpecialSlot(backgrounds, pos) + protected SlotWidget createSpecialSlot(IDrawable[] backgrounds, Pos2d pos, BasicUIProperties uiProperties) { + return (SlotWidget) super.createSpecialSlot(backgrounds, pos, uiProperties) .setGTTooltip(() -> mTooltipCache.getData("bpp.machines.special_slot.tooltip")) .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DATA_ORB); } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropReplicator.java b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropReplicator.java index e5ddb93..76b024e 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropReplicator.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropReplicator.java @@ -1,6 +1,21 @@ package com.github.bartimaeusnek.cropspp.GTHandler.machines; -import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_GLOW; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -155,12 +170,8 @@ public boolean useModularUI() { public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { super.addUIWidgets(builder, buildContext); builder.widget( - createProgressBar( - GT_UITextures.PROGRESSBAR_ARROW, - 20, - ProgressBar.Direction.RIGHT, - new Pos2d(78, 24), - new Size(20, 18))); + new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ARROW, 20) + .setDirection(ProgressBar.Direction.RIGHT).setPos(new Pos2d(78, 24)).setSize(new Size(20, 18))); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropSynthesiser.java b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropSynthesiser.java index b9c5d8e..b919bab 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropSynthesiser.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropSynthesiser.java @@ -1,6 +1,21 @@ package com.github.bartimaeusnek.cropspp.GTHandler.machines; -import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_GLOW; import java.util.HashMap; @@ -188,12 +203,8 @@ public boolean useModularUI() { public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { super.addUIWidgets(builder, buildContext); builder.widget( - createProgressBar( - GT_UITextures.PROGRESSBAR_ARROW, - 20, - ProgressBar.Direction.RIGHT, - new Pos2d(78, 24), - new Size(20, 18))); + new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ARROW, 20) + .setDirection(ProgressBar.Direction.RIGHT).setPos(new Pos2d(78, 24)).setSize(new Size(20, 18))); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/croploader/CropLoader.java b/src/main/java/com/github/bartimaeusnek/cropspp/croploader/CropLoader.java index f3cf418..0067bf7 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/croploader/CropLoader.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/croploader/CropLoader.java @@ -1,6 +1,13 @@ package com.github.bartimaeusnek.cropspp.croploader; import static com.github.bartimaeusnek.cropspp.ConfigValues.c; +import static gregtech.api.enums.Mods.BiomesOPlenty; +import static gregtech.api.enums.Mods.Natura; +import static gregtech.api.enums.Mods.PamsHarvestCraft; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.TinkerConstruct; +import static gregtech.api.enums.Mods.TwilightForest; +import static gregtech.api.enums.Mods.Witchery; import java.util.ArrayList; import java.util.List; @@ -8,7 +15,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; import com.github.bartimaeusnek.croploadcore.OreDict; import com.github.bartimaeusnek.croploadcore.config; import com.github.bartimaeusnek.cropspp.ConfigValues; @@ -31,7 +37,6 @@ import com.github.bartimaeusnek.cropspp.crops.natura.SaguaroCrop; import com.github.bartimaeusnek.cropspp.crops.witchery.GarlicCrop; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import ic2.api.crops.CropCard; import ic2.api.crops.Crops; @@ -80,40 +85,39 @@ public static final List cropLoader() { * Add your crops with base seed here by p.add(new CropLoader(new YourCropClass(),YourItem)); */ - if (Loader.isModLoaded("TwilightForest")) { + if (TwilightForest.isModLoaded()) { p.addAll(TwilightForestLoader.load()); } - if (ModsLoaded.dreamcraft) { - p.addAll(DreamCraftLoader.load()); - } - if (ModsLoaded.GT) { - p.addAll(GTLoader.load()); - } - if (ModsLoaded.Natura) p.addAll(NaturaLoader.load()); - else { + + p.addAll(DreamCraftLoader.load()); + p.addAll(GTLoader.load()); + + if (Natura.isModLoaded()) { + p.addAll(NaturaLoader.load()); + } else { p.add(new CropLoader(new SaguaroCrop(), null)); } - if (ModsLoaded.Natura || ModsLoaded.PHC) { + if (Natura.isModLoaded() || PamsHarvestCraft.isModLoaded()) { p.add(new CropLoader(new CottonCrop(), null)); } - if (ModsLoaded.TConstruct) { + if (TinkerConstruct.isModLoaded()) { p.addAll(TConstructLoader.load()); } - if (ModsLoaded.BoP) { + if (BiomesOPlenty.isModLoaded()) { p.addAll(BoPLoader.BoPLoaderList()); } - if (ModsLoaded.TC) { + if (Thaumcraft.isModLoaded()) { p.addAll(ThaumcraftLoader.load()); } - if (ModsLoaded.witchery) { + if (Witchery.isModLoaded()) { p.addAll(WitcheryLoader.load()); } - if (ModsLoaded.witchery || ModsLoaded.PHC) { + if (Witchery.isModLoaded() || PamsHarvestCraft.isModLoaded()) { p.add(new CropLoader(new GarlicCrop(), null)); } - if (ModsLoaded.BoP || ModsLoaded.PHC) { + if (BiomesOPlenty.isModLoaded() || PamsHarvestCraft.isModLoaded()) { p.add(new CropLoader(new BarleyCrop(), null)); } @@ -132,18 +136,6 @@ public static final List cropLoader() { p.add(new CropLoader(new BlueberryCrop(), null)); p.add(new CropLoader(new RaspberryCrop(), null)); - /* - * if (lokko12.berriespp.ConfigValures.ayo_bonsai) if (InstalledTreesGetter.savedNames != null) for(int i=0; i < - * InstalledTreesGetter.savedNames.size(); ++i) { if( Operators.AND(Operators.NOR( - * InstalledTreesGetter.savedNames.get(i).contains("Shimmerleaf"),InstalledTreesGetter.savedNames.get(i). - * contains("Cinderpearl") ) , - * Operators.NOR(InstalledTreesGetter.savedNames.get(i).contains("Vishroom"),InstalledTreesGetter.savedNames.get - * (i).contains("Ethereal Bloom")))) { p.add(new CropLoader(new - * BasicBonsaiCrop(InstalledTreesGetter.savedNames.get(i), - * "bpp:"+InstalledTreesGetter.BaseSeed.get(i).getIconIndex().getIconName().replaceAll(":","_") - * ,InstalledTreesGetter.savedDrop.get(i)),InstalledTreesGetter.BaseSeed.get(i))); } } else - * Berriespp.bpplogger.info("Something wrent wrong at getting Trees, BonsaiGen Disabled!"); - */ return p; } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/croploader/NaturaLoader.java b/src/main/java/com/github/bartimaeusnek/cropspp/croploader/NaturaLoader.java index bc16e94..7332d2f 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/croploader/NaturaLoader.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/croploader/NaturaLoader.java @@ -1,11 +1,12 @@ package com.github.bartimaeusnek.cropspp.croploader; +import static gregtech.api.enums.Mods.BiomesOPlenty; + import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; import com.github.bartimaeusnek.cropspp.crops.natura.SaguaroCrop; import com.github.bartimaeusnek.cropspp.crops.natura.nether.BasicNetherShroomCrop; import com.github.bartimaeusnek.cropspp.crops.natura.nether.BlightberryCrop; @@ -14,35 +15,30 @@ import com.github.bartimaeusnek.cropspp.crops.natura.nether.StingberryCrop; import com.github.bartimaeusnek.cropspp.crops.natura.nether.Thornvines; +import mods.natura.common.NContent; + public class NaturaLoader { public static List load() { List p = new ArrayList(); - p.add(new CropLoader(new BlightberryCrop(), new ItemStack(mods.natura.common.NContent.netherBerryItem, 1, 0))); - p.add(new CropLoader(new DuskberryCrop(), new ItemStack(mods.natura.common.NContent.netherBerryItem, 1, 1))); - p.add(new CropLoader(new SkyberryCrop(), new ItemStack(mods.natura.common.NContent.netherBerryItem, 1, 2))); - p.add(new CropLoader(new StingberryCrop(), new ItemStack(mods.natura.common.NContent.netherBerryItem, 1, 3))); - p.add(new CropLoader(new Thornvines(), new ItemStack(mods.natura.common.NContent.thornVines, 1, 0))); - p.add( - new CropLoader( - new BasicNetherShroomCrop("Blue"), - new ItemStack(mods.natura.common.NContent.glowshroom, 1, 2))); - p.add( - new CropLoader( - new BasicNetherShroomCrop("Green"), - new ItemStack(mods.natura.common.NContent.glowshroom, 1, 0))); - p.add( - new CropLoader( - new BasicNetherShroomCrop("Purple"), - new ItemStack(mods.natura.common.NContent.glowshroom, 1, 1))); - p.add(new CropLoader(new SaguaroCrop(), new ItemStack(mods.natura.common.NContent.seedFood, 1, 0))); - - if (ModsLoaded.BoP) p.add( - new CropLoader( - new BasicNetherShroomCrop("Yellow"), - new ItemStack(biomesoplenty.api.content.BOPCBlocks.mushrooms, 1, 3))); + p.add(new CropLoader(new BlightberryCrop(), new ItemStack(NContent.netherBerryItem, 1, 0))); + p.add(new CropLoader(new DuskberryCrop(), new ItemStack(NContent.netherBerryItem, 1, 1))); + p.add(new CropLoader(new SkyberryCrop(), new ItemStack(NContent.netherBerryItem, 1, 2))); + p.add(new CropLoader(new StingberryCrop(), new ItemStack(NContent.netherBerryItem, 1, 3))); + p.add(new CropLoader(new Thornvines(), new ItemStack(NContent.thornVines, 1, 0))); + p.add(new CropLoader(new BasicNetherShroomCrop("Blue"), new ItemStack(NContent.glowshroom, 1, 2))); + p.add(new CropLoader(new BasicNetherShroomCrop("Green"), new ItemStack(NContent.glowshroom, 1, 0))); + p.add(new CropLoader(new BasicNetherShroomCrop("Purple"), new ItemStack(NContent.glowshroom, 1, 1))); + p.add(new CropLoader(new SaguaroCrop(), new ItemStack(NContent.seedFood, 1, 0))); + + if (BiomesOPlenty.isModLoaded()) { + p.add( + new CropLoader( + new BasicNetherShroomCrop("Yellow"), + new ItemStack(biomesoplenty.api.content.BOPCBlocks.mushrooms, 1, 3))); + } return p; } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/croploader/TwilightForestLoader.java b/src/main/java/com/github/bartimaeusnek/cropspp/croploader/TwilightForestLoader.java index 5c03c64..79db301 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/croploader/TwilightForestLoader.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/croploader/TwilightForestLoader.java @@ -1,11 +1,12 @@ package com.github.bartimaeusnek.cropspp.croploader; +import static gregtech.api.enums.Mods.BiomesOPlenty; + import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; import com.github.bartimaeusnek.cropspp.crops.TF.KnighmetalCrop; import com.github.bartimaeusnek.cropspp.crops.TF.MossCrop; import com.github.bartimaeusnek.cropspp.crops.TF.TorchberryCrop; @@ -19,7 +20,7 @@ public static List load() { p.add(new CropLoader(new KnighmetalCrop(), null)); p.add(new CropLoader(new TorchberryCrop(), new ItemStack(TFItems.torchberries, 1, 0))); - if (ModsLoaded.BoP) { + if (BiomesOPlenty.isModLoaded()) { p.add(new CropLoader(new MossCrop(), null)); } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/croploader/WitcheryLoader.java b/src/main/java/com/github/bartimaeusnek/cropspp/croploader/WitcheryLoader.java index 2cf9929..050a59b 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/croploader/WitcheryLoader.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/croploader/WitcheryLoader.java @@ -21,7 +21,7 @@ public static List load() { p.add(new CropLoader(new SpanishMossCrop(), null)); p.add(new CropLoader(new BelladonnaCrop(), null)); p.add(new CropLoader(new MandragoraCrop(), null)); - p.add(new CropLoader(new SnowbellCrop(), null));; + p.add(new CropLoader(new SnowbellCrop(), null)); p.add(new CropLoader(new WolfsBaneCrop(), null)); p.add(new CropLoader(new WaterArtichokeCrop(), null)); p.add(new CropLoader(new EmberMossCrop(), null)); diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/crops/cpp/CactiCrop.java b/src/main/java/com/github/bartimaeusnek/cropspp/crops/cpp/CactiCrop.java index e5f52c9..ba48cdc 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/crops/cpp/CactiCrop.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/crops/cpp/CactiCrop.java @@ -1,5 +1,7 @@ package com.github.bartimaeusnek.cropspp.crops.cpp; +import static gregtech.api.enums.Mods.BiomesOPlenty; + import java.util.Arrays; import java.util.List; @@ -7,7 +9,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; import com.github.bartimaeusnek.cropspp.CCropUtility; import com.github.bartimaeusnek.cropspp.abstracts.BasicDecorationCrop; import com.github.bartimaeusnek.cropspp.croploader.CropLoader; @@ -19,7 +20,7 @@ public class CactiCrop extends BasicDecorationCrop { public CactiCrop() { - if (ModsLoaded.BoP) Crops.instance.registerBaseSeed( + if (BiomesOPlenty.isModLoaded()) Crops.instance.registerBaseSeed( new ItemStack(BOPCBlocks.plants, 1, 12), com.github.bartimaeusnek.cropspp.croploader.CropLoader.CropunpackerCC(new CropLoader(this)), 1, @@ -51,7 +52,8 @@ public int weightInfluences(ICropTile crop, float humidity, float nutrients, flo @Override public ItemStack getGain(ICropTile crop) { - if (ModsLoaded.BoP && crop.getSize() >= this.maxSize() - 1) return new ItemStack(BOPCBlocks.plants, 1, 12); + if (BiomesOPlenty.isModLoaded() && crop.getSize() >= this.maxSize() - 1) + return new ItemStack(BOPCBlocks.plants, 1, 12); else return new ItemStack(Item.getItemById(81), 1, 0); } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/crops/gregtechCrops/GarnydniaCrop.java b/src/main/java/com/github/bartimaeusnek/cropspp/crops/gregtechCrops/GarnydniaCrop.java index 96b66ce..10de955 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/crops/gregtechCrops/GarnydniaCrop.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/crops/gregtechCrops/GarnydniaCrop.java @@ -100,48 +100,42 @@ public int growthDuration(ICropTile crop) { public boolean isBlockBelow(ICropTile aCrop) { if (aCrop == null) { return false; - } else { - for (int i = 1; i < this.getrootslength(aCrop); ++i) { - Block tBlock = aCrop.getWorld() - .getBlock(aCrop.getLocation().posX, aCrop.getLocation().posY - i, aCrop.getLocation().posZ); - if (tBlock instanceof GT_Block_Ores_Abstract) { - TileEntity tTileEntity = aCrop.getWorld().getTileEntity( - aCrop.getLocation().posX, - aCrop.getLocation().posY - i, - aCrop.getLocation().posZ); - if (tTileEntity instanceof GT_TileEntity_Ores) { - Materials tMaterial = GregTech_API.sGeneratedMaterials[((GT_TileEntity_Ores) tTileEntity).mMetaData - % 1000]; - if (tMaterial != null && tMaterial != Materials._NULL) { - if (tMaterial == Materials.GarnetRed || tMaterial == Materials.GarnetYellow) { - return true; - } - - return false; - } - } - } else { - int tMetaID = aCrop.getWorld().getBlockMetadata( - aCrop.getLocation().posX, - aCrop.getLocation().posY - i, - aCrop.getLocation().posZ); - ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); - if (tAssotiation != null && tAssotiation.mPrefix.toString().startsWith("ore") - && (tAssotiation.mMaterial.mMaterial == Materials.GarnetRed - || tAssotiation.mMaterial.mMaterial == Materials.GarnetYellow)) { - return true; - } + } - if (tAssotiation != null && tAssotiation.mPrefix == OrePrefixes.block - && (tAssotiation.mMaterial.mMaterial == Materials.GarnetRed - || tAssotiation.mMaterial.mMaterial == Materials.GarnetYellow)) { - return true; + for (int i = 1; i < this.getrootslength(aCrop); ++i) { + Block tBlock = aCrop.getWorld() + .getBlock(aCrop.getLocation().posX, aCrop.getLocation().posY - i, aCrop.getLocation().posZ); + + if (tBlock instanceof GT_Block_Ores_Abstract) { + TileEntity tTileEntity = aCrop.getWorld().getTileEntity( + aCrop.getLocation().posX, + aCrop.getLocation().posY - i, + aCrop.getLocation().posZ); + if (tTileEntity instanceof GT_TileEntity_Ores) { + Materials tMaterial = GregTech_API.sGeneratedMaterials[((GT_TileEntity_Ores) tTileEntity).mMetaData + % 1000]; + if (tMaterial != null && tMaterial != Materials._NULL) { + return tMaterial == Materials.GarnetRed || tMaterial == Materials.GarnetYellow; } } + } else { + int tMetaID = aCrop.getWorld().getBlockMetadata( + aCrop.getLocation().posX, + aCrop.getLocation().posY - i, + aCrop.getLocation().posZ); + ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); + if (tAssotiation != null + && (tAssotiation.mPrefix.toString().startsWith("ore") + || tAssotiation.mPrefix == OrePrefixes.block) + && (tAssotiation.mMaterial.mMaterial == Materials.GarnetRed + || tAssotiation.mMaterial.mMaterial == Materials.GarnetYellow)) { + return true; + } } - - return false; } + + return false; + } @Override @@ -155,7 +149,9 @@ public ItemStack getGain(ICropTile iCropTile) { ItemStack drop; if (XSTR.XSTR_INSTANCE.nextInt(100) >= 50) dropMat = Materials.GarnetRed; else dropMat = Materials.GarnetYellow; + int chance = XSTR.XSTR_INSTANCE.nextInt(100); + if (chance >= 95) drop = GT_OreDictUnificator.get(OrePrefixes.gemExquisite, dropMat, 1); else if (chance >= 80) drop = dropMat.getGems(1); else if (chance == 42) drop = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.GarnetSand, 1); diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/BlackberryCrop.java b/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/BlackberryCrop.java index 3daee3d..735fa57 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/BlackberryCrop.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/BlackberryCrop.java @@ -1,8 +1,9 @@ package com.github.bartimaeusnek.cropspp.crops.natura; +import static gregtech.api.enums.Mods.Natura; + import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; import com.github.bartimaeusnek.croploadcore.OreDict; import com.github.bartimaeusnek.cropspp.CCropUtility; import com.github.bartimaeusnek.cropspp.abstracts.BasicBerryCrop; @@ -36,13 +37,13 @@ public String[] attributes() { @Override public ItemStack getGain(ICropTile crop) { - if (ModsLoaded.Natura) return new ItemStack(NContent.berryItem, 3, 2); + if (Natura.isModLoaded()) return new ItemStack(NContent.berryItem, 3, 2); else return CCropUtility.getCopiedOreStack(cropOreName); } @Override public ItemStack getDisplayItem() { - if (ModsLoaded.Natura) return new ItemStack(NContent.berryItem, 3, 2); + if (Natura.isModLoaded()) return new ItemStack(NContent.berryItem, 3, 2); else return OreDict.ISget(cropOreName); } } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/BlueberryCrop.java b/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/BlueberryCrop.java index 2b2bfdf..71c8b08 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/BlueberryCrop.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/BlueberryCrop.java @@ -1,8 +1,9 @@ package com.github.bartimaeusnek.cropspp.crops.natura; +import static gregtech.api.enums.Mods.Natura; + import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; import com.github.bartimaeusnek.croploadcore.OreDict; import com.github.bartimaeusnek.cropspp.CCropUtility; import com.github.bartimaeusnek.cropspp.abstracts.BasicBerryCrop; @@ -36,13 +37,13 @@ public String[] attributes() { @Override public ItemStack getGain(ICropTile crop) { - if (ModsLoaded.Natura) return new ItemStack(NContent.berryItem, 3, 1); + if (Natura.isModLoaded()) return new ItemStack(NContent.berryItem, 3, 1); else return CCropUtility.getCopiedOreStack(cropOreName); } @Override public ItemStack getDisplayItem() { - if (ModsLoaded.Natura) return new ItemStack(NContent.berryItem, 3, 1); + if (Natura.isModLoaded()) return new ItemStack(NContent.berryItem, 3, 1); else return OreDict.ISget(cropOreName); } } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/CottonCrop.java b/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/CottonCrop.java index b2097a0..65b90ec 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/CottonCrop.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/CottonCrop.java @@ -1,8 +1,9 @@ package com.github.bartimaeusnek.cropspp.crops.natura; +import static gregtech.api.enums.Mods.Natura; + import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; import com.github.bartimaeusnek.croploadcore.OreDict; import com.github.bartimaeusnek.cropspp.CCropUtility; import com.github.bartimaeusnek.cropspp.abstracts.BasicDecorationCrop; @@ -68,8 +69,10 @@ public boolean canGrow(ICropTile crop) { @Override public ItemStack getGain(ICropTile crop) { - if (!ModsLoaded.Natura) return CCropUtility.getCopiedOreStack(cropOreName); - else return new ItemStack(NContent.plantItem, 1, 3); + if (!Natura.isModLoaded()) { + return CCropUtility.getCopiedOreStack(cropOreName); + } + return new ItemStack(NContent.plantItem, 1, 3); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/MaloberryCrop.java b/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/MaloberryCrop.java index 5cab3f6..67ee332 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/MaloberryCrop.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/MaloberryCrop.java @@ -1,8 +1,9 @@ package com.github.bartimaeusnek.cropspp.crops.natura; +import static gregtech.api.enums.Mods.Natura; + import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; import com.github.bartimaeusnek.croploadcore.OreDict; import com.github.bartimaeusnek.cropspp.CCropUtility; import com.github.bartimaeusnek.cropspp.abstracts.BasicBerryCrop; @@ -30,13 +31,13 @@ public String[] attributes() { @Override public ItemStack getGain(ICropTile crop) { - if (ModsLoaded.Natura) return new ItemStack(NContent.berryItem, 3, 3); + if (Natura.isModLoaded()) return new ItemStack(NContent.berryItem, 3, 3); else return CCropUtility.getCopiedOreStack(cropOreName); } @Override public ItemStack getDisplayItem() { - if (ModsLoaded.Natura) return new ItemStack(NContent.berryItem, 3, 3); + if (Natura.isModLoaded()) return new ItemStack(NContent.berryItem, 3, 3); else return OreDict.ISget(cropOreName); } } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/RaspberryCrop.java b/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/RaspberryCrop.java index ed6fe3c..367e21c 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/RaspberryCrop.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/RaspberryCrop.java @@ -1,8 +1,9 @@ package com.github.bartimaeusnek.cropspp.crops.natura; +import static gregtech.api.enums.Mods.Natura; + import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; import com.github.bartimaeusnek.croploadcore.OreDict; import com.github.bartimaeusnek.cropspp.CCropUtility; import com.github.bartimaeusnek.cropspp.abstracts.BasicBerryCrop; @@ -33,13 +34,13 @@ public String[] attributes() { @Override public ItemStack getGain(ICropTile crop) { - if (ModsLoaded.Natura) return new ItemStack(NContent.berryItem, 3, 0); + if (Natura.isModLoaded()) return new ItemStack(NContent.berryItem, 3, 0); else return CCropUtility.getCopiedOreStack(cropOreName); } @Override public ItemStack getDisplayItem() { - if (ModsLoaded.Natura) return new ItemStack(NContent.berryItem, 3, 0); + if (Natura.isModLoaded()) return new ItemStack(NContent.berryItem, 3, 0); else return OreDict.ISget(cropOreName); } } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/SaguaroCrop.java b/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/SaguaroCrop.java index c764695..c934fdd 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/SaguaroCrop.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/crops/natura/SaguaroCrop.java @@ -1,8 +1,9 @@ package com.github.bartimaeusnek.cropspp.crops.natura; +import static gregtech.api.enums.Mods.Natura; + import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; import com.github.bartimaeusnek.cropspp.ConfigValues; import com.github.bartimaeusnek.cropspp.crops.cpp.CactiCrop; import com.github.bartimaeusnek.cropspp.items.CppItems; @@ -51,7 +52,7 @@ public int growthDuration(ICropTile crop) { @Override public ItemStack getGain(ICropTile crop) { - if (ModsLoaded.Natura) { + if (Natura.isModLoaded()) { if (crop.getSize() == this.maxSize() - 1) return new ItemStack(NContent.saguaro, 2, 0); else return new ItemStack(NContent.seedFood, 3, 0); } else { @@ -61,7 +62,7 @@ public ItemStack getGain(ICropTile crop) { @Override public ItemStack getDisplayItem() { - if (ModsLoaded.Natura) return new ItemStack(NContent.seedFood, 3, 0); + if (Natura.isModLoaded()) return new ItemStack(NContent.seedFood, 3, 0); else return new ItemStack(CppItems.BerryItems, 1, 4); } } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/items/CppItems.java b/src/main/java/com/github/bartimaeusnek/cropspp/items/CppItems.java index fbb1037..01d6714 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/items/CppItems.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/items/CppItems.java @@ -1,11 +1,13 @@ package com.github.bartimaeusnek.cropspp.items; +import static gregtech.api.enums.Mods.Natura; +import static gregtech.api.enums.Mods.PamsHarvestCraft; + import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; import com.github.bartimaeusnek.croploadcore.OreDict; import com.github.bartimaeusnek.cropspp.ConfigValues; @@ -23,11 +25,7 @@ public final class CppItems { public static final Item Modifier = new Modifier(); public static final ItemStack ModifierSpace = new ItemStack(Modifier, 1, 0); public static final ItemStack ModifierMagic = new ItemStack(Modifier, 1, 1); - // public final static ItemStack ModifierAnti = new ItemStack(Modifier, 1, 3); public static final ItemStack Trophy = new ItemStack(Modifier, 1, 2); - // public final static ItemStack Gr = new ItemStack(Modifier, 1, 4); - // public final static ItemStack Ga = new ItemStack(Modifier, 1, 5); - // public final static ItemStack Re = new ItemStack(Modifier, 1, 6); public static final Item CppBerries = new CppBerries(); public static final Item CppPotions = new CppPotions(); @@ -39,9 +37,8 @@ public static final void register_Items() { GameRegistry.registerItem(Modifier, "Modifier"); GameRegistry.registerCustomItemStack("ModifierSpace", ModifierSpace); GameRegistry.registerCustomItemStack("ModifierMagic", ModifierMagic); - // GameRegistry.registerCustomItemStack("ModifierAnti", ModifierAnti); GameRegistry.registerCustomItemStack("Trophy", Trophy); - if (ModsLoaded.GT) GameRegistry.registerItem(CppPotions, "BppPotions"); + GameRegistry.registerItem(CppPotions, "BppPotions"); GameRegistry.registerItem(CppBerries, "foodBerries"); GameRegistry.registerCustomItemStack("berryHuckle", new ItemStack(CppBerries, 1, 0)); GameRegistry.registerCustomItemStack("sugarbeet", new ItemStack(CppBerries, 1, 1)); @@ -49,7 +46,7 @@ public static final void register_Items() { GameRegistry.registerItem(new ItemBppWateringCan(), "itemWateringCan"); GameRegistry.registerItem(new Weedmaker(), "debugitemWeedmaker"); } - if (!ModsLoaded.Natura) { + if (!Natura.isModLoaded()) { GameRegistry.registerItem(BerryItems, "berry"); GameRegistry.registerCustomItemStack("berryRasp", new ItemStack(BerryItems, 1, 0)); GameRegistry.registerCustomItemStack("berryBlue", new ItemStack(BerryItems, 1, 1)); @@ -62,26 +59,26 @@ public static final void register_Items() { public static final void register_recipes() { if (ConfigValues.Items) { - if (!ModsLoaded.GT) { - GameRegistry.addRecipe( - itemSpadeStack, - " P ", - "PWP", - " S ", - 'P', - OreDict.ISget("plateDenseSteel"), - 'W', - Ic2Items.weedingTrowel.getItem(), - 'S', - Items.stick); - GameRegistry.addShapelessRecipe(new ItemStack(Items.sugar, 8), new ItemStack(CppBerries, 1, 1)); - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 5), new ItemStack(CppBerries, 1, 0)); - GameRegistry.addShapelessRecipe( - new ItemStack(Items.gold_nugget, 9), - new ItemStack(Goldfisch), - new ItemStack(Items.flint)); - } - if (!ModsLoaded.PHC) { + + GameRegistry.addRecipe( + itemSpadeStack, + " P ", + "PWP", + " S ", + 'P', + OreDict.ISget("plateDenseSteel"), + 'W', + Ic2Items.weedingTrowel.getItem(), + 'S', + Items.stick); + GameRegistry.addShapelessRecipe(new ItemStack(Items.sugar, 8), new ItemStack(CppBerries, 1, 1)); + GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 5), new ItemStack(CppBerries, 1, 0)); + GameRegistry.addShapelessRecipe( + new ItemStack(Items.gold_nugget, 9), + new ItemStack(Goldfisch), + new ItemStack(Items.flint)); + + if (!PamsHarvestCraft.isModLoaded()) { GameRegistry.addShapelessRecipe(new ItemStack(Items.fish), new ItemStack(Goldfisch)); GameRegistry.addSmelting(new ItemStack(Goldfisch), new ItemStack(Items.cooked_fished), 0); } @@ -99,7 +96,7 @@ public static final void OreDictItems() { OreDictionary.registerOre("cropSugarbeet", new ItemStack(CppBerries, 1, 1)); } - if (!ModsLoaded.Natura) { + if (!Natura.isModLoaded()) { ItemStack[] BerryItemsS = new ItemStack[5]; for (int i = 0; i < 5; ++i) { BerryItemsS[i] = new ItemStack(BerryItems, i); diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/items/CreativeTab.java b/src/main/java/com/github/bartimaeusnek/cropspp/items/CreativeTab.java index 0028602..3a9df77 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/items/CreativeTab.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/items/CreativeTab.java @@ -3,9 +3,10 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import com.github.bartimaeusnek.croploadcore.ModsLoaded; import com.github.bartimaeusnek.croploadcore.OreDict; +import gregtech.api.enums.Mods; + public final class CreativeTab extends CreativeTabs { public static final CreativeTab cpp = new CreativeTab(); @@ -16,7 +17,7 @@ public CreativeTab() { @Override public Item getTabIconItem() { - if (ModsLoaded.Natura) return OreDict.ISget("cropSaguaroBerry").getItem(); + if (Mods.Natura.isModLoaded()) return OreDict.ISget("cropSaguaroBerry").getItem(); else return CppItems.Goldfisch; } } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/items/ItemBppSpade.java b/src/main/java/com/github/bartimaeusnek/cropspp/items/ItemBppSpade.java index 7381d29..f1bb8b7 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/items/ItemBppSpade.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/items/ItemBppSpade.java @@ -90,8 +90,7 @@ public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, crop.getScanLevel())); } else if (crop.getCrop().getGain(crop) != null && crop.getCrop().canBeHarvested(crop)) StackUtil.dropAsEntity(world, x, y, z, crop.getCrop().getGain(crop)); - // StackUtil.dropAsEntity(world, x, y, z, crop.generateSeeds(crop.getCrop(), crop.getGrowth(), - // crop.getGain(), crop.getResistance(), crop.getScanLevel())); + } crop.reset(); return true; diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/items/ItemBppWateringCan.java b/src/main/java/com/github/bartimaeusnek/cropspp/items/ItemBppWateringCan.java index 198d94d..b23efcd 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/items/ItemBppWateringCan.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/items/ItemBppWateringCan.java @@ -71,40 +71,51 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - if (world.isRemote) return false; + if (world.isRemote) { + return false; + } + readFromToNBT(stack); - if (content >= 144) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileEntityCrop) { - TileEntityCrop crop = (TileEntityCrop) te; - if (crop.getCrop() != null) { - if (debug) { - if (crop.getSize() < crop.getCrop().maxSize()) crop.size++; - if (nutrient) crop.applyFertilizer(true); - crop.waterStorage += 144; - content -= 144; - crop.updateState(); - writeToNBT(stack); - return true; - } else { - if (nutrient) crop.applyFertilizer(true); - crop.waterStorage += 144; - content -= 144; - crop.updateState(); - writeToNBT(stack); - return true; - } - } - } + if (content < 144) { + return false; + } + + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof TileEntityCrop)) { + return false; + } + + TileEntityCrop crop = (TileEntityCrop) te; + if (crop.getCrop() == null) { + return false; } - return false; + + if (debug && crop.getSize() < crop.getCrop().maxSize()) { + crop.size++; + } + + if (nutrient) { + crop.applyFertilizer(true); + } + + crop.waterStorage += 144; + content -= 144; + crop.updateState(); + writeToNBT(stack); + return true; } @Override public FluidStack getFluid(ItemStack container) { - return content == 0 ? null - : nutrient ? FluidRegistry.getFluidStack("fluid.fertiliser", content) - : new FluidStack(FluidRegistry.WATER, content); + if (content == 0) { + return null; + } + + if (nutrient) { + return FluidRegistry.getFluidStack("fluid.fertiliser", content); + } + + return new FluidStack(FluidRegistry.WATER, content); } @Override @@ -114,24 +125,32 @@ public int getCapacity(ItemStack container) { @Override public int fill(ItemStack stack, FluidStack resource, boolean doFill) { - if (resource == null || resource.getFluid() == null) return 0; - - if (!nutrient || content == 0) if ((resource.getFluid().equals(FluidRegistry.WATER) - || resource.getFluid().equals(FluidRegistry.getFluidStack("fluid.fertiliser", content).getFluid()))) { - boolean fert = false; - if (FluidRegistry.getFluidStack("fluid.fertiliser", content) != null) if (resource.getFluid() - .equals(FluidRegistry.getFluidStack("fluid.fertiliser", content).getFluid())) - fert = true; - int toFill = Math.min(resource.amount, (getCapacity(null) - content)); - if (!doFill) return toFill; - else { - nutrient = fert; - content = toFill; - writeToNBT(stack); - return toFill; - } - } + if (resource == null || resource.getFluid() == null) { + return 0; + } + + if (nutrient && content != 0) { + return 0; + } + + if (resource.getFluid().equals(FluidRegistry.WATER) + || resource.getFluid().equals(FluidRegistry.getFluidStack("fluid.fertiliser", content).getFluid())) { + boolean fert = FluidRegistry.getFluidStack("fluid.fertiliser", content) != null + && resource.getFluid().equals(FluidRegistry.getFluidStack("fluid.fertiliser", content).getFluid()); + + int toFill = Math.min(resource.amount, (getCapacity(null) - content)); + + if (doFill) { + nutrient = fert; + content = toFill; + writeToNBT(stack); + } + + return toFill; + } + return 0; + } @Override