aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/GT_RecipeAdder.java
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2016-07-26 18:25:35 +0200
committerDream-Master <dream-master@gmx.net>2016-07-26 18:25:35 +0200
commit2efe1b9f513a30cfcb9e417b4f6017fb2acd2071 (patch)
tree5f840a641ff947dd21bc73e9270c71009e69ecbb /src/main/java/gregtech/common/GT_RecipeAdder.java
parentc014ae4afc980b33d92e589f52151b8afbd6b3ad (diff)
parenteec5b2faa7e70d5de1be718f949d28feddcbc037 (diff)
downloadGT5-Unofficial-2efe1b9f513a30cfcb9e417b4f6017fb2acd2071.tar.gz
GT5-Unofficial-2efe1b9f513a30cfcb9e417b4f6017fb2acd2071.tar.bz2
GT5-Unofficial-2efe1b9f513a30cfcb9e417b4f6017fb2acd2071.zip
Merge remote-tracking branch 'upstream/NewFeatures' into new-features
Conflicts: .gitignore build.properties src/main/java/gregtech/GT_Mod.java src/main/java/gregtech/api/enums/ItemList.java src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/api/enums/OrePrefixes.java src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java src/main/java/gregtech/api/util/GT_BaseCrop.java src/main/java/gregtech/api/util/GT_Recipe.java src/main/java/gregtech/common/GT_Proxy.java src/main/java/gregtech/common/GT_RecipeAdder.java src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java src/main/java/gregtech/common/GT_Worldgen_Stone.java src/main/java/gregtech/common/GT_Worldgenerator.java src/main/java/gregtech/common/blocks/GT_Block_Casings1.java src/main/java/gregtech/common/blocks/GT_Block_Casings2.java src/main/java/gregtech/common/blocks/GT_Block_Concretes.java src/main/java/gregtech/common/blocks/GT_Block_Machines.java src/main/java/gregtech/common/blocks/GT_Block_Ores.java src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java src/main/java/gregtech/common/blocks/GT_Item_Casings1.java src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java src/main/java/gregtech/common/covers/GT_Cover_Arm.java src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java src/main/java/gregtech/common/covers/GT_Cover_Drain.java src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java src/main/java/gregtech/common/covers/GT_Cover_Pump.java src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java src/main/java/gregtech/common/covers/GT_Cover_Shutter.java src/main/java/gregtech/common/gui/GT_Container_Filter.java src/main/java/gregtech/common/items/GT_FluidDisplayItem.java src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java src/main/java/gregtech/common/items/GT_SensorCard_Item.java src/main/java/gregtech/common/items/ItemComb.java src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java src/main/java/gregtech/common/tools/GT_Tool.java src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java src/main/java/gregtech/common/tools/GT_Tool_Sense.java src/main/java/gregtech/common/tools/GT_Tool_Wrench.java src/main/java/gregtech/loaders/load/GT_FuelLoader.java src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedPurified.java src/main/java/gregtech/loaders/oreprocessing/ProcessingWire01.java src/main/java/gregtech/loaders/oreprocessing/ProcessingWire02.java src/main/java/gregtech/loaders/oreprocessing/ProcessingWire04.java src/main/java/gregtech/loaders/oreprocessing/ProcessingWire08.java src/main/java/gregtech/loaders/oreprocessing/ProcessingWire12.java src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java src/main/resources/assets/gregtech/lang/en_US.lang src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png.mcmeta
Diffstat (limited to 'src/main/java/gregtech/common/GT_RecipeAdder.java')
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java68
1 files changed, 34 insertions, 34 deletions
diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java
index 7f2c916979..2030d12c94 100644
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/src/main/java/gregtech/common/GT_RecipeAdder.java
@@ -115,11 +115,11 @@ public class GT_RecipeAdder
new GT_Recipe(aInput1, aEUt, aInput2, aDuration, aOutput1, aOutput2);
return true;
}
-
- @Override
- public boolean addAlloySmelterRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt) {
- return addAlloySmelterRecipe(aInput1, aInput2, aOutput1, aDuration, aEUt, false);
- }
+
+ @Override
+ public boolean addAlloySmelterRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt) {
+ return addAlloySmelterRecipe(aInput1, aInput2, aOutput1, aDuration, aEUt, false);
+ }
public boolean addAlloySmelterRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt, boolean hidden) {
if ((aInput1 == null) || (aOutput1 == null || Materials.Graphite.contains(aInput1))) {
@@ -132,7 +132,7 @@ public class GT_RecipeAdder
return false;
}
GT_Recipe tRecipe =new GT_Recipe(aInput1, aInput2, aEUt, aDuration, aOutput1);
- if ((hidden) && (tRecipe != null)) {
+ if ((hidden) && (tRecipe != null)) {
tRecipe.mHidden = true;
}
return true;
@@ -274,14 +274,14 @@ public class GT_RecipeAdder
int tITNT = Math.max(1, tExplosives/4);
//new GT_Recipe(aInput1, aInput2, aOutput1, aOutput2);
if(tGunpowder<65){
- GT_Recipe.GT_Recipe_Map.sImplosionRecipes.addRecipe(true, new ItemStack[]{aInput1, ItemList.Block_Powderbarrel.get(tGunpowder, new Object[0])}, new ItemStack[]{aOutput1, aOutput2}, null, null, null, null, 20, 30, 0);
+ GT_Recipe.GT_Recipe_Map.sImplosionRecipes.addRecipe(true, new ItemStack[]{aInput1, ItemList.Block_Powderbarrel.get(tGunpowder, new Object[0])}, new ItemStack[]{aOutput1, aOutput2}, null, null, null, null, 20, 30, 0);
}
if(tDynamite<17){
- GT_Recipe.GT_Recipe_Map.sImplosionRecipes.addRecipe(true, new ItemStack[]{aInput1, GT_ModHandler.getIC2Item("dynamite", tDynamite, null)}, new ItemStack[]{aOutput1, aOutput2}, null, null, null, null, 20, 30, 0);
+ GT_Recipe.GT_Recipe_Map.sImplosionRecipes.addRecipe(true, new ItemStack[]{aInput1, GT_ModHandler.getIC2Item("dynamite", tDynamite, null)}, new ItemStack[]{aOutput1, aOutput2}, null, null, null, null, 20, 30, 0);
}
GT_Recipe.GT_Recipe_Map.sImplosionRecipes.addRecipe(true, new ItemStack[]{aInput1, new ItemStack(Blocks.tnt,tTNT)}, new ItemStack[]{aOutput1, aOutput2}, null, null, null, null, 20, 30, 0);
GT_Recipe.GT_Recipe_Map.sImplosionRecipes.addRecipe(true, new ItemStack[]{aInput1, GT_ModHandler.getIC2Item("industrialTnt", tITNT, null)}, new ItemStack[]{aOutput1, aOutput2}, null, null, null, null, 20, 30, 0);
-
+
return true;
}
@@ -473,11 +473,11 @@ public class GT_RecipeAdder
GT_Recipe.GT_Recipe_Map.sFluidSolidficationRecipes.addRecipe(true, new ItemStack[]{aMold}, new ItemStack[]{aOutput}, null, new FluidStack[]{aInput}, null, aDuration, aEUt, 0);
return true;
}
-
- @Override
- public boolean addFluidSmelterRecipe(ItemStack aInput, ItemStack aRemains, FluidStack aOutput, int aChance, int aDuration, int aEUt) {
- return addFluidSmelterRecipe(aInput, aRemains, aOutput, aChance, aDuration, aEUt, false);
- }
+
+ @Override
+ public boolean addFluidSmelterRecipe(ItemStack aInput, ItemStack aRemains, FluidStack aOutput, int aChance, int aDuration, int aEUt) {
+ return addFluidSmelterRecipe(aInput, aRemains, aOutput, aChance, aDuration, aEUt, false);
+ }
public boolean addFluidSmelterRecipe(ItemStack aInput, ItemStack aRemains, FluidStack aOutput, int aChance, int aDuration, int aEUt, boolean hidden) {
if ((aInput == null) || (aOutput == null)) {
@@ -494,7 +494,7 @@ public class GT_RecipeAdder
}
GT_Recipe tRecipe =GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aRemains}, null, new int[]{aChance}, null, new FluidStack[]{aOutput}, aDuration, aEUt, 0);
if ((hidden) && (tRecipe != null)) {
- tRecipe.mHidden = true;
+ tRecipe.mHidden = true;
}
return true;
}
@@ -636,12 +636,12 @@ public class GT_RecipeAdder
}
return false;
}
+
-
- @Override
- public boolean addArcFurnaceRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt) {
- return addArcFurnaceRecipe(aInput, aOutputs, aChances, aDuration, aEUt, false);
- }
+ @Override
+ public boolean addArcFurnaceRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt) {
+ return addArcFurnaceRecipe(aInput, aOutputs, aChances, aDuration, aEUt, false);
+ }
public boolean addArcFurnaceRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt, boolean hidden) {
if ((aInput == null) || (aOutputs == null)) {
@@ -654,14 +654,14 @@ public class GT_RecipeAdder
}
GT_Recipe sRecipe = GT_Recipe.GT_Recipe_Map.sArcFurnaceRecipes.addRecipe(true, new ItemStack[]{aInput}, aOutputs, null, aChances, new FluidStack[]{Materials.Oxygen.getGas(aDuration)}, null, Math.max(1, aDuration), Math.max(1, aEUt), 0);
if ((hidden) && (sRecipe != null)) {
- sRecipe.mHidden = true;
+ sRecipe.mHidden = true;
}
for (Materials tMaterial : new Materials[]{Materials.Argon, Materials.Nitrogen}) {
if (tMaterial.mPlasma != null) {
int tPlasmaAmount = (int) Math.max(1L, aDuration / (tMaterial.getMass() * 16L));
GT_Recipe tRecipe =GT_Recipe.GT_Recipe_Map.sPlasmaArcFurnaceRecipes.addRecipe(true, new ItemStack[]{aInput}, aOutputs, null, aChances, new FluidStack[]{tMaterial.getPlasma(tPlasmaAmount)}, new FluidStack[]{tMaterial.getGas(tPlasmaAmount)}, Math.max(1, aDuration / 16), Math.max(1, aEUt / 3), 0);
if ((hidden) && (tRecipe != null)) {
- tRecipe.mHidden = true;
+ tRecipe.mHidden = true;
}
}
}
@@ -718,12 +718,12 @@ public class GT_RecipeAdder
}
return false;
}
+
-
- @Override
- public boolean addPulveriserRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt) {
- return addPulveriserRecipe(aInput, aOutputs, aChances, aDuration, aEUt, false);
- }
+ @Override
+ public boolean addPulveriserRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt) {
+ return addPulveriserRecipe(aInput, aOutputs, aChances, aDuration, aEUt, false);
+ }
public boolean addPulveriserRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt, boolean hidden) {
if ((aInput == null) || (aOutputs == null)) {
@@ -736,7 +736,7 @@ public class GT_RecipeAdder
}
GT_Recipe tRecipe =GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.addRecipe(true, new ItemStack[]{aInput}, aOutputs, null, aChances, null, null, aDuration, aEUt, 0);
if ((hidden) && (tRecipe != null)) {
- tRecipe.mHidden = true;
+ tRecipe.mHidden = true;
}
return true;
}
@@ -770,21 +770,21 @@ public class GT_RecipeAdder
return true;
}
- @Override
- public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt) {
+ @Override
+ public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt) {
if ((aResearchItem==null)||(aResearchTime<=0)||(aInputs == null) || (aOutput == null) || aInputs.length>15 || aInputs.length<4) {
return false;
}
if ((aDuration = GregTech_API.sRecipeFile.get("assemblingline", aOutput, aDuration)) <= 0) {
return false;
- }
+ }
GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{aResearchItem}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Research result", new Object[0])}, null, null, aResearchTime, 30, 0);
-
+
GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe_AssemblyLine( aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt));
return true;
- }
+ }
-} \ No newline at end of file
+}
generated by cgit (git 2.34.1) at 2026-02-15 18:57:08 +0000