diff options
author | chochem <40274384+chochem@users.noreply.github.com> | 2023-05-17 18:38:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-17 19:38:56 +0200 |
commit | 4323ab8af257370237d8fd312e9e4024bccc67ab (patch) | |
tree | 46b51d9db218e6a5b18518f4d42bb0325e729d72 /src/main/java/gregtech/common | |
parent | 8e59f92c37c7d035c9c914aff4dbedfb77f0fec9 (diff) | |
download | GT5-Unofficial-4323ab8af257370237d8fd312e9e4024bccc67ab.tar.gz GT5-Unofficial-4323ab8af257370237d8fd312e9e4024bccc67ab.tar.bz2 GT5-Unofficial-4323ab8af257370237d8fd312e9e4024bccc67ab.zip |
More RA2 conversion for automatic gt recipes (#2000)
* fully convert all wiremill recipes and clean up unnecessary duplicate code
* fully convert all polarizer recipes
* fully convert all canner recipes
* RA2 for oredict plank recipes
* RA2 for oredict stoneCobble recipes
* convert some assembler recipes to RA2
* fix
* fix2
* remove recipes that were never in the game
Diffstat (limited to 'src/main/java/gregtech/common')
3 files changed, 126 insertions, 85 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 0946811ff6..1e770b81c3 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -8,6 +8,7 @@ import static gregtech.api.enums.FluidState.PLASMA; import static gregtech.api.enums.GT_Values.W; import static gregtech.api.enums.GT_Values.debugEntityCramming; import static gregtech.api.enums.Mods.*; +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; import static gregtech.api.util.GT_Util.LAST_BROKEN_TILEENTITY; @@ -1936,16 +1937,22 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG Materials.Brass, new ItemStack(aEvent.Ore.getItem(), 1, 2)); if (!mDisableIC2Cables) { - GT_Values.RA.addWiremillRecipe( - GT_ModHandler.getIC2Item("copperCableItem", 3L), - new ItemStack(aEvent.Ore.getItem(), 1, 8), - 400, - 1); - GT_Values.RA.addWiremillRecipe( - GT_ModHandler.getIC2Item("ironCableItem", 6L), - new ItemStack(aEvent.Ore.getItem(), 1, 9), - 400, - 2); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("copperCableItem", 3L)) + .itemOutputs(new ItemStack(aEvent.Ore.getItem(), 1, 8)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(1) + .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("ironCableItem", 6L)) + .itemOutputs(new ItemStack(aEvent.Ore.getItem(), 1, 9)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sWiremillRecipes); } GT_Values.RA.addCutterRecipe( new ItemStack(aEvent.Ore.getItem(), 1, 3), diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java index 138d7a6e8a..0cfa6477fd 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java @@ -1,5 +1,6 @@ package gregtech.common.blocks; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -65,18 +66,22 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe } private void registerAssemblerRecipes() { - GT_Values.RA.addAssemblerRecipe( - new ItemStack(this, 1, 0), - ItemList.Circuit_Integrated.getWithDamage(0L, 4L), - new ItemStack(this, 1, 3), - 50, - 4); - GT_Values.RA.addAssemblerRecipe( - new ItemStack(this, 1, 8), - ItemList.Circuit_Integrated.getWithDamage(0L, 4L), - new ItemStack(this, 1, 11), - 50, - 4); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(this, 1, 0), GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(new ItemStack(this, 1, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(4) + .addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(this, 1, 8), GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(new ItemStack(this, 1, 11)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(4) + .addTo(sAssemblerRecipes); } private void registerCraftingRecipes() { diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 53daa4d813..cb96330058 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -2,7 +2,9 @@ package gregtech.common.items; import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCannerRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes; +import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.client.GT_TooltipHandler.Tier.*; import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; @@ -1726,69 +1728,96 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_ModHandler.addExtractionRecipe(ItemList.Battery_RE_HV_Lithium.get(1L), ItemList.Battery_Hull_HV.get(1L)); GT_ModHandler.addExtractionRecipe(ItemList.Battery_RE_HV_Sodium.get(1L), ItemList.Battery_Hull_HV.get(1L)); - GT_Values.RA.addCannerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 2L), - ItemList.Battery_Hull_LV.get(1L), - ItemList.Battery_RE_LV_Cadmium.get(1L), - null, - 100, - 2); - GT_Values.RA.addCannerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 2L), - ItemList.Battery_Hull_LV.get(1L), - ItemList.Battery_RE_LV_Lithium.get(1L), - null, - 100, - 2); - GT_Values.RA.addCannerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2L), - ItemList.Battery_Hull_LV.get(1L), - ItemList.Battery_RE_LV_Sodium.get(1L), - null, - 100, - 2); - GT_Values.RA.addCannerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 8L), - ItemList.Battery_Hull_MV.get(1L), - ItemList.Battery_RE_MV_Cadmium.get(1L), - null, - 400, - 2); - GT_Values.RA.addCannerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 8L), - ItemList.Battery_Hull_MV.get(1L), - ItemList.Battery_RE_MV_Lithium.get(1L), - null, - 400, - 2); - GT_Values.RA.addCannerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 8L), - ItemList.Battery_Hull_MV.get(1L), - ItemList.Battery_RE_MV_Sodium.get(1L), - null, - 400, - 2); - GT_Values.RA.addCannerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 32L), - ItemList.Battery_Hull_HV.get(1L), - ItemList.Battery_RE_HV_Cadmium.get(1L), - null, - 1600, - 2); - GT_Values.RA.addCannerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 32L), - ItemList.Battery_Hull_HV.get(1L), - ItemList.Battery_RE_HV_Lithium.get(1L), - null, - 1600, - 2); - GT_Values.RA.addCannerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 32L), - ItemList.Battery_Hull_HV.get(1L), - ItemList.Battery_RE_HV_Sodium.get(1L), - null, - 1600, - 2); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 2L), + ItemList.Battery_Hull_LV.get(1L)) + .itemOutputs(ItemList.Battery_RE_LV_Cadmium.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(2) + .addTo(sCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 2L), + ItemList.Battery_Hull_LV.get(1L)) + .itemOutputs(ItemList.Battery_RE_LV_Lithium.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(2) + .addTo(sCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2L), + ItemList.Battery_Hull_LV.get(1L)) + .itemOutputs(ItemList.Battery_RE_LV_Sodium.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(2) + .addTo(sCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 8L), + ItemList.Battery_Hull_MV.get(1L)) + .itemOutputs(ItemList.Battery_RE_MV_Cadmium.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 8L), + ItemList.Battery_Hull_MV.get(1L)) + .itemOutputs(ItemList.Battery_RE_MV_Lithium.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 8L), + ItemList.Battery_Hull_MV.get(1L)) + .itemOutputs(ItemList.Battery_RE_MV_Sodium.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 32L), + ItemList.Battery_Hull_HV.get(1L)) + .itemOutputs(ItemList.Battery_RE_HV_Cadmium.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(sCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 32L), + ItemList.Battery_Hull_HV.get(1L)) + .itemOutputs(ItemList.Battery_RE_HV_Lithium.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(sCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 32L), + ItemList.Battery_Hull_HV.get(1L)) + .itemOutputs(ItemList.Battery_RE_HV_Sodium.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(sCannerRecipes); // IV Battery ItemList.Energy_LapotronicOrb.set( |