aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java2
-rw-r--r--src/main/java/gregtech/api/util/GT_ModHandler.java2
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java2
-rw-r--r--src/main/java/gregtech/api/util/GT_RecipeBuilder.java84
-rw-r--r--src/main/java/gregtech/api/util/GT_RecipeMapUtil.java16
-rw-r--r--src/main/java/gregtech/api/util/GT_RecipeRegistrator.java33
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java4
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java16
-rw-r--r--src/main/java/gregtech/common/fluid/GT_Fluid.java1
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java112
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java34
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java9
-rw-r--r--src/main/java/gregtech/common/items/ItemDrop.java10
-rw-r--r--src/main/java/gregtech/common/items/ItemPropolis.java3
-rw-r--r--src/main/java/gregtech/loaders/load/GT_FuelLoader.java15
-rw-r--r--src/main/java/gregtech/loaders/load/GT_ItemIterator.java22
-rw-r--r--src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java7
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java5
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java13
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java24
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java101
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java16
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java23
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java8
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java7
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java73
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java3
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java16
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java89
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java34
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java14
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java28
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java7
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java11
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java21
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java6
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java18
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java44
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java4
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java6
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java6
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java110
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java1
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java9
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java5
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java54
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java36
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java16
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java3
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java40
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java9
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java3
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java8
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java10
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java93
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java1050
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java36
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java23
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java68
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java61
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java58
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java12
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java148
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java39
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java330
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java20
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java36
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java7
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java6
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java70
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java24
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java80
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java8
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java121
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java9
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java64
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java35
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java38
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java50
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java68
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java12
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java10
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java174
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java8
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java5
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java126
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java9
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java8
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java6
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java97
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java16
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java19
110 files changed, 77 insertions, 4266 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 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/