From 6fffceea470bcede71582da257270ecfbbed27c6 Mon Sep 17 00:00:00 2001 From: miozune Date: Sat, 9 Sep 2023 23:26:57 +0900 Subject: Deprecate GT_RecipeBuilder#noXXXYYY methods (#2284) * Deprecate GT_RecipeBuilder#noXXXYYY methods * Remove existing references --- .../gregtech/api/items/GT_MetaGenerated_Item.java | 2 - .../implementations/GT_MetaPipeEntity_Frame.java | 2 - src/main/java/gregtech/api/util/GT_ModHandler.java | 2 - src/main/java/gregtech/api/util/GT_Recipe.java | 2 - .../java/gregtech/api/util/GT_RecipeBuilder.java | 84 +- .../java/gregtech/api/util/GT_RecipeMapUtil.java | 16 +- .../gregtech/api/util/GT_RecipeRegistrator.java | 33 - src/main/java/gregtech/common/GT_Proxy.java | 4 - .../common/blocks/GT_Block_Stones_Abstract.java | 16 - src/main/java/gregtech/common/fluid/GT_Fluid.java | 1 - .../common/items/GT_MetaGenerated_Item_01.java | 112 --- .../common/items/GT_MetaGenerated_Item_02.java | 34 - src/main/java/gregtech/common/items/ItemComb.java | 9 +- src/main/java/gregtech/common/items/ItemDrop.java | 10 +- .../java/gregtech/common/items/ItemPropolis.java | 3 - .../java/gregtech/loaders/load/GT_FuelLoader.java | 15 - .../gregtech/loaders/load/GT_ItemIterator.java | 22 +- .../load/GT_Loader_MetaTileEntities_Recipes.java | 7 - .../loaders/oreprocessing/ProcessingArrows.java | 5 - .../loaders/oreprocessing/ProcessingBlock.java | 13 - .../loaders/oreprocessing/ProcessingCell.java | 24 +- .../loaders/oreprocessing/ProcessingCrafting.java | 101 -- .../loaders/oreprocessing/ProcessingCrate.java | 16 - .../loaders/oreprocessing/ProcessingCrop.java | 23 - .../oreprocessing/ProcessingCrushedOre.java | 8 - .../oreprocessing/ProcessingCrystallized.java | 2 - .../loaders/oreprocessing/ProcessingDirty.java | 7 - .../loaders/oreprocessing/ProcessingDust.java | 73 +- .../loaders/oreprocessing/ProcessingDye.java | 3 - .../loaders/oreprocessing/ProcessingFoil.java | 2 - .../loaders/oreprocessing/ProcessingFood.java | 16 - .../loaders/oreprocessing/ProcessingGear.java | 2 - .../loaders/oreprocessing/ProcessingGem.java | 89 -- .../loaders/oreprocessing/ProcessingIngot.java | 34 - .../loaders/oreprocessing/ProcessingLens.java | 14 +- .../loaders/oreprocessing/ProcessingLog.java | 28 - .../loaders/oreprocessing/ProcessingNugget.java | 7 - .../loaders/oreprocessing/ProcessingOre.java | 11 - .../loaders/oreprocessing/ProcessingOrePoor.java | 2 - .../oreprocessing/ProcessingOreSmelting.java | 21 +- .../loaders/oreprocessing/ProcessingPipe.java | 6 - .../loaders/oreprocessing/ProcessingPlank.java | 18 - .../loaders/oreprocessing/ProcessingPlate.java | 44 - .../loaders/oreprocessing/ProcessingPure.java | 2 - .../loaders/oreprocessing/ProcessingRecycling.java | 4 +- .../loaders/oreprocessing/ProcessingRotor.java | 6 - .../loaders/oreprocessing/ProcessingRound.java | 2 - .../loaders/oreprocessing/ProcessingSand.java | 2 - .../loaders/oreprocessing/ProcessingSaplings.java | 6 - .../loaders/oreprocessing/ProcessingScrew.java | 2 - .../loaders/oreprocessing/ProcessingShaping.java | 110 -- .../loaders/oreprocessing/ProcessingSlab.java | 1 - .../loaders/oreprocessing/ProcessingStick.java | 9 - .../loaders/oreprocessing/ProcessingStickLong.java | 5 - .../loaders/oreprocessing/ProcessingStone.java | 54 - .../oreprocessing/ProcessingStoneCobble.java | 2 - .../loaders/oreprocessing/ProcessingToolHead.java | 36 - .../oreprocessing/ProcessingTransforming.java | 16 - .../loaders/oreprocessing/ProcessingWax.java | 3 - .../loaders/oreprocessing/ProcessingWire.java | 40 - .../postload/chains/GT_BauxiteRefineChain.java | 9 - .../loaders/postload/chains/GT_NaniteChain.java | 3 - .../postload/chains/GT_PCBFactoryRecipes.java | 8 - .../postload/recipes/AlloySmelterRecipes.java | 10 - .../postload/recipes/ArcFurnaceRecipes.java | 93 -- .../loaders/postload/recipes/AssemblerRecipes.java | 1050 -------------------- .../postload/recipes/AssemblyLineRecipes.java | 36 - .../loaders/postload/recipes/AutoclaveRecipes.java | 23 - .../loaders/postload/recipes/BenderRecipes.java | 68 -- .../postload/recipes/BlastFurnaceRecipes.java | 61 -- .../loaders/postload/recipes/BreweryRecipes.java | 58 -- .../loaders/postload/recipes/CannerRecipes.java | 12 - .../postload/recipes/CentrifugeRecipes.java | 148 --- .../postload/recipes/ChemicalBathRecipes.java | 39 - .../loaders/postload/recipes/ChemicalRecipes.java | 330 ------ .../postload/recipes/CircuitAssemblerRecipes.java | 20 - .../postload/recipes/CompressorRecipes.java | 36 +- .../postload/recipes/CropProcessingRecipes.java | 7 +- .../loaders/postload/recipes/CuttingRecipes.java | 6 - .../postload/recipes/DistilleryRecipes.java | 70 +- .../postload/recipes/ElectrolyzerRecipes.java | 24 - .../recipes/ElectromagneticSeparatorRecipes.java | 4 - .../loaders/postload/recipes/ExtractorRecipes.java | 2 - .../loaders/postload/recipes/ExtruderRecipes.java | 4 - .../loaders/postload/recipes/FermenterRecipes.java | 80 -- .../postload/recipes/FluidCannerRecipes.java | 8 - .../postload/recipes/FluidExtractorRecipes.java | 121 --- .../postload/recipes/FluidHeaterRecipes.java | 9 - .../postload/recipes/FluidSolidifierRecipes.java | 64 -- .../postload/recipes/ForgeHammerRecipes.java | 35 - .../postload/recipes/FormingPressRecipes.java | 38 - .../loaders/postload/recipes/FuelRecipes.java | 50 - .../postload/recipes/FusionReactorRecipes.java | 68 -- .../recipes/ImplosionCompressorRecipes.java | 12 - .../postload/recipes/LaserEngraverRecipes.java | 10 - .../loaders/postload/recipes/LatheRecipes.java | 4 - .../postload/recipes/MatterAmplifierRecipes.java | 4 - .../loaders/postload/recipes/MixerRecipes.java | 174 ---- .../loaders/postload/recipes/PackagerRecipes.java | 8 - .../postload/recipes/PlasmaForgeRecipes.java | 2 - .../loaders/postload/recipes/PrinterRecipes.java | 5 - .../loaders/postload/recipes/Pulverizer.java | 126 --- .../loaders/postload/recipes/PyrolyseRecipes.java | 9 - .../loaders/postload/recipes/SifterRecipes.java | 4 - .../loaders/postload/recipes/SlicerRecipes.java | 8 - .../postload/recipes/ThermalCentrifugeRecipes.java | 2 - .../recipes/TranscendentPlasmaMixerRecipes.java | 6 - .../postload/recipes/VacuumFreezerRecipes.java | 97 -- .../loaders/postload/recipes/WiremillRecipes.java | 16 - .../preload/GT_Loader_Item_Block_And_Fluid.java | 19 - 110 files changed, 77 insertions(+), 4266 deletions(-) (limited to 'src/main/java/gregtech') 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 9257c7c835..828fab4368 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java @@ -151,8 +151,6 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements ((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); 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 bce5e8f92e..f17626cdd8 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 @@ -52,8 +52,6 @@ public class GT_MetaPipeEntity_Frame extends MetaPipeEntity { 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_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java index 5201cc6876..f6362a3db7 100644 --- a/src/main/java/gregtech/api/util/GT_ModHandler.java +++ b/src/main/java/gregtech/api/util/GT_ModHandler.java @@ -566,8 +566,6 @@ public class GT_ModHandler { recipeBuilder.itemInputs(aInput, input2); } recipeBuilder.itemOutputs(aOutput) - .noFluidInputs() - .noFluidOutputs() .duration(duration * TICKS) .eut(3); if (hidden) { diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index cc2a2b0626..fb44c3489f 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -2323,8 +2323,6 @@ public class GT_Recipe implements Comparable { .get(), b.fluidInputs(in) .fluidOutputs(out) - .noItemInputs() - .noItemOutputs() .build() .get()); } diff --git a/src/main/java/gregtech/api/util/GT_RecipeBuilder.java b/src/main/java/gregtech/api/util/GT_RecipeBuilder.java index 2649d65eb7..07132420c7 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeBuilder.java +++ b/src/main/java/gregtech/api/util/GT_RecipeBuilder.java @@ -56,12 +56,12 @@ public class GT_RecipeBuilder { PANIC_MODE = DEBUG_MODE && Boolean.getBoolean("gt.recipebuilder.panic"); } - protected ItemStack[] inputsBasic; + protected ItemStack[] inputsBasic = new ItemStack[0]; protected Object[] inputsOreDict; - protected ItemStack[] outputs; + protected ItemStack[] outputs = new ItemStack[0]; protected ItemStack[][] alts; - protected FluidStack[] fluidInputs; - protected FluidStack[] fluidOutputs; + protected FluidStack[] fluidInputs = new FluidStack[0]; + protected FluidStack[] fluidOutputs = new FluidStack[0]; protected int[] chances; protected Object special; protected int duration = -1; @@ -106,6 +106,8 @@ public class GT_RecipeBuilder { this.valid = valid; } + // region helper methods + private static FluidStack[] fix(FluidStack[] fluidInputs) { return Arrays.stream(fluidInputs) .filter(Objects::nonNull) @@ -163,6 +165,10 @@ public class GT_RecipeBuilder { } } + // endregion + + // region setter + /** * Non-OreDicted item inputs. Assumes input is unified. */ @@ -221,13 +227,10 @@ public class GT_RecipeBuilder { } /** - * Same as itemInputs(), but make it clear that no item inputs is intended, instead of a mistake. + * @deprecated You don't need to call this method, RecipeBuilder now takes empty item input array by default. */ + @Deprecated public GT_RecipeBuilder noItemInputs() { - // this does not call into one of the itemInputs, to make it clear what is the expected behavior here. - inputsBasic = new ItemStack[0]; - inputsOreDict = null; - alts = null; return this; } @@ -254,9 +257,12 @@ public class GT_RecipeBuilder { return this; } + /** + * @deprecated You don't need to call this method, RecipeBuilder now takes empty item output array by default. + */ + @Deprecated public GT_RecipeBuilder noItemOutputs() { - chances = null; - return itemOutputs(); + return this; } public GT_RecipeBuilder fluidInputs(FluidStack... fluidInputs) { @@ -265,8 +271,12 @@ public class GT_RecipeBuilder { return this; } + /** + * @deprecated You don't need to call this method, RecipeBuilder now takes empty fluid input array by default. + */ + @Deprecated public GT_RecipeBuilder noFluidInputs() { - return fluidInputs == null ? fluidInputs() : this; + return this; } public GT_RecipeBuilder fluidOutputs(FluidStack... fluidOutputs) { @@ -275,12 +285,20 @@ public class GT_RecipeBuilder { return this; } + /** + * @deprecated You don't need to call this method, RecipeBuilder now takes empty fluid output array by default. + */ + @Deprecated public GT_RecipeBuilder noFluidOutputs() { - return fluidOutputs(); + return this; } + /** + * @deprecated You don't need to call this method, RecipeBuilder now takes empty arrays by default. + */ + @Deprecated public GT_RecipeBuilder noOutputs() { - return noFluidOutputs().noItemOutputs(); + return this; } public GT_RecipeBuilder outputChances(int... chances) { @@ -393,6 +411,8 @@ public class GT_RecipeBuilder { return metadata(GT_RecipeConstants.LOW_GRAVITY, true); } + // endregion + private static T[] copy(T[] arr) { return arr == null ? null : arr.clone(); } @@ -458,6 +478,8 @@ public class GT_RecipeBuilder { valid); } + // region getter + public ItemStack getItemInputBasic(int index) { return index < inputsBasic.length ? inputsBasic[index] : null; } @@ -510,6 +532,10 @@ public class GT_RecipeBuilder { return eut; } + // endregion + + // region validator + public GT_RecipeBuilder clearInvalid() { valid = true; return this; @@ -537,7 +563,7 @@ public class GT_RecipeBuilder { * unset. Both bound inclusive. Only supposed to be called by IGT_RecipeMap and not client code. */ public GT_RecipeBuilder validateNoInput() { - return GT_Utility.isArrayEmptyOrNull(inputsBasic) ? noItemInputs() : invalidate(); + return GT_Utility.isArrayEmptyOrNull(inputsBasic) ? this : invalidate(); } /** @@ -545,7 +571,7 @@ public class GT_RecipeBuilder { * unset. Both bound inclusive. Only supposed to be called by IGT_RecipeMap and not client code. */ public GT_RecipeBuilder validateNoInputFluid() { - return GT_Utility.isArrayEmptyOrNull(fluidInputs) ? noFluidInputs() : invalidate(); + return GT_Utility.isArrayEmptyOrNull(fluidInputs) ? this : invalidate(); } /** @@ -553,7 +579,7 @@ public class GT_RecipeBuilder { * unset. Both bound inclusive. Only supposed to be called by IGT_RecipeMap and not client code. */ public GT_RecipeBuilder validateNoOutput() { - return GT_Utility.isArrayEmptyOrNull(outputs) ? noItemInputs() : invalidate(); + return GT_Utility.isArrayEmptyOrNull(outputs) ? this : invalidate(); } /** @@ -561,7 +587,7 @@ public class GT_RecipeBuilder { * unset. Both bound inclusive. Only supposed to be called by IGT_RecipeMap and not client code. */ public GT_RecipeBuilder validateNoOutputFluid() { - return GT_Utility.isArrayEmptyOrNull(fluidOutputs) ? noFluidOutputs() : invalidate(); + return GT_Utility.isArrayEmptyOrNull(fluidOutputs) ? this : invalidate(); } /** @@ -569,7 +595,7 @@ public class GT_RecipeBuilder { * unset. Both bound inclusive. Only supposed to be called by IGT_RecipeMap and not client code. */ public GT_RecipeBuilder validateInputCount(int min, int max) { - if (inputsBasic == null) return min < 0 ? noItemInputs() : invalidate(); + if (inputsBasic == null) return min < 0 ? this : invalidate(); return isArrayValid(inputsBasic, min, max) ? this : invalidate(); } @@ -578,7 +604,7 @@ public class GT_RecipeBuilder { * unset. Both bound inclusive. Only supposed to be called by IGT_RecipeMap and not client code. */ public GT_RecipeBuilder validateInputFluidCount(int min, int max) { - if (fluidInputs == null) return min < 0 ? noItemInputs() : invalidate(); + if (fluidInputs == null) return min < 0 ? this : invalidate(); return isArrayValid(fluidInputs, min, max) ? this : invalidate(); } @@ -587,7 +613,7 @@ public class GT_RecipeBuilder { * unset. Both bound inclusive. Only supposed to be called by IGT_RecipeMap and not client code. */ public GT_RecipeBuilder validateOutputCount(int min, int max) { - if (outputs == null) return min < 0 ? noItemInputs() : invalidate(); + if (outputs == null) return min < 0 ? this : invalidate(); return isArrayValid(outputs, min, max) ? this : invalidate(); } @@ -596,30 +622,32 @@ public class GT_RecipeBuilder { * unset. Both bound inclusive. Only supposed to be called by IGT_RecipeMap and not client code. */ public GT_RecipeBuilder validateOutputFluidCount(int min, int max) { - if (fluidOutputs == null) return min < 0 ? noItemInputs() : invalidate(); + if (fluidOutputs == null) return min < 0 ? this : invalidate(); return isArrayValid(fluidOutputs, min, max) ? this : invalidate(); } public GT_RecipeBuilder validateAnyInput() { if (fluidInputs != null && isArrayValid(fluidInputs, 1, Integer.MAX_VALUE)) { - return inputsBasic == null ? noItemInputs() : this; + return this; } if (inputsBasic != null && isArrayValid(inputsBasic, 1, Integer.MAX_VALUE)) { - return fluidInputs == null ? noFluidInputs() : this; + return this; } return invalidate(); } public GT_RecipeBuilder validateAnyOutput() { if (fluidOutputs != null && isArrayValid(fluidOutputs, 1, Integer.MAX_VALUE)) { - return outputs == null ? noItemOutputs() : this; + return this; } if (outputs != null && isArrayValid(outputs, 1, Integer.MAX_VALUE)) { - return fluidOutputs == null ? noFluidOutputs() : this; + return this; } return invalidate(); } + // endregion + public Optional build() { if (!valid) { if (DEBUG_MODE) handleInvalidRecipe(); @@ -684,10 +712,6 @@ public class GT_RecipeBuilder { } private void preBuildChecks() { - if (inputsBasic == null) throw new IllegalStateException("no itemInputs"); - if (outputs == null) throw new IllegalStateException("no itemOutputs"); - if (fluidInputs == null) throw new IllegalStateException("no fluidInputs"); - if (fluidOutputs == null) throw new IllegalStateException("no fluidOutputs"); if (duration == -1) throw new IllegalStateException("no duration"); if (eut == -1) throw new IllegalStateException("no eut"); } diff --git a/src/main/java/gregtech/api/util/GT_RecipeMapUtil.java b/src/main/java/gregtech/api/util/GT_RecipeMapUtil.java index bc8662ab03..fb6a790159 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeMapUtil.java +++ b/src/main/java/gregtech/api/util/GT_RecipeMapUtil.java @@ -107,24 +107,16 @@ public class GT_RecipeMapUtil { } fluidInputs.removeIf(Objects::isNull); fluidOutputs.removeIf(Objects::isNull); - if (itemInputs.size() == 0) { - b.noItemInputs(); - } else { + if (!itemInputs.isEmpty()) { b.itemInputs(itemInputs.toArray(new ItemStack[0])); } - if (itemOutputs.size() == 0) { - b.noItemOutputs(); - } else { + if (!itemOutputs.isEmpty()) { b.itemOutputs(itemOutputs.toArray(new ItemStack[0]), chances != null ? chances.toArray() : null); } - if (fluidInputs.size() == 0) { - b.noFluidInputs(); - } else { + if (!fluidInputs.isEmpty()) { b.fluidInputs(fluidInputs.toArray(new FluidStack[0])); } - if (fluidOutputs.size() == 0) { - b.noFluidOutputs(); - } else { + if (!fluidOutputs.isEmpty()) { b.fluidOutputs(fluidOutputs.toArray(new FluidStack[0])); } return b; diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index f44196eefe..6afa40e17f 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -341,7 +341,6 @@ public class GT_RecipeRegistrator { recipeBuilder.itemInputs(aStack) .itemOutputs(outputsArray) .fluidInputs(Materials.Oxygen.getGas((int) Math.max(16, tAmount / M))) - .noFluidOutputs() .duration(((int) Math.max(16, tAmount / M)) * TICKS) .eut(90); if (tHide) { @@ -399,8 +398,6 @@ public class GT_RecipeRegistrator { GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); recipeBuilder.itemInputs(aStack) .itemOutputs(outputsArray) - .noFluidInputs() - .noFluidOutputs() .duration( (aData.mMaterial.mMaterial == Materials.Marble ? 1 : (int) Math.max(16, tAmount / M)) * TICKS) .eut(4); @@ -422,8 +419,6 @@ public class GT_RecipeRegistrator { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(GT_OreDictUnificator.getDust(aData.mMaterial)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sHammerRecipes); @@ -681,8 +676,6 @@ public class GT_RecipeRegistrator { 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); @@ -691,8 +684,6 @@ public class GT_RecipeRegistrator { 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); @@ -701,8 +692,6 @@ public class GT_RecipeRegistrator { 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); @@ -711,8 +700,6 @@ public class GT_RecipeRegistrator { 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); @@ -721,8 +708,6 @@ public class GT_RecipeRegistrator { 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); @@ -731,8 +716,6 @@ public class GT_RecipeRegistrator { 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); @@ -743,8 +726,6 @@ public class GT_RecipeRegistrator { 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); @@ -753,8 +734,6 @@ public class GT_RecipeRegistrator { 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); @@ -763,8 +742,6 @@ public class GT_RecipeRegistrator { 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); @@ -773,8 +750,6 @@ public class GT_RecipeRegistrator { 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); @@ -783,8 +758,6 @@ public class GT_RecipeRegistrator { 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); @@ -793,8 +766,6 @@ public class GT_RecipeRegistrator { 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); @@ -804,8 +775,6 @@ public class GT_RecipeRegistrator { 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); @@ -815,8 +784,6 @@ public class GT_RecipeRegistrator { 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); diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 4c8c4bd922..e92d9ffae9 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -1990,16 +1990,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG 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); 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 0852e67ecf..0aedc4ea73 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 @@ -72,16 +72,12 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe 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); @@ -134,8 +130,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(this, 1, 3)) .itemOutputs(new ItemStack(this, 1, 4)) - .noFluidInputs() - .noFluidOutputs() .duration(16 * TICKS) .eut(10) .addTo(sHammerRecipes); @@ -143,8 +137,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(this, 1, 11)) .itemOutputs(new ItemStack(this, 1, 12)) - .noFluidInputs() - .noFluidOutputs() .duration(16 * TICKS) .eut(10) .addTo(sHammerRecipes); @@ -152,8 +144,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(this, 1, 0)) .itemOutputs(new ItemStack(this, 1, 1)) - .noFluidInputs() - .noFluidOutputs() .duration(16 * TICKS) .eut(10) .addTo(sHammerRecipes); @@ -161,8 +151,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(this, 1, 8)) .itemOutputs(new ItemStack(this, 1, 9)) - .noFluidInputs() - .noFluidOutputs() .duration(16 * TICKS) .eut(10) .addTo(sHammerRecipes); @@ -176,8 +164,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(this, 1, 7), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(new ItemStack(this, 1, 6)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(sLaserEngraverRecipes); @@ -185,8 +171,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(this, 1, 15), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(new ItemStack(this, 1, 14)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(sLaserEngraverRecipes); diff --git a/src/main/java/gregtech/common/fluid/GT_Fluid.java b/src/main/java/gregtech/common/fluid/GT_Fluid.java index efec34bc01..3625acb1e8 100644 --- a/src/main/java/gregtech/common/fluid/GT_Fluid.java +++ b/src/main/java/gregtech/common/fluid/GT_Fluid.java @@ -126,7 +126,6 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R GT_Values.RA.stdBuilder() .itemInputs(fullContainer) .itemOutputs(GT_Utility.getContainerItem(fullContainer, false)) - .noFluidInputs() .fluidOutputs(fluidStack) .duration(fluidStack.amount / 62) .eut(1) 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 34b922b43d..ff8d1c3e94 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 @@ -196,8 +196,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8L)) .itemOutputs(new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -921,8 +919,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Spray_Empty.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(1) .addTo(sAssemblerRecipes); @@ -965,8 +961,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Aluminium, 2L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.ThermosCan_Empty.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(1) .addTo(sAssemblerRecipes); @@ -990,8 +984,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.AnyBronze, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_Steel.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); @@ -1015,8 +1007,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Platinum, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_TungstenSteel.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(sAssemblerRecipes); @@ -1040,8 +1030,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Silver, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_Aluminium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -1065,8 +1053,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Electrum, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_StainlessSteel.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -1090,8 +1076,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.RoseGold, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_Titanium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(256) .addTo(sAssemblerRecipes); @@ -1115,8 +1099,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Palladium, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_Chrome.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(1024) .addTo(sAssemblerRecipes); @@ -1140,8 +1122,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Naquadah, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_Iridium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(sAssemblerRecipes); @@ -1165,8 +1145,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.ElectrumFlux, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_Osmium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(4096) .addTo(sAssemblerRecipes); @@ -1190,8 +1168,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Draconium, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_Neutronium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(sAssemblerRecipes); @@ -1261,8 +1237,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Tool_Matches.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(16 * TICKS) .eut(16) .addTo(sAssemblerRecipes); @@ -1272,8 +1246,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TricalciumPhosphate, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Tool_Matches.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(16 * TICKS) .eut(16) .addTo(sAssemblerRecipes); @@ -1283,8 +1255,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Tool_Matches.get(4L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(sAssemblerRecipes); @@ -1294,8 +1264,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Tool_Matches.get(4L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(sAssemblerRecipes); @@ -1304,16 +1272,12 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Tool_Matches.get(16L), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L)) .itemOutputs(ItemList.Tool_MatchBox_Full.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(sBoxinatorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Tool_MatchBox_Full.get(1L)) .itemOutputs(ItemList.Tool_Matches.get(16L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS + 12 * TICKS) .eut(16) .addTo(sBoxinatorRecipes); @@ -1358,8 +1322,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Items.flint, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Tool_Lighter_Invar_Empty.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(12 * SECONDS + 16 * TICKS) .eut(16) .addTo(sAssemblerRecipes); @@ -1407,8 +1369,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Items.flint, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Tool_Lighter_Platinum_Empty.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(12 * SECONDS + 16 * TICKS) .eut(256) .addTo(sAssemblerRecipes); @@ -1860,8 +1820,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { 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); @@ -1870,8 +1828,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { 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); @@ -1880,8 +1836,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { 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); @@ -1890,8 +1844,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { 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); @@ -1900,8 +1852,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { 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); @@ -1910,8 +1860,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { 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); @@ -1920,8 +1868,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { 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); @@ -1930,8 +1876,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { 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); @@ -1940,8 +1884,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { 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); @@ -3777,8 +3719,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 2L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Muffler.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sAssemblerRecipes); @@ -3788,8 +3728,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Muffler.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sAssemblerRecipes); @@ -3799,8 +3737,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 2L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Muffler.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sAssemblerRecipes); @@ -3810,8 +3746,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Muffler.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sAssemblerRecipes); @@ -3821,8 +3755,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 2L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Muffler.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sAssemblerRecipes); @@ -3832,8 +3764,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Muffler.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sAssemblerRecipes); @@ -3843,8 +3773,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Lock.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * MINUTES + 20 * SECONDS) .eut(16) .addTo(sAssemblerRecipes); @@ -3854,8 +3782,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Lock.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * MINUTES + 20 * SECONDS) .eut(16) .addTo(sAssemblerRecipes); @@ -3865,8 +3791,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Lock.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * MINUTES + 20 * SECONDS) .eut(16) .addTo(sAssemblerRecipes); @@ -3937,8 +3861,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_PlayerDetector.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -4030,8 +3952,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Cover_Drain.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Shutter.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4041,8 +3961,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Cover_Drain.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Shutter.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4052,8 +3970,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Cover_Drain.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Shutter.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4063,8 +3979,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Blocks.iron_bars, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Drain.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4074,8 +3988,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Blocks.iron_bars, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Drain.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4085,8 +3997,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Blocks.iron_bars, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Drain.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4096,8 +4006,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Blocks.crafting_table, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Crafting.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4107,8 +4015,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Blocks.crafting_table, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Crafting.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4118,8 +4024,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Blocks.crafting_table, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Crafting.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4129,8 +4033,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.FluidFilter.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(4) .addTo(sAssemblerRecipes); @@ -4140,8 +4042,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Cover_FluidDetector.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_FluidStorageMonitor.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(4) .addTo(sAssemblerRecipes); @@ -4350,8 +4250,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Sensor_LV.get(1L), ItemList.Emitter_LV.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.NC_SensorKit.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sAssemblerRecipes); @@ -4408,8 +4306,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_RedstoneTransmitterExternal.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -4419,8 +4315,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_RedstoneReceiverExternal.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -4456,8 +4350,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_NeedsMaintainance.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(30 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); @@ -4486,8 +4378,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Conveyor_Module_LV.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.ItemFilter_Export.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); @@ -4498,8 +4388,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Conveyor_Module_LV.get(1L), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.ItemFilter_Import.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index d652b68714..b3046616b5 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -2463,8 +2463,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_AdvancedRedstoneTransmitterExternal.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -2474,8 +2472,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_AdvancedRedstoneReceiverExternal.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -2485,8 +2481,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Emitter_EV.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_WirelessFluidDetector.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -2496,8 +2490,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Emitter_EV.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_WirelessItemDetector.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -2507,8 +2499,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Emitter_EV.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_WirelessNeedsMaintainance.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -2562,8 +2552,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_Coppon.get(4L)) .itemOutputs(new ItemStack(Blocks.wool, 1, 1)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -2571,8 +2559,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_Plumbilia.get(4L)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo