From f3e84bcda00018fecb09e71c482a8e3732a43874 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Sun, 14 Jan 2024 11:01:02 +0000 Subject: [PATCH] RA2 EMT --- .../common/loader/EMT_GT_Loader.java | 15 +++++------ .../init/EMT_GTNH_Recipes_And_Researches.java | 24 ------------------ src/main/java/emt/tile/solar/Solars.java | 25 ++++++++----------- 3 files changed, 19 insertions(+), 45 deletions(-) diff --git a/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java b/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java index 1178a81..d8ac336 100644 --- a/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java +++ b/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java @@ -1,6 +1,8 @@ package emt.gthandler.common.loader; import static emt.command.CommandOutputs.mkbook; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -10,6 +12,7 @@ import emt.tile.GT_MetaTileEntity_ResearchCompleter; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_OreDictUnificator; import thaumcraft.common.config.ConfigItems; @@ -27,13 +30,11 @@ public class EMT_GT_Loader implements Runnable { } public void runlate() { - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { new ItemStack(Items.book), + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Items.book), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1L), - new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE) }, - GT_Values.NF, - mkbook(), - 128, - 64); + new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE)) + .itemOutputs(mkbook()).duration(6 * SECONDS).eut(TierEU.RECIPE_MV / 2).addTo(assemblerRecipes); } } diff --git a/src/main/java/emt/init/EMT_GTNH_Recipes_And_Researches.java b/src/main/java/emt/init/EMT_GTNH_Recipes_And_Researches.java index 407eaad..0b872b1 100644 --- a/src/main/java/emt/init/EMT_GTNH_Recipes_And_Researches.java +++ b/src/main/java/emt/init/EMT_GTNH_Recipes_And_Researches.java @@ -45,30 +45,6 @@ public class EMT_GTNH_Recipes_And_Researches implements Runnable { @Override public void run() { - // ItemStack glue =new ItemStack(EMTItems.itemEMTItems,1,8); - // HashSet recipesHashSet = new HashSet<>(); - // recipesHashSet.add(new ShapelessRecipes(glue, - // Arrays.asList(GT_ModHandler.getModItem("TConstruct","materials",1,36),GT_ModHandler.getModItem("TConstruct","materials",1,36)))); - // recipesHashSet.add(new ShapelessRecipes(glue, - // Collections.singletonList(GT_ModHandler.getModItem("TConstruct", "materials", 2, 36)))); - // for ( ShapelessRecipes sr : recipesHashSet) - // CraftingManager.getInstance().getRecipeList().add(sr); - // - // //Rubber ball recipes - // - // GT_Values.RA.addAlloySmelterRecipe(Materials.RubberTreeSap.getDust(4),ItemList.Shape_Mold_Ball.get(0),new - // ItemStack(EMTItems.itemEMTItems,1,10),200,16); - // GT_Values.RA.addAssemblerRecipe(new ItemStack[]{new ItemStack(Items.paper,12),new - // ItemStack(EMTItems.itemEMTItems,1,10)},Materials.Glue.getMolten(6912),new - // ItemStack(EMTItems.itemEMTItems,1,9),600,30); - // - // GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ball.get(0),Materials.Rubber.getMolten(576),new - // ItemStack(EMTItems.itemEMTItems,1,10),100,30); - // GT_Values.RA.addPulveriserRecipe(new ItemStack(EMTItems.itemEMTItems,1,10),new - // ItemStack[]{Materials.Rubber.getDust(4)},null,300,2); - // GT_Values.RA.addFormingPressRecipe(Materials.Rubber.getPlates(4),ItemList.Shape_Mold_Ball.get(0),new - // ItemStack(EMTItems.itemEMTItems,1,10),100,30); - EMTResearches.addResearchTab(); runArcaneRecipes(); runResreaches(); diff --git a/src/main/java/emt/tile/solar/Solars.java b/src/main/java/emt/tile/solar/Solars.java index a9f9f1a..38dd355 100644 --- a/src/main/java/emt/tile/solar/Solars.java +++ b/src/main/java/emt/tile/solar/Solars.java @@ -1,5 +1,7 @@ package emt.tile.solar; +import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static thaumcraft.api.aspects.Aspect.*; import java.util.LinkedHashMap; @@ -12,6 +14,7 @@ import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; +import gregtech.api.enums.TierEU; import thaumcraft.api.aspects.Aspect; // Solar Factory @@ -133,20 +136,14 @@ public enum Solars { public static void registerReverseRecipes() { for (Solars s : Solars.values()) { if (s.aspect != null) { - // ItemStack aInput, FluidStack aBathingFluid, ItemStack aOutput1, ItemStack aOutput2, ItemStack - // aOutput3, int[] aChances, int aDuration, int aEUt - GT_Values.RA.addChemicalBathRecipe( - new ItemStack(EMTBlocks.solars[s.instance], 1, s.meta), - Materials.Chlorine.getGas(1000), - new ItemStack( - EMTBlocks.solars[getBaseSolar(s.output).instance], - 1, - getBaseSolar(s.output).meta), - null, - null, - null, - 30, - 30); + GT_Values.RA.stdBuilder().itemInputs(new ItemStack(EMTBlocks.solars[s.instance], 1, s.meta)) + .fluidInputs(Materials.Chlorine.getGas(1000)) + .itemOutputs( + new ItemStack( + EMTBlocks.solars[getBaseSolar(s.output).instance], + 1, + getBaseSolar(s.output).meta)) + .duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(chemicalBathRecipes); } } }