aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/load
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-12-04 05:34:27 +0900
committerGitHub <noreply@github.com>2023-12-03 21:34:27 +0100
commitf74c7cc297d1d19d38a19683cd277ad9ce605d3a (patch)
treeb2a5d66ec5a959099240fb1db239ffc0f9531839 /src/main/java/gregtech/loaders/load
parentb08cde7de4ec93cba05fb070991ad1dffb800ce1 (diff)
downloadGT5-Unofficial-f74c7cc297d1d19d38a19683cd277ad9ce605d3a.tar.gz
GT5-Unofficial-f74c7cc297d1d19d38a19683cd277ad9ce605d3a.tar.bz2
GT5-Unofficial-f74c7cc297d1d19d38a19683cd277ad9ce605d3a.zip
Refactor RecipeMap (#2345)
* Remove deprecated and unused things * Move recipemap subclasses * Move GT_Recipe_Map to outside and rename to RecipeMap * Move recipemap instances to separated class & remove prepending s * Remove useless GT_Recipe constructors * Always use ModularUI * Rename IGT_RecipeMap -> IRecipeMap * Add RecipeMapBuilder * Remove more deprecated and unused things * Fix RecipeMap type parameters * Use multimap for recipe index * Fix bending recipe error in dev env * Remove mUniqueIdentifier * Update AE2FC * Less edgy texture for NEI recipe background * Add replicator fluid output slot for NEI and machine GUI * Fix fluid fuels not having fuel value in large boilers * Remove GT_RectHandler and NEI_TransferRectHost * Remove RecipeMapHandler * Move NEI energy description from RecipeMapFrontend to Power * Refactor the way to filter fusion recipes * Check restriction for some properties * Remove showVoltageAmperage * Make Power accept GT_Recipe * Fix NPE * Move NEI duration description to Power from Frontend * Directly implement IRecipeProcessingAwareHatch for GT_MetaTileEntity_Hatch_InputBus_ME * Make Power integrated with GT_OverclockCalculator * Rename Power -> OverclockDescriber * Don't modify recipe find logic until postload finishes * Reformat reserved MTE ids * Fix check for too few inputs on recipe addition * Move replicator logic to backend * Stop un-hiding assline recipes * Allow setting custom recipe comparator & implement for fusion * Update AE2FC * Rename getRecipeList and getRecipes -> getRecipeMap * Automatically register recipe catalysts * Cleanup the way to detect recipe collision * Make use of BasicUIProperties for basic machines * Make use of BasicUIProperties for UIHelper * Rename specialHandler -> recipeTransformer * Add way to automatically register handler info * Add recipe category * Add some APIs for addons * Rename blastRecipes -> blastFurnaceRecipes * Remove GT_MetaTileEntity_BasicMachine_GT_Recipe#mSharedTank and #mRequiresFluidForFiltering * Don't require setting duration and EU/t for fuel recipes * Don't require setting EU/t for primitive blast furnace recipes * Revert change to addMultiblockChemicalRecipe * Fix large boiler general desc recipe not being added * Hide duration and EU/t from large boiler * Cleanup recipe stacktrace draw * Extend metadata usage of recipe builder to recipe itself * Implement metadata handling & NEI comparator for PCB factory * Some rename around NEIRecipeInfo * Some toString implementations * Add more APIs for addons & some rename * Infer handler icon from recipe catalyst if one is not set * Also shrink recipe title when OC is not used * Remove rare earth centrifuge recipe * Use metadata for replicator backend * Adjust geothermal generator output slot * Allow having multiple transferrects * Store recipemap reference in backend * Rename vacuumRecipes -> vacuumFreezerRecipes * Add config to tweak visibility of recipe categories * Remove mHideRecyclingRecipes in favor of recipe category config * Fix typo fluidSolidfierRecipes -> fluidSolidifierRecipes * Refactor findRecipe and ProcessingLogic to use Stream * Fix BBF handler icon & remove bronze blast furnace * Add fluent API for findRecipe * Add way to stop adding progressbar * Change arg order for special texture * Avoid overwriting interesting failure with NO_RECIPE * Some changes for FuelBackend * Set space project icon * Remove localization from TT * Remove CNC recipe adder * Move recipe extractor from AE2FC * Minor internal change for ProcessingLogic#applyRecipe * More javadoc on #getAvailableRecipeMaps * Better implementation of #ofSupplier * Move replicator exponent config to GT_Proxy * Remove RC & IC2 macerator handling * Rename StreamUtil -> GT_StreamUtil * Refactor code around RecipeMetadataStorage * Revise #compileRecipe javadoc * Switch extreme diesel recipe loader to downstream recipe map * Optimize #reMap * Rename reload -> reloadNEICache * Minor tweak for drawEnergyInfo * a bit more doc * Adjust recipe catalysts * Add toString implementation for GT_Fluid for debug * Minor revision for OilCrackerBackend * Index replicator recipes by material --------- Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/loaders/load')
-rw-r--r--src/main/java/gregtech/loaders/load/GT_FuelLoader.java31
-rw-r--r--src/main/java/gregtech/loaders/load/GT_ItemIterator.java30
-rw-r--r--src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java888
3 files changed, 249 insertions, 700 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
index ad9b890cc1..0343362c77 100644
--- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
+++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
@@ -16,6 +16,7 @@ import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.fluid.GT_FluidFactory;
+import gregtech.api.recipe.RecipeMaps;
import gregtech.api.util.GT_Log;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
@@ -47,7 +48,7 @@ public class GT_FuelLoader implements Runnable {
30,
2);
- GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels.addRecipe(
+ RecipeMaps.smallNaquadahReactorFuels.addRecipe(
true,
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L) },
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L) },
@@ -57,7 +58,7 @@ public class GT_FuelLoader implements Runnable {
0,
0,
50000);
- GT_Recipe.GT_Recipe_Map.sLargeNaquadahReactorFuels.addRecipe(
+ RecipeMaps.largeNaquadahReactorFuels.addRecipe(
true,
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L) },
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L) },
@@ -67,7 +68,7 @@ public class GT_FuelLoader implements Runnable {
0,
0,
250000);
- GT_Recipe.GT_Recipe_Map.sHugeNaquadahReactorFuels.addRecipe(
+ RecipeMaps.hugeNaquadahReactorFuels.addRecipe(
true,
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L) },
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L) },
@@ -77,7 +78,7 @@ public class GT_FuelLoader implements Runnable {
0,
0,
500000);
- GT_Recipe.GT_Recipe_Map.sExtremeNaquadahReactorFuels.addRecipe(
+ RecipeMaps.extremeNaquadahReactorFuels.addRecipe(
true,
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 1L) },
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L) },
@@ -87,7 +88,7 @@ public class GT_FuelLoader implements Runnable {
0,
0,
250000);
- GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels.addRecipe(
+ RecipeMaps.ultraHugeNaquadahReactorFuels.addRecipe(
true,
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L) },
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L) },
@@ -97,7 +98,7 @@ public class GT_FuelLoader implements Runnable {
0,
0,
1000000);
- GT_Recipe.GT_Recipe_Map.sFluidNaquadahReactorFuels.addRecipe(
+ RecipeMaps.fluidNaquadahReactorFuels.addRecipe(
true,
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NaquadahEnriched, 1L) },
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naquadah, 1L) },
@@ -109,7 +110,7 @@ public class GT_FuelLoader implements Runnable {
1400000);
// BloodMagic
- GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(
+ RecipeMaps.magicFuels.addRecipe(
true,
new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L) },
new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "blankSlate", 1L) },
@@ -119,7 +120,7 @@ public class GT_FuelLoader implements Runnable {
0,
0,
400);
- GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(
+ RecipeMaps.magicFuels.addRecipe(
true,
new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L) },
new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L) },
@@ -129,7 +130,7 @@ public class GT_FuelLoader implements Runnable {
0,
0,
1000);
- GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(
+ RecipeMaps.magicFuels.addRecipe(
true,
new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L) },
new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L) },
@@ -139,7 +140,7 @@ public class GT_FuelLoader implements Runnable {
0,
0,
8000);
- GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(
+ RecipeMaps.magicFuels.addRecipe(
true,
new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "bloodMagicBaseItems", 1L, 27) },
new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L) },
@@ -154,36 +155,26 @@ public class GT_FuelLoader implements Runnable {
.itemInputs(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 4))
.metadata(FUEL_VALUE, 4)
.metadata(FUEL_TYPE, 5)
- .duration(0)
- .eut(0)
.addTo(GT_RecipeConstants.Fuel);
GT_Values.RA.stdBuilder()
.itemInputs(new ItemStack(Items.experience_bottle, 1))
.metadata(FUEL_VALUE, 10)
.metadata(FUEL_TYPE, 5)
- .duration(0)
- .eut(0)
.addTo(GT_RecipeConstants.Fuel);
GT_Values.RA.stdBuilder()
.itemInputs(new ItemStack(Items.ghast_tear, 1))
.metadata(FUEL_VALUE, 50)
.metadata(FUEL_TYPE, 5)
- .duration(0)
- .eut(0)
.addTo(GT_RecipeConstants.Fuel);
GT_Values.RA.stdBuilder()
.itemInputs(new ItemStack(Blocks.beacon, 1))
.metadata(FUEL_VALUE, Materials.NetherStar.mFuelPower * 2)
.metadata(FUEL_TYPE, Materials.NetherStar.mFuelType)
- .duration(0)
- .eut(0)
.addTo(GT_RecipeConstants.Fuel);
GT_Values.RA.stdBuilder()
.itemInputs(GT_ModHandler.getModItem(EnderIO.ID, "bucketRocket_fuel", 1))
.metadata(FUEL_VALUE, 250)
.metadata(FUEL_TYPE, 1)
- .duration(0)
- .eut(0)
.addTo(GT_RecipeConstants.Fuel);
}
}
diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
index b50fe65dc5..9098144114 100644
--- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
+++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
@@ -1,7 +1,7 @@
package gregtech.loaders.load;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCannerRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
+import static gregtech.api.recipe.RecipeMaps.cannerRecipes;
+import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeBuilder.WILDCARD;
import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
@@ -47,7 +47,7 @@ public class GT_ItemIterator implements Runnable {
.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L))
.duration(20 * SECONDS)
.eut(2)
- .addTo(sMaceratorRecipes);
+ .addTo(maceratorRecipes);
GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L));
}
@@ -63,7 +63,7 @@ public class GT_ItemIterator implements Runnable {
.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L))
.duration(20 * SECONDS)
.eut(2)
- .addTo(sMaceratorRecipes);
+ .addTo(maceratorRecipes);
GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L));
}
@@ -89,7 +89,7 @@ public class GT_ItemIterator implements Runnable {
.outputChances(10000, 1000)
.duration(20 * SECONDS)
.eut(2)
- .addTo(sMaceratorRecipes);
+ .addTo(maceratorRecipes);
}
tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L);
@@ -113,7 +113,7 @@ public class GT_ItemIterator implements Runnable {
.outputChances(10000, 1000)
.duration(20 * SECONDS)
.eut(2)
- .addTo(sMaceratorRecipes);
+ .addTo(maceratorRecipes);
}
GT_Log.out.println("GT_Mod: Registering various Tools to be usable on GregTech Machines");
GregTech_API.registerScrewdriver(
@@ -130,31 +130,31 @@ public class GT_ItemIterator implements Runnable {
.itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L))
.duration(10 * SECONDS)
.eut(1)
- .addTo(sCannerRecipes);
+ .addTo(cannerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(new ItemStack(Items.spider_eye, 2, WILDCARD), ItemList.IC2_Food_Can_Empty.get(1L))
.itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L))
.duration(5 * SECONDS)
.eut(1)
- .addTo(sCannerRecipes);
+ .addTo(cannerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Food_Poisonous_Potato.get(2L), ItemList.IC2_Food_Can_Empty.get(1L))
.itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L))
.duration(5 * SECONDS)
.eut(1)
- .addTo(sCannerRecipes);
+ .addTo(cannerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(new ItemStack(Items.cake, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(12L))
.itemOutputs(ItemList.IC2_Food_Can_Filled.get(12L))
.duration(30 * SECONDS)
.eut(1)
- .addTo(sCannerRecipes);
+ .addTo(cannerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(new ItemStack(Items.mushroom_stew, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(6L))
.itemOutputs(ItemList.IC2_Food_Can_Filled.get(6L), new ItemStack(Items.bowl, 1))
.duration(15 * SECONDS)
.eut(1)
- .addTo(sCannerRecipes);
+ .addTo(cannerRecipes);
GT_Log.out.println("GT_Mod: Scanning ItemList.");
@@ -225,7 +225,7 @@ public class GT_ItemIterator implements Runnable {
}
recipeBuilder.duration(tFoodValue * 5 * SECONDS)
.eut(1)
- .addTo(sCannerRecipes);
+ .addTo(cannerRecipes);
}
}
if ((tItem instanceof IFluidContainerItem)) {
@@ -238,8 +238,6 @@ public class GT_ItemIterator implements Runnable {
.itemInputs(new ItemStack(tItem, 1, 0))
.metadata(FUEL_VALUE, 2048)
.metadata(FUEL_TYPE, 5)
- .duration(0)
- .eut(0)
.addTo(GT_RecipeConstants.Fuel);
// twilight forest
@@ -250,7 +248,7 @@ public class GT_ItemIterator implements Runnable {
.outputChances(10000, 3000)
.duration(20 * SECONDS)
.eut(2)
- .addTo(sMaceratorRecipes);
+ .addTo(maceratorRecipes);
GT_ModHandler.addSawmillRecipe(
new ItemStack(tItem, 1, 0),
new ItemStack(Items.stick, 4),
@@ -260,8 +258,6 @@ public class GT_ItemIterator implements Runnable {
.itemOutputs(new ItemStack(Items.stick, 4))
.metadata(FUEL_VALUE, 32)
.metadata(FUEL_TYPE, 5)
- .duration(0)
- .eut(0)
.addTo(GT_RecipeConstants.Fuel);
}
diff --git a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java
index d29d323dc2..8ee6b07714 100644
--- a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java
+++ b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java
@@ -225,7 +225,7 @@ import static gregtech.api.enums.Mods.Gendustry;
import static gregtech.api.enums.Mods.IndustrialCraft2;
import static gregtech.api.enums.Mods.NotEnoughItems;
import static gregtech.api.enums.Mods.Thaumcraft;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes;
+import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import net.minecraft.init.Blocks;
@@ -247,11 +247,11 @@ import gregtech.api.enums.SoundResource;
import gregtech.api.enums.TierEU;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects;
+import gregtech.api.recipe.RecipeMaps;
import gregtech.api.util.ExternalMaterials;
import gregtech.api.util.GT_Log;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
import gregtech.loaders.postload.GT_PCBFactoryMaterialLoader;
import gregtech.loaders.postload.GT_ProcessingArrayRecipeLoader;
@@ -326,13 +326,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Basic Alloy Smelter",
1,
MachineType.ALLOY_SMELTER.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes,
+ RecipeMaps.alloySmelterRecipes,
2,
1,
false,
SoundResource.IC2_MACHINES_INDUCTION_LOOP,
- false,
- false,
SpecialEffects.NONE,
"ALLOY_SMELTER",
new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M',
@@ -347,13 +345,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Alloy Smelter",
2,
MachineType.ALLOY_SMELTER.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes,
+ RecipeMaps.alloySmelterRecipes,
2,
1,
false,
SoundResource.IC2_MACHINES_INDUCTION_LOOP,
- false,
- false,
SpecialEffects.NONE,
"ALLOY_SMELTER",
new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M',
@@ -368,13 +364,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Alloy Smelter II",
3,
MachineType.ALLOY_SMELTER.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes,
+ RecipeMaps.alloySmelterRecipes,
2,
1,
false,
SoundResource.IC2_MACHINES_INDUCTION_LOOP,
- false,
- false,
SpecialEffects.NONE,
"ALLOY_SMELTER",
new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M',
@@ -389,13 +383,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Alloy Smelter III",
4,
MachineType.ALLOY_SMELTER.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes,
+ RecipeMaps.alloySmelterRecipes,
2,
1,
false,
SoundResource.IC2_MACHINES_INDUCTION_LOOP,
- false,
- false,
SpecialEffects.NONE,
"ALLOY_SMELTER",
new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M',
@@ -410,13 +402,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Alloy Smelter IV",
5,
MachineType.ALLOY_SMELTER.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes,
+ RecipeMaps.alloySmelterRecipes,
2,
1,
false,
SoundResource.IC2_MACHINES_INDUCTION_LOOP,
- false,
- false,
SpecialEffects.NONE,
"ALLOY_SMELTER",
new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M',
@@ -434,13 +424,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Basic Arc Furnace",
1,
MachineType.ARC_FURNACE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sArcFurnaceRecipes,
+ RecipeMaps.arcFurnaceRecipes,
1,
4,
true,
SoundResource.IC2_MACHINES_INDUCTION_LOOP,
- false,
- false,
SpecialEffects.NONE,
"ARC_FURNACE",
new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
@@ -456,13 +444,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Arc Furnace",
2,
MachineType.ARC_FURNACE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sArcFurnaceRecipes,
+ RecipeMaps.arcFurnaceRecipes,
1,
4,
true,
SoundResource.IC2_MACHINES_INDUCTION_LOOP,
- false,
- false,
SpecialEffects.NONE,
"ARC_FURNACE",
new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
@@ -477,13 +463,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Arc Furnace II",
3,
MachineType.ARC_FURNACE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sArcFurnaceRecipes,
+ RecipeMaps.arcFurnaceRecipes,
1,
4,
true,
SoundResource.IC2_MACHINES_INDUCTION_LOOP,
- false,
- false,
SpecialEffects.NONE,
"ARC_FURNACE",
new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
@@ -499,13 +483,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Arc Furnace III",
4,
MachineType.ARC_FURNACE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sArcFurnaceRecipes,
+ RecipeMaps.arcFurnaceRecipes,
1,
9,
true,
SoundResource.IC2_MACHINES_INDUCTION_LOOP,
- false,
- false,
SpecialEffects.NONE,
"ARC_FURNACE",
new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
@@ -521,13 +503,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Arc Furnace IV",
5,
MachineType.ARC_FURNACE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sArcFurnaceRecipes,
+ RecipeMaps.arcFurnaceRecipes,
1,
9,
true,
SoundResource.IC2_MACHINES_INDUCTION_LOOP,
- false,
- false,
SpecialEffects.NONE,
"ARC_FURNACE",
new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
@@ -545,13 +525,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Basic Assembling Machine",
1,
MachineType.ASSEMBLER.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sAssemblerRecipes,
+ RecipeMaps.assemblerRecipes,
6,
1,
true,
SoundResource.NONE,
- false,
- false,
SpecialEffects.NONE,
"ASSEMBLER",
new Object[] { "ACA", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
@@ -566,13 +544,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Assembling Machine",
2,
MachineType.ASSEMBLER.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sAssemblerRecipes,
+ RecipeMaps.assemblerRecipes,
9,
1,
true,
SoundResource.NONE,
- false,
- false,
SpecialEffects.NONE,
"ASSEMBLER",
new Object[] { "ACA", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
@@ -587,13 +563,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Assembling Machine II",
3,
MachineType.ASSEMBLER.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sAssemblerRecipes,
+ RecipeMaps.assemblerRecipes,
9,
1,
true,
SoundResource.NONE,
- false,
- false,
SpecialEffects.NONE,
"ASSEMBLER",
new Object[] { "ACA", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
@@ -608,13 +582,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Assembling Machine III",
4,
MachineType.ASSEMBLER.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sAssemblerRecipes,
+ RecipeMaps.assemblerRecipes,
9,
1,
true,
SoundResource.NONE,
- false,
- false,
SpecialEffects.NONE,
"ASSEMBLER",
new Object[] { "ACA", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
@@ -629,13 +601,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Assembling Machine IV",
5,
MachineType.ASSEMBLER.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sAssemblerRecipes,
+ RecipeMaps.assemblerRecipes,
9,
1,
true,
SoundResource.NONE,
- false,
- false,
SpecialEffects.NONE,
"ASSEMBLER",
new Object[] { "ACA", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
@@ -653,13 +623,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Basic Autoclave",
1,
MachineType.AUTOCLAVE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes,
+ RecipeMaps.autoclaveRecipes,
2,
2,
true,
SoundResource.NONE,
- false,
- false,
SpecialEffects.NONE,
"AUTOCLAVE",
new Object[] { "IGI", "IMI", "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
@@ -675,13 +643,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Autoclave",
2,
MachineType.AUTOCLAVE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes,
+ RecipeMaps.autoclaveRecipes,
2,
2,
true,
SoundResource.NONE,
- false,
- false,
SpecialEffects.NONE,
"AUTOCLAVE",
new Object[] { "IGI", "IMI", "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
@@ -697,13 +663,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Autoclave II",
3,
MachineType.AUTOCLAVE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes,
+ RecipeMaps.autoclaveRecipes,
2,
3,
true,
SoundResource.NONE,
- false,
- false,
SpecialEffects.NONE,
"AUTOCLAVE",
new Object[] { "IGI", "IMI", "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
@@ -719,13 +683,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Autoclave III",
4,
MachineType.AUTOCLAVE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes,
+ RecipeMaps.autoclaveRecipes,
2,
4,
true,
SoundResource.NONE,
- false,
- false,
SpecialEffects.NONE,
"AUTOCLAVE",
new Object[] { "IGI", "IMI", "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
@@ -741,13 +703,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Autoclave IV",
5,
MachineType.AUTOCLAVE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes,
+ RecipeMaps.autoclaveRecipes,
2,
4,
true,
SoundResource.NONE,
- false,
- false,
SpecialEffects.NONE,
"AUTOCLAVE",
new Object[] { "IGI", "IMI", "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
@@ -766,13 +726,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Basic Bending Machine",
1,
MachineType.BENDING_MACHINE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sBenderRecipes,
+ RecipeMaps.benderRecipes,
2,
1,
false,
SoundResource.IC2_MACHINES_COMPRESSOR_OP,
- false,
- false,
SpecialEffects.NONE,
"BENDER",
new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M',
@@ -788,13 +746,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Bending Machine",
2,
MachineType.BENDING_MACHINE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sBenderRecipes,
+ RecipeMaps.benderRecipes,
2,
1,
false,
SoundResource.IC2_MACHINES_COMPRESSOR_OP,
- false,
- false,
SpecialEffects.NONE,
"BENDER",
new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M',
@@ -810,13 +766,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Bending Machine II",
3,
MachineType.BENDING_MACHINE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sBenderRecipes,
+ RecipeMaps.benderRecipes,
2,
1,
false,
SoundResource.IC2_MACHINES_COMPRESSOR_OP,
- false,
- false,
SpecialEffects.NONE,
"BENDER",
new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M',
@@ -832,13 +786,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Bending Machine III",
4,
MachineType.BENDING_MACHINE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sBenderRecipes,
+ RecipeMaps.benderRecipes,
2,
1,
false,
SoundResource.IC2_MACHINES_COMPRESSOR_OP,
- false,
- false,
SpecialEffects.NONE,
"BENDER",
new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M',
@@ -854,13 +806,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Bending Machine IV",
5,
MachineType.BENDING_MACHINE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sBenderRecipes,
+ RecipeMaps.benderRecipes,
2,
1,
false,
SoundResource.IC2_MACHINES_COMPRESSOR_OP,
- false,
- false,
SpecialEffects.NONE,
"BENDER",
new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M',
@@ -879,13 +829,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Basic Canning Machine",
1,
MachineType.CANNER.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sCannerRecipes,
+ RecipeMaps.cannerRecipes,
2,
2,
false,
SoundResource.IC2_MACHINES_EXTRACTOR_OP,
- false,
- false,
SpecialEffects.NONE,
"CANNER",
new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M',
@@ -901,13 +849,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Canning Machine",
2,
MachineType.CANNER.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sCannerRecipes,
+ RecipeMaps.cannerRecipes,
2,
2,
false,
SoundResource.IC2_MACHINES_EXTRACTOR_OP,
- false,
- false,
SpecialEffects.NONE,
"CANNER",
new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M',
@@ -923,13 +869,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Canning Machine II",
3,
MachineType.CANNER.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sCannerRecipes,
+ RecipeMaps.cannerRecipes,
2,
2,
false,
SoundResource.IC2_MACHINES_EXTRACTOR_OP,
- false,
- false,
SpecialEffects.NONE,
"CANNER",
new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M',
@@ -945,13 +889,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Canning Machine III",
4,
MachineType.CANNER.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sCannerRecipes,
+ RecipeMaps.cannerRecipes,
2,
2,
false,
SoundResource.IC2_MACHINES_EXTRACTOR_OP,
- false,
- false,
SpecialEffects.NONE,
"CANNER",
new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M',
@@ -967,13 +909,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Canning Machine IV",
5,
MachineType.CANNER.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sCannerRecipes,
+ RecipeMaps.cannerRecipes,
2,
2,
false,
SoundResource.IC2_MACHINES_EXTRACTOR_OP,
- false,
- false,
SpecialEffects.NONE,
"CANNER",
new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M',
@@ -992,13 +932,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Basic Centrifuge",
1,
MachineType.CENTRIFUGE.tooltipDescription(),
- GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes,
+ RecipeMaps.centrifugeRecipes,
2,
6,
true,
SoundResource.NONE,
- false,
- false,
SpecialEffects.NONE,
"CENTRIFUGE",
new Object[] { "CEC", aTextWireHull, "CEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
@@ -1012,13 +950,11 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
"Advanced Centrifuge",
2,