diff options
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java | 35 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java | 88 |
2 files changed, 123 insertions, 0 deletions
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java index 38eb8bc7c7..9acf0c61bd 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java @@ -11,9 +11,11 @@ import static gregtech.api.util.GTRecipeConstants.UniversalArcFurnace; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.util.GTOreDictUnificator; +import gtPlusPlus.core.material.MaterialsElements; public class ArcFurnaceRecipes implements Runnable { @@ -473,5 +475,38 @@ public class ArcFurnaceRecipes implements Runnable { .eut((int) TierEU.RECIPE_LV) .addTo(arcFurnaceRecipes); + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Infinity.get(1)) + .itemOutputs( + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Infinity, 9L), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.DraconiumAwakened, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 24L)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_UHV) + .metadata(RECYCLE, true) + .addTo(UniversalArcFurnace); + + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Hypogen.get(1)) + .itemOutputs( + MaterialsElements.STANDALONE.HYPOGEN.getIngot(9), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Infinity, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 48L)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_UEV) + .metadata(RECYCLE, true) + .addTo(UniversalArcFurnace); + + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Eternal.get(1)) + .itemOutputs( + GTOreDictUnificator.get(OrePrefixes.ingot, MaterialsUEVplus.SpaceTime, 9L), + MaterialsElements.STANDALONE.HYPOGEN.getIngot(4), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 64L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 64L)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_UIV) + .metadata(RECYCLE, true) + .addTo(UniversalArcFurnace); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java index 84af3860b2..83b39c01b2 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java +++ b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java @@ -18,9 +18,12 @@ import net.minecraft.item.ItemStack; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; +import gregtech.api.recipe.RecipeCategories; import gregtech.api.util.GTOreDictUnificator; +import gtPlusPlus.core.material.MaterialsElements; import gtnhlanth.common.register.WerkstoffMaterialPool; public class Pulverizer implements Runnable { @@ -34,6 +37,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 19)) .duration(15 * SECONDS) .eut(4) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -43,6 +47,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 7)) .duration(15 * SECONDS) .eut(4) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -50,6 +55,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 2)) .duration(10 * TICKS) .eut(4) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -59,6 +65,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 1)) .duration(10 * TICKS) .eut(4) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); } @@ -92,6 +99,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 2)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -102,6 +110,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 3)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -112,6 +121,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 4)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -122,6 +132,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 5)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -132,6 +143,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 6)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -142,6 +154,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 7)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -152,6 +165,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 8)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -162,6 +176,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 9)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -172,6 +187,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 10)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -182,6 +198,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 11)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -192,6 +209,41 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 12)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) + .recipeCategory(RecipeCategories.maceratorRecycling) + .addTo(maceratorRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Infinity.get(1)) + .itemOutputs( + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 9L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 24L)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_UHV) + .recipeCategory(RecipeCategories.maceratorRecycling) + .addTo(maceratorRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Hypogen.get(1)) + .itemOutputs( + MaterialsElements.STANDALONE.HYPOGEN.getDust(9), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 48L)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_UEV) + .recipeCategory(RecipeCategories.maceratorRecycling) + .addTo(maceratorRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Eternal.get(1)) + .itemOutputs( + GTOreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.SpaceTime, 9L), + MaterialsElements.STANDALONE.HYPOGEN.getDust(4), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 64L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 64L)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_UIV) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); if (Railcraft.isModLoaded()) { @@ -203,6 +255,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2)) .duration(15 * SECONDS) .eut(2) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -212,6 +265,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(15 * SECONDS) .eut(2) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -221,6 +275,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 3)) .duration(15 * SECONDS) .eut(2) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); // Steel @@ -230,6 +285,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2)) .duration(15 * SECONDS) .eut(2) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -239,6 +295,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(15 * SECONDS) .eut(2) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -248,6 +305,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Steel, 3)) .duration(15 * SECONDS) .eut(2) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); // Aluminium @@ -257,6 +315,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 2)) .duration(22 * SECONDS + 10 * TICKS) .eut(8) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -266,6 +325,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(22 * SECONDS + 10 * TICKS) .eut(8) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -275,6 +335,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Aluminium, 3)) .duration(22 * SECONDS + 10 * TICKS) .eut(8) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); // Stainless Steel @@ -284,6 +345,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 2)) .duration(30 * SECONDS) .eut(16) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -293,6 +355,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(30 * SECONDS) .eut(16) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -302,6 +365,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.StainlessSteel, 3)) .duration(30 * SECONDS) .eut(16) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); // Titanium @@ -311,6 +375,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 2)) .duration(30 * SECONDS) .eut(30) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -320,6 +385,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(30 * SECONDS) .eut(30) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -329,6 +395,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 3)) .duration(30 * SECONDS) .eut(30) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); // Tungesten Steel @@ -338,6 +405,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 2)) .duration(30 * SECONDS) .eut(30) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -347,6 +415,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(30 * SECONDS) .eut(30) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -356,6 +425,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.TungstenSteel, 3)) .duration(30 * SECONDS) .eut(30) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); // Palladium @@ -365,6 +435,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 2)) .duration(37 * SECONDS + 10 * TICKS) .eut(64) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -374,6 +445,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(37 * SECONDS + 10 * TICKS) .eut(64) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -383,6 +455,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Chrome, 3)) .duration(37 * SECONDS + 10 * TICKS) .eut(64) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); // Iridium @@ -392,6 +465,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 2)) .duration(45 * SECONDS) .eut(TierEU.RECIPE_MV) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -401,6 +475,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(45 * SECONDS) .eut(TierEU.RECIPE_MV) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -410,6 +485,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iridium, 3)) .duration(45 * SECONDS) .eut(TierEU.RECIPE_MV) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); // Osmium @@ -419,6 +495,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 2)) .duration(52 * SECONDS + 10 * TICKS) .eut(256) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -428,6 +505,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(52 * SECONDS + 10 * TICKS) .eut(256) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -437,6 +515,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Osmium, 3)) .duration(52 * SECONDS + 10 * TICKS) .eut(256) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); // Neutronium @@ -446,6 +525,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 2)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_HV) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -455,6 +535,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_HV) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -464,6 +545,7 @@ public class Pulverizer implements Runnable { GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neutronium, 3)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_HV) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); } @@ -480,6 +562,7 @@ public class Pulverizer implements Runnable { .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 45)) .duration(20 * SECONDS) .eut(2) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); } @@ -546,6 +629,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 6)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -556,6 +640,7 @@ public class Pulverizer implements Runnable { .outputChances(10000, 9500) .duration(20 * SECONDS) .eut(2) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -566,6 +651,7 @@ public class Pulverizer implements Runnable { .outputChances(10000, 9500) .duration(20 * SECONDS) .eut(2) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -580,6 +666,7 @@ public class Pulverizer implements Runnable { .itemOutputs(Materials.Brick.getDustSmall(6)) .duration(20 * SECONDS) .eut(2) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); GTValues.RA.stdBuilder() @@ -587,6 +674,7 @@ public class Pulverizer implements Runnable { .itemOutputs(Materials.Brick.getDust(8), Materials.Iron.getDust(1)) .duration(20 * SECONDS) .eut(2) + .recipeCategory(RecipeCategories.maceratorRecycling) .addTo(maceratorRecipes); if (HardcoreEnderExpansion.isModLoaded()) { |