diff options
Diffstat (limited to 'src/main/java/gregtech/api/util')
4 files changed, 9 insertions, 65 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index eedd568ebb..9f266ba550 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -1219,41 +1219,6 @@ public class GT_Recipe implements Comparable<GT_Recipe> { false).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_FURNACE) .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); - /** Set {@code aSpecialValue = -100} to bypass the disassembler tier check and default recipe duration. */ - public static final GT_Recipe_Map sDisassemblerRecipes = new GT_Recipe_Map( - new HashSet<>(250), - "gt.recipe.disassembler", - "Disassembler", - null, - GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Disassembler"), - 1, - 9, - 1, - 0, - 1, - E, - 1, - E, - true, - false) { - - @Override - public IDrawable getOverlayForSlot(boolean isFluid, boolean isOutput, int index, boolean isSpecial) { - if (isOutput) { - switch (index) { - case 0, 2, 6, 8 -> { - return GT_UITextures.OVERLAY_SLOT_CIRCUIT; - } - case 4 -> { - return GT_UITextures.OVERLAY_SLOT_WRENCH; - } - } - } - return super.getOverlayForSlot(isFluid, isOutput, index, isSpecial); - } - }.setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_WRENCH) - .setProgressBar(GT_UITextures.PROGRESSBAR_ASSEMBLE, ProgressBar.Direction.RIGHT); - public static final GT_Recipe_Map sScannerFakeRecipes = new GT_Recipe_Map( new HashSet<>(300), "gt.recipe.scanner", @@ -1357,7 +1322,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { null, GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "PlasmaArcFurnace"), 1, - 4, + 9, 1, 1, 1, @@ -1377,7 +1342,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { null, GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "ArcFurnace"), 1, - 4, + 9, 1, 1, 3, diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index 19afbb9ff0..2c08e461b7 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -327,7 +327,12 @@ public class GT_RecipeRegistrator { new ItemStack[] { GT_OreDictUnificator.getIngotOrDust(aData.mMaterial), GT_OreDictUnificator.getIngotOrDust(aData.getByProduct(0)), GT_OreDictUnificator.getIngotOrDust(aData.getByProduct(1)), - GT_OreDictUnificator.getIngotOrDust(aData.getByProduct(2)) }, + GT_OreDictUnificator.getIngotOrDust(aData.getByProduct(2)), + GT_OreDictUnificator.getIngotOrDust(aData.getByProduct(3)), + GT_OreDictUnificator.getIngotOrDust(aData.getByProduct(5)), + GT_OreDictUnificator.getIngotOrDust(aData.getByProduct(6)), + GT_OreDictUnificator.getIngotOrDust(aData.getByProduct(7)), + GT_OreDictUnificator.getIngotOrDust(aData.getByProduct(8)) }, null, (int) Math.max(16, tAmount / M), 90, diff --git a/src/main/java/gregtech/api/util/GT_Shaped_Recipe.java b/src/main/java/gregtech/api/util/GT_Shaped_Recipe.java index 982c0e8f35..02bc0ba0bf 100644 --- a/src/main/java/gregtech/api/util/GT_Shaped_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Shaped_Recipe.java @@ -9,7 +9,6 @@ import net.minecraft.world.World; import net.minecraftforge.oredict.ShapedOreRecipe; import gregtech.api.interfaces.internal.IGT_CraftingRecipe; -import gregtech.api.objects.ReverseShapedRecipe; public class GT_Shaped_Recipe extends ShapedOreRecipe implements IGT_CraftingRecipe { @@ -24,9 +23,6 @@ public class GT_Shaped_Recipe extends ShapedOreRecipe implements IGT_CraftingRec mEnchantmentLevelsAdded = aEnchantmentLevelsAdded; mRemovableByGT = aRemovableByGT; mKeepingNBT = aKeepingNBT; - if (aDismantleAble) { - new ReverseShapedRecipe(aResult, aRecipe); - } } @Override diff --git a/src/main/java/gregtech/api/util/GT_Shapeless_Recipe.java b/src/main/java/gregtech/api/util/GT_Shapeless_Recipe.java index fc1d523ecc..93ba33da31 100644 --- a/src/main/java/gregtech/api/util/GT_Shapeless_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Shapeless_Recipe.java @@ -9,11 +9,10 @@ import net.minecraft.world.World; import net.minecraftforge.oredict.ShapelessOreRecipe; import gregtech.api.interfaces.internal.IGT_CraftingRecipe; -import gregtech.api.objects.ReverseShapelessRecipe; public class GT_Shapeless_Recipe extends ShapelessOreRecipe implements IGT_CraftingRecipe { - public final boolean /* mDismantleable, */ mRemovableByGT, mKeepingNBT; + public final boolean mRemovableByGT, mKeepingNBT; private final Enchantment[] mEnchantmentsAdded; private final int[] mEnchantmentLevelsAdded; @@ -24,9 +23,6 @@ public class GT_Shapeless_Recipe extends ShapelessOreRecipe implements IGT_Craft mEnchantmentLevelsAdded = aEnchantmentLevelsAdded; mRemovableByGT = aRemovableByGT; mKeepingNBT = aKeepingNBT; - if (aDismantleAble) { - new ReverseShapelessRecipe(aResult, aRecipe); - } } @Override @@ -84,24 +80,6 @@ public class GT_Shapeless_Recipe extends ShapelessOreRecipe implements IGT_Craft if (tCharge > 0) GT_ModHandler.chargeElectricItem(rStack, tCharge, Integer.MAX_VALUE, true, false); } - // Saving Ingredients inside the Item. - // if (mDismantleable) { - // NBTTagCompound rNBT = rStack.getTagCompound(), tNBT = new NBTTagCompound(); - // if (rNBT == null) rNBT = new NBTTagCompound(); - // for (int i = 0; i < 9; i++) { - // ItemStack tStack = aGrid.getStackInSlot(i); - // if (tStack != null && GT_Utility.getContainerItem(tStack, true) == null && - // !(tStack.getItem() instanceof GT_MetaGenerated_Tool)) { - // tStack = GT_Utility.copyAmount(1, tStack); - // GT_ModHandler.dischargeElectricItem(tStack, Integer.MAX_VALUE, Integer.MAX_VALUE, - // true, false, true); - // tNBT.setTag("Ingredient." + i, tStack.writeToNBT(new NBTTagCompound())); - // } - // } - // rNBT.setTag("GT.CraftingComponents", tNBT); - // rStack.setTagCompound(rNBT); - // } - // Add Enchantments for (int i = 0; i < mEnchantmentsAdded.length; i++) GT_Utility.ItemNBT.addEnchantment( rStack, |