diff options
Diffstat (limited to 'src/main/java')
13 files changed, 603 insertions, 584 deletions
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java index 3e65a65275..677ad639c7 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java @@ -1,9 +1,10 @@ package gregtech.api.items; import static gregtech.api.enums.GT_Values.D1; -import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.enums.Mods.AppleCore; import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCannerRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import java.util.ArrayList; import java.util.Arrays; @@ -25,6 +26,7 @@ import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; 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; @@ -142,15 +144,19 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements setFoodBehavior(mOffset + aID, (IFoodStat) tRandomData); if (((IFoodStat) tRandomData).getFoodAction(this, rStack) == EnumAction.eat) { int tFoodValue = ((IFoodStat) tRandomData).getFoodLevel(this, rStack, null); - if (tFoodValue > 0) RA.addCannerRecipe( - rStack, - ItemList.IC2_Food_Can_Empty.get(tFoodValue), - ((IFoodStat) tRandomData).isRotten(this, rStack, null) - ? ItemList.IC2_Food_Can_Spoiled.get(tFoodValue) - : ItemList.IC2_Food_Can_Filled.get(tFoodValue), - null, - tFoodValue * 100, - 1); + if (tFoodValue > 0) { + GT_Values.RA.stdBuilder() + .itemInputs(rStack, ItemList.IC2_Food_Can_Empty.get(tFoodValue)) + .itemOutputs( + ((IFoodStat) tRandomData).isRotten(this, rStack, null) + ? ItemList.IC2_Food_Can_Spoiled.get(tFoodValue) + : ItemList.IC2_Food_Can_Filled.get(tFoodValue)) + .noFluidInputs() + .noFluidOutputs() + .duration(tFoodValue * 5 * SECONDS) + .eut(1) + .addTo(sCannerRecipes); + } } tUseOreDict = false; } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java index 83e658cbfc..bce5e8f92e 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java @@ -1,13 +1,20 @@ package gregtech.api.metatileentity.implementations; -import static gregtech.api.enums.GT_Values.RA; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_Utility.calculateRecipeEU; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import gregtech.api.enums.*; +import gregtech.api.enums.Dyes; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SubTag; +import gregtech.api.enums.TierEU; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -17,6 +24,7 @@ import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_ModHandler.RecipeBits; import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; public class GT_MetaPipeEntity_Frame extends MetaPipeEntity { @@ -36,14 +44,19 @@ public class GT_MetaPipeEntity_Frame extends MetaPipeEntity { new Object[] { "SSS", "SwS", "SSS", 'S', OrePrefixes.stick.get(mMaterial) }); } - if (!aMaterial.contains(SubTag.NO_RECIPES)) { + if (!aMaterial.contains(SubTag.NO_RECIPES) + && GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1) != null) { // Auto generate frame box recipe in an assembler. - RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 4), - ItemList.Circuit_Integrated.getWithDamage(0, 4), - getStackForm(1), - 64, - calculateRecipeEU(aMaterial, 7)); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 4), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(getStackForm(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(calculateRecipeEU(aMaterial, 7)) + .addTo(sAssemblerRecipes); } } diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index 819f8240b0..9313f8f2f5 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -4,6 +4,7 @@ import static gregtech.api.enums.GT_Values.*; import static gregtech.api.enums.Materials.*; import static gregtech.api.enums.Materials.Void; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes; +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_RecipeBuilder.TICKS; import static gregtech.api.util.GT_RecipeConstants.UniversalArcFurnace; @@ -639,90 +640,151 @@ public class GT_RecipeRegistrator { */ public static void registerWiremillRecipes(Materials aMaterial, int baseDuration, int aEUt, OrePrefixes prefix1, OrePrefixes prefix2, int multiplier) { - GT_Values.RA.addWiremillRecipe( - GT_OreDictUnificator.get(prefix1, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, multiplier), - baseDuration, - aEUt); - GT_Values.RA.addWiremillRecipe( - GT_OreDictUnificator.get(prefix1, aMaterial, 2L / multiplier), - GT_Utility.getIntegratedCircuit(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L), - (int) (baseDuration * 1.5f), - aEUt); - GT_Values.RA.addWiremillRecipe( - GT_OreDictUnificator.get(prefix1, aMaterial, 4L / multiplier), - GT_Utility.getIntegratedCircuit(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L), - baseDuration * 2, - aEUt); - GT_Values.RA.addWiremillRecipe( - GT_OreDictUnificator.get(prefix1, aMaterial, 8L / multiplier), - GT_Utility.getIntegratedCircuit(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L), - (int) (baseDuration * 2.5f), - aEUt); - GT_Values.RA.addWiremillRecipe( - GT_OreDictUnificator.get(prefix1, aMaterial, 12L / multiplier), - GT_Utility.getIntegratedCircuit(12), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L), - baseDuration * 3, - aEUt); - GT_Values.RA.addWiremillRecipe( - GT_OreDictUnificator.get(prefix1, aMaterial, 16L / multiplier), - GT_Utility.getIntegratedCircuit(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L), - (int) (baseDuration * 3.5f), - aEUt); - GT_Values.RA.addWiremillRecipe( - GT_OreDictUnificator.get(prefix2, aMaterial, 2L / multiplier), - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L), - baseDuration / 2, - aEUt); - GT_Values.RA.addWiremillRecipe( - GT_OreDictUnificator.get(prefix2, aMaterial, 4L / multiplier), - GT_Utility.getIntegratedCircuit(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L), - baseDuration, - aEUt); - GT_Values.RA.addWiremillRecipe( - GT_OreDictUnificator.get(prefix2, aMaterial, 8L / multiplier), - GT_Utility.getIntegratedCircuit(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L), - (int) (baseDuration * 1.5f), - aEUt); - GT_Values.RA.addWiremillRecipe( - GT_OreDictUnificator.get(prefix2, aMaterial, 16L / multiplier), - GT_Utility.getIntegratedCircuit(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L), - baseDuration * 2, - aEUt); - GT_Values.RA.addWiremillRecipe( - GT_OreDictUnificator.get(prefix2, aMaterial, 24L / multiplier), - GT_Utility.getIntegratedCircuit(12), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L), - (int) (baseDuration * 2.5f), - aEUt); - GT_Values.RA.addWiremillRecipe( - GT_OreDictUnificator.get(prefix2, aMaterial, 32L / multiplier), - GT_Utility.getIntegratedCircuit(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L), - baseDuration * 3, - aEUt); - GT_Values.RA.addWiremillRecipe( - GT_OreDictUnificator.get(prefix1, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(3), - GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L * multiplier), - baseDuration, - aEUt); - GT_Values.RA.addWiremillRecipe( - GT_OreDictUnificator.get(prefix2, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(3), - GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 2L * multiplier), - baseDuration / 2, - aEUt); + if (GT_OreDictUnificator.get(prefix1, aMaterial, 1L) != null + && GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(prefix1, aMaterial, 1L), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, multiplier)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration * TICKS) + .eut(aEUt) + .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix1, aMaterial, 2L / multiplier), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(((int) (baseDuration * 1.5f)) * TICKS) + .eut(aEUt) + .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix1, aMaterial, 4L / multiplier), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration * 2 * TICKS) + .eut(aEUt) + .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix1, aMaterial, 8L / multiplier), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(((int) (baseDuration * 2.5f)) * TICKS) + .eut(aEUt) + .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix1, aMaterial, 12L / multiplier), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration * 3 * TICKS) + .eut(aEUt) + .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix1, aMaterial, 16L / multiplier), + GT_Utility.getIntegratedCircuit(16)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(((int) (baseDuration * 3.5f)) * TICKS) + .eut(aEUt) + .addTo(sWiremillRecipes); + } + + if (GT_OreDictUnificator.get(prefix2, aMaterial, 1L) != null + && GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(prefix2, aMaterial, 1L), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L / multiplier)) + .noFluidInputs() + .noFluidOutputs() + .duration(((int) (baseDuration * 0.5f)) * TICKS) + .eut(aEUt) + .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix2, aMaterial, 4L / multiplier), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration * TICKS) + .eut(aEUt) + .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix2, aMaterial, 8L / multiplier), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(((int) (baseDuration * 1.5f)) * TICKS) + .eut(aEUt) + .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix2, aMaterial, 16L / multiplier), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration * 2 * TICKS) + .eut(aEUt) + .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix2, aMaterial, 24L / multiplier), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(((int) (baseDuration * 2.5f)) * TICKS) + .eut(aEUt) + .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix2, aMaterial, 32L / multiplier), + GT_Utility.getIntegratedCircuit(16)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration * 3 * TICKS) + .eut(aEUt) + .addTo(sWiremillRecipes); + } + if (GT_OreDictUnificator.get(prefix1, aMaterial, 1L) != null + && GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(prefix1, aMaterial, 1L), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L * multiplier)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration * TICKS) + .eut(aEUt) + .addTo(sWiremillRecipes); + } + if (GT_OreDictUnificator.get(prefix2, aMaterial, 1L) != null + && GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(prefix2, aMaterial, 1L), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 2L * multiplier)) + .noFluidInputs() + .noFluidOutputs() + .duration(((int) (baseDuration * 0.5f)) * TICKS) + .eut(aEUt) + .addTo(sWiremillRecipes); + } } public static boolean hasVanillaRecipes(Materials materials) { 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( diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java index bbcacdba17..8cb200919d 100644 --- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java @@ -1,5 +1,8 @@ package gregtech.loaders.load; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCannerRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -113,41 +116,46 @@ public class GT_ItemIterator implements Runnable { GT_Log.out.println( "GT_Mod: Adding Food Recipes to the Automatic Canning Machine. (also during the following Item Iteration)"); - GT_Values.RA.addCannerRecipe( - new ItemStack(Items.rotten_flesh, 2, 32767), - ItemList.IC2_Food_Can_Empty.get(1L), - ItemList.IC2_Food_Can_Spoiled.get(1L), - null, - 200, - 1); - GT_Values.RA.addCannerRecipe( - new ItemStack(Items.spider_eye, 2, 32767), - ItemList.IC2_Food_Can_Empty.get(1L), - ItemList.IC2_Food_Can_Spoiled.get(1L), - null, - 100, - 1); - GT_Values.RA.addCannerRecipe( - ItemList.Food_Poisonous_Potato.get(2L), - ItemList.IC2_Food_Can_Empty.get(1L), - ItemList.IC2_Food_Can_Spoiled.get(1L), - null, - 100, - 1); - GT_Values.RA.addCannerRecipe( - new ItemStack(Items.cake, 1, 32767), - ItemList.IC2_Food_Can_Empty.get(12L), - ItemList.IC2_Food_Can_Filled.get(12L), - null, - 600, - 1); - GT_Values.RA.addCannerRecipe( - new ItemStack(Items.mushroom_stew, 1, 32767), - ItemList.IC2_Food_Can_Empty.get(6L), - ItemList.IC2_Food_Can_Filled.get(6L), - new ItemStack(Items.bowl, 1), - 300, - 1); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.rotten_flesh, 2, 32767), ItemList.IC2_Food_Can_Empty.get(1L)) + .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(1) + .addTo(sCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.spider_eye, 2, 32767), ItemList.IC2_Food_Can_Empty.get(1L)) + .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(1) + .addTo(sCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Poisonous_Potato.get(2L), ItemList.IC2_Food_Can_Empty.get(1L)) + .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(1) + .addTo(sCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.cake, 1, 32767), ItemList.IC2_Food_Can_Empty.get(12L)) + .itemOutputs(ItemList.IC2_Food_Can_Filled.get(12L)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(1) + .addTo(sCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.mushroom_stew, 1, 32767), ItemList.IC2_Food_Can_Empty.get(6L)) + .itemOutputs(ItemList.IC2_Food_Can_Filled.get(6L), new ItemStack(Items.bowl, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(1) + .addTo(sCannerRecipes); GT_Log.out.println("GT_Mod: Scanning ItemList."); @@ -204,13 +212,18 @@ public class GT_ItemIterator implements Runnable { && (tItem != ItemList.IC2_Food_Can_Spoiled.getItem())) { int tFoodValue = ((ItemFood) tItem).func_150905_g(new ItemStack(tItem, 1, 0)); if (tFoodValue > 0) { - GT_Values.RA.addCannerRecipe( - new ItemStack(tItem, 1, 32767), - ItemList.IC2_Food_Can_Empty.get(tFoodValue), - |