diff options
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 47 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java | 159 |
2 files changed, 129 insertions, 77 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 2da2b883ca..087e450c69 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -31,6 +31,8 @@ import static gregtech.api.enums.Mods.ThaumicBoots; import static gregtech.api.enums.Mods.ThaumicTinkerer; import static gregtech.api.enums.Mods.TwilightForest; import static gregtech.api.enums.Mods.WitchingGadgets; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCrackingRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCutterRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sWiremillRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; @@ -2001,12 +2003,15 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG .eut(2) .addTo(sWiremillRecipes); } - GT_Values.RA.addCutterRecipe( - new ItemStack(aEvent.Ore.getItem(), 1, 3), - new ItemStack(aEvent.Ore.getItem(), 16, 4), - null, - 400, - 8); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(aEvent.Ore.getItem(), 1, 3)) + .itemOutputs(new ItemStack(aEvent.Ore.getItem(), 16, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(8) + .addTo(sCutterRecipes); } } default -> {} @@ -2577,13 +2582,14 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG .asFluid(); int hydrogenAmount = 2 * i + 2; - GT_Values.RA.addCrackingRecipe( - i + 1, - new FluidStack(uncrackedFluid, 1000), - Materials.Hydrogen.getGas(hydrogenAmount * 800), - new FluidStack(crackedFluids[i], 1000), - 20 + 20 * i, - 240); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(i + 1)) + .noItemOutputs() + .fluidInputs(new FluidStack(uncrackedFluid, 1000), Materials.Hydrogen.getGas(hydrogenAmount * 800)) + .fluidOutputs(new FluidStack(crackedFluids[i], 1000)) + .duration((1 + i) * SECONDS) + .eut(240) + .addTo(sCrackingRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Hydrogen.getCells(hydrogenAmount), GT_Utility.getIntegratedCircuit(i + 1)) @@ -2629,13 +2635,14 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG ItemList.Cell_Empty.get(1L)) .asFluid(); - GT_Values.RA.addCrackingRecipe( - i + 1, - new FluidStack(uncrackedFluid, 1000), - GT_ModHandler.getSteam(1000), - new FluidStack(crackedFluids[i], 1200), - 20 + 20 * i, - 240); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(i + 1)) + .noItemOutputs() + .fluidInputs(new FluidStack(uncrackedFluid, 1000), GT_ModHandler.getSteam(1000)) + .fluidOutputs(new FluidStack(crackedFluids[i], 1200)) + .duration((1 + i) * SECONDS) + .eut(240) + .addTo(sCrackingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("steamCell", 1L), GT_Utility.getIntegratedCircuit(i + 1)) diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index b3046616b5..ed9127bf62 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -9,8 +9,10 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_WIRELESS_ITEM_DETEC import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_WIRELESS_MAINTENANCE_DETECTOR; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeBuilder.WILDCARD; import net.minecraft.dispenser.IBlockSource; import net.minecraft.enchantment.Enchantment; @@ -2634,63 +2636,106 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { .addTo(sCompressorRecipes); } - GT_ModHandler.addPulverisationRecipe( - ItemList.Food_Sliced_Cheese.get(1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cheese, 1L)); - GT_ModHandler.addPulverisationRecipe( - ItemList.Dye_Cocoa.get(1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)); - GT_ModHandler.addPulverisationRecipe( - ItemList.Crop_Drop_Tine.get(1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L)); - GT_ModHandler.addPulverisationRecipe( - new ItemStack(Blocks.melon_block, 1, 0), - new ItemStack(Items.melon, 8, 0), - new ItemStack(Items.melon_seeds, 1), - 80, - false); - GT_ModHandler.addPulverisationRecipe( - new ItemStack(Blocks.pumpkin, 1, 0), - new ItemStack(Items.pumpkin_seeds, 4, 0), - null, - 0, - false); - GT_ModHandler.addPulverisationRecipe( - new ItemStack(Items.melon, 1, 0), - new ItemStack(Items.melon_seeds, 1, 0), - null, - 0, - false); - GT_ModHandler.addPulverisationRecipe( - new ItemStack(Items.wheat, 1, 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L), - null, - 0, - false); - GT_ModHandler.addPulverisationRecipe( - GT_ModHandler.getIC2Item("crop", 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), - null, - 0, - false); - GT_ModHandler.addPulverisationRecipe( - new ItemStack(Items.stick, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L), - null, - 0, - false); - GT_ModHandler.addPulverisationRecipe( - new ItemStack(Blocks.wool, 1, 32767), - new ItemStack(Items.string, 2), - new ItemStack(Items.string, 1), - 50, - false); - GT_ModHandler.addPulverisationRecipe( - ItemList.Tesseract.get(1), - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 8L) }, - new int[] { 10000 }, - 32_000_000, - 100); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Sliced_Cheese.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cheese, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Dye_Cocoa.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Tine.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.melon_block, 1, 0)) + .itemOutputs(new ItemStack(Items.melon, 8, 0), new ItemStack(Items.melon_seeds, 1)) + .outputChances(10000, 8000) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.pumpkin, 1, 0)) + .itemOutputs(new ItemStack(Items.pumpkin_seeds, 4, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.melon, 1, 0)) + .itemOutputs(new ItemStack(Items.melon_seeds, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.wheat, 1, 0)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("crop", 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.stick, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.wool, 1, WILDCARD)) + .itemOutputs(new ItemStack(Items.string, 2), new ItemStack(Items.string, 1)) + .outputChances(10000, 5000) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Tesseract.get(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 8L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(32_000_000) + .addTo(sMaceratorRecipes); try { CropCard tCrop; GT_Utility.getField(tCrop = Crops.instance.getCropList()[13], "mDrop") |