aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-10-25 23:47:58 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-10-25 23:47:58 +1000
commitf2a89339d7f6f875d34d4a7bb1868a1d4a3cf644 (patch)
tree114d97fb80a7a6310ea0a6f77030607f83bed627 /src
parente5e1581403e9f6e9d76e362c5e4861b4258af7cc (diff)
downloadGT5-Unofficial-f2a89339d7f6f875d34d4a7bb1868a1d4a3cf644.tar.gz
GT5-Unofficial-f2a89339d7f6f875d34d4a7bb1868a1d4a3cf644.tar.bz2
GT5-Unofficial-f2a89339d7f6f875d34d4a7bb1868a1d4a3cf644.zip
+ Tried improving the handling of Blast Smelting.
+ Tried adding shapeless dust recipes for all of my alloys. (The shapeless recipe system is dumb) + Added a custom GUI for NEI recipes for the Blast Smelter. % Refactored some Utils classes.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gregtech/api/util/Recipe_GT.java6
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java10
-rw-r--r--src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java4
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java66
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java4
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java10
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java6
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java40
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java26
-rw-r--r--src/Java/gtPlusPlus/core/container/Container_Workbench.java6
-rw-r--r--src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java6
-rw-r--r--src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java4
-rw-r--r--src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java8
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java38
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java18
-rw-r--r--src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java6
-rw-r--r--src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java8
-rw-r--r--src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java6
-rw-r--r--src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java6
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java12
-rw-r--r--src/Java/gtPlusPlus/core/item/init/ItemsFoods.java14
-rw-r--r--src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java12
-rw-r--r--src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java12
-rw-r--r--src/Java/gtPlusPlus/core/material/ALLOY.java9
-rw-r--r--src/Java/gtPlusPlus/core/material/Material.java122
-rw-r--r--src/Java/gtPlusPlus/core/material/MaterialStack.java95
-rw-r--r--src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java22
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java92
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_General.java18
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java8
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java82
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java144
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java6
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java18
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java16
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java50
-rw-r--r--src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java4
-rw-r--r--src/Java/gtPlusPlus/core/util/Utils.java4
-rw-r--r--src/Java/gtPlusPlus/core/util/item/ItemUtils.java (renamed from src/Java/gtPlusPlus/core/util/item/UtilsItems.java)14
-rw-r--r--src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java (renamed from src/Java/gtPlusPlus/core/util/recipe/UtilsRecipe.java)23
-rw-r--r--src/Java/gtPlusPlus/core/util/recipe/shapeless/ShapelessUtils.java56
-rw-r--r--src/Java/gtPlusPlus/core/util/wrapper/var.java8
-rw-r--r--src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java32
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java20
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java183
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java18
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java66
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java58
-rw-r--r--src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java28
-rw-r--r--src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java44
-rw-r--r--src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java10
-rw-r--r--src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java4
-rw-r--r--src/resources/assets/gregtech/textures/gui/basicmachines/BlastSmelter.pngbin0 -> 5136 bytes
68 files changed, 903 insertions, 739 deletions
diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java
index 979a6f17e5..11a858f641 100644
--- a/src/Java/gregtech/api/util/Recipe_GT.java
+++ b/src/Java/gregtech/api/util/Recipe_GT.java
@@ -8,7 +8,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
import gregtech.api.objects.GT_ItemStack;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import java.util.ArrayList;
import java.util.Collection;
@@ -73,7 +73,7 @@ public class Recipe_GT extends GT_Recipe{
protected Recipe_GT(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
super(aOptimize, aInputs, aOutputs, aSpecialItems, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue);
- Utils.LOG_SPECIFIC_WARNING(this.getClass().getName()+" | [GregtechRecipe]", "Created new recipe instance for "+UtilsItems.getArrayStackNames(aInputs), 167);
+ Utils.LOG_SPECIFIC_WARNING(this.getClass().getName()+" | [GregtechRecipe]", "Created new recipe instance for "+ItemUtils.getArrayStackNames(aInputs), 167);
}
public Recipe_GT(ItemStack aInput1, ItemStack aOutput1, int aFuelValue, int aType) {
@@ -235,7 +235,7 @@ public class Recipe_GT extends GT_Recipe{
public static final Gregtech_Recipe_Map_Fuel sRocketFuels = new Gregtech_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.recipe.rocketenginefuel", "Rocket Engine Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 3000, " EU", true, true);
public static final Gregtech_Recipe_Map_Fuel sGeoThermalFuels = new Gregtech_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.recipe.geothermalfuel", "GeoThermal Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
public static final GT_Recipe_Map sChemicalDehydratorRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.recipe.chemicaldehydrator", "Chemical Dehydrator", null, RES_PATH_GUI + "basicmachines/Dehydrator", 2, 9, 0, 0, 1, E, 1, E, true, true);
- public static final GT_Recipe_Map sAlloyBlastSmelterRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.recipe.alloyblastsmelter", "Alloy Blast Smelter", null, RES_PATH_GUI + "basicmachines/Dehydrator", 9, 1, 1, 0, 1, E, 1, E, true, true);
+ public static final GT_Recipe_Map sAlloyBlastSmelterRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.recipe.alloyblastsmelter", "Alloy Blast Smelter", null, RES_PATH_GUI + "basicmachines/BlastSmelter", 9, 1, 1, 0, 1, E, 1, E, true, true);
/**
* HashMap of Recipes based on their Items
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 4bb8a12836..353044e6ee 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -20,7 +20,7 @@ import gtPlusPlus.core.handler.events.LoginEventHandler;
import gtPlusPlus.core.item.general.RF2EU_Battery;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.HANDLER_GT;
@@ -204,12 +204,12 @@ implements ActionListener
Utils.LOG_INFO("Dumping "+r.mUnlocalizedName+" Recipes for Debug.");
for(GT_Recipe newBo : x){
Utils.LOG_INFO("========================");
- Utils.LOG_INFO("Dumping Input: "+UtilsItems.getArrayStackNames(newBo.mInputs));
- Utils.LOG_INFO("Dumping Inputs "+UtilsItems.getFluidArrayStackNames(newBo.mFluidInputs));
+ Utils.LOG_INFO("Dumping Input: "+ItemUtils.getArrayStackNames(newBo.mInputs));
+ Utils.LOG_INFO("Dumping Inputs "+ItemUtils.getFluidArrayStackNames(newBo.mFluidInputs));
Utils.LOG_INFO("Dumping Duration: "+newBo.mDuration);
Utils.LOG_INFO("Dumping EU/t: "+newBo.mEUt);
- Utils.LOG_INFO("Dumping Output: "+UtilsItems.getArrayStackNames(newBo.mOutputs));
- Utils.LOG_INFO("Dumping Output: "+UtilsItems.getFluidArrayStackNames(newBo.mFluidOutputs));
+ Utils.LOG_INFO("Dumping Output: "+ItemUtils.getArrayStackNames(newBo.mOutputs));
+ Utils.LOG_INFO("Dumping Output: "+ItemUtils.getFluidArrayStackNames(newBo.mFluidOutputs));
Utils.LOG_INFO("========================");
}
}
diff --git a/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java b/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java
index 06c13f997a..5ffd70efc4 100644
--- a/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java
+++ b/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java
@@ -4,7 +4,7 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.block.machine.heliumgen.slots.InvSlotRadiation;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import ic2.api.Direction;
import ic2.api.reactor.IReactor;
import ic2.api.reactor.IReactorComponent;
@@ -51,7 +51,7 @@ public class TileEntityHeliumGenerator extends TileEntityInventory implements II
if(++progress >= 40){
//if(++progress >= 300){
if(heliumStack == null)
- heliumStack = UtilsItems.getSimpleStack(ModItems.itemHeliumBlob);
+ heliumStack = ItemUtils.getSimpleStack(ModItems.itemHeliumBlob);
else if(heliumStack.getItem() == ModItems.itemHeliumBlob && heliumStack.stackSize < 64)
heliumStack.stackSize++;
progress = 0;
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
index efa86f0009..c64e332c50 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.common.compat;
import static gtPlusPlus.core.handler.COMPAT_HANDLER.AddRecipeQueue;
import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
import gtPlusPlus.core.recipe.ShapedRecipeObject;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.item.ItemStack;
@@ -11,49 +11,49 @@ import net.minecraft.item.ItemStack;
public class COMPAT_CompactWindmills {
//Change IC2 Upgrades
- public static ItemStack kineticWind = UtilsItems.simpleMetaStack("IC2:blockKineticGenerator", 0, 1);
- public static ItemStack shaftIron = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 11, 1);
- public static ItemStack cableCopper = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 1367, 1);
+ public static ItemStack kineticWind = ItemUtils.simpleMetaStack("IC2:blockKineticGenerator", 0, 1);
+ public static ItemStack shaftIron = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 11, 1);
+ public static ItemStack cableCopper = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 1367, 1);
public static String plateRubber = "ore:plateRubber";
//Machine Casings
- public static ItemStack elvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 0, 1);
- public static ItemStack lvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 1, 1);
- public static ItemStack mvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 2, 1);
- public static ItemStack hvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 3, 1);
- public static ItemStack evCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 4, 1);
- public static ItemStack ivCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 5, 1);
+ public static ItemStack elvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 0, 1);
+ public static ItemStack lvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 1, 1);
+ public static ItemStack mvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 2, 1);
+ public static ItemStack hvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 3, 1);
+ public static ItemStack evCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 4, 1);
+ public static ItemStack ivCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 5, 1);
//GT Transformers
- public static ItemStack elvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 20, 1);
- public static ItemStack lvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 21, 1);
- public static ItemStack mvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 22, 1);
- public static ItemStack hvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 23, 1);
- public static ItemStack evTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 24, 1);
+ public static ItemStack elvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 20, 1);
+ public static ItemStack lvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 21, 1);
+ public static ItemStack mvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 22, 1);
+ public static ItemStack hvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 23, 1);
+ public static ItemStack evTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 24, 1);
//Compact Windmills
- public static ItemStack elvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 0, 1);
- public static ItemStack lvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 1, 1);
- public static ItemStack mvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 2, 1);
- public static ItemStack hvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 3, 1);
- public static ItemStack evWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 4, 1);
+ public static ItemStack elvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 0, 1);
+ public static ItemStack lvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 1, 1);
+ public static ItemStack mvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 2, 1);
+ public static ItemStack hvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 3, 1);
+ public static ItemStack evWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 4, 1);
//Compact Rotors
- public static ItemStack rotor2 = UtilsItems.getItemStack("CompactWindmills:WOOL", 1);
- public static ItemStack rotor1 = UtilsItems.getItemStack("CompactWindmills:WOOD", 1);
- public static ItemStack rotor3 = UtilsItems.getItemStack("CompactWindmills:ALLOY", 1);
- public static ItemStack rotor4 = UtilsItems.getItemStack("CompactWindmills:CARBON", 1);
- public static ItemStack rotor5 = UtilsItems.getItemStack("CompactWindmills:IRIDIUM", 1);
+ public static ItemStack rotor2 = ItemUtils.getItemStack("CompactWindmills:WOOL", 1);
+ public static ItemStack rotor1 = ItemUtils.getItemStack("CompactWindmills:WOOD", 1);
+ public static ItemStack rotor3 = ItemUtils.getItemStack("CompactWindmills:ALLOY", 1);
+ public static ItemStack rotor4 = ItemUtils.getItemStack("CompactWindmills:CARBON", 1);
+ public static ItemStack rotor5 = ItemUtils.getItemStack("CompactWindmills:IRIDIUM", 1);
//IC2 Rotors
- public static ItemStack rotorIC1 = UtilsItems.getItemStack("IC2:itemwoodrotor", 1);
- public static ItemStack rotorIC2 = UtilsItems.getItemStack("IC2:itemironrotor", 1);
- public static ItemStack rotorIC3 = UtilsItems.getItemStack("IC2:itemsteelrotor", 1);
- public static ItemStack rotorIC4 = UtilsItems.getItemStack("IC2:itemwcarbonrotor", 1);
- public static ItemStack rotorBlade1 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 7, 1);
- public static ItemStack rotorBlade2 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 8, 1);
- public static ItemStack rotorBlade3 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 10, 1);
- public static ItemStack rotorBlade4 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 9, 1);
+ public static ItemStack rotorIC1 = ItemUtils.getItemStack("IC2:itemwoodrotor", 1);
+ public static ItemStack rotorIC2 = ItemUtils.getItemStack("IC2:itemironrotor", 1);
+ public static ItemStack rotorIC3 = ItemUtils.getItemStack("IC2:itemsteelrotor", 1);
+ public static ItemStack rotorIC4 = ItemUtils.getItemStack("IC2:itemwcarbonrotor", 1);
+ public static ItemStack rotorBlade1 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 7, 1);
+ public static ItemStack rotorBlade2 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 8, 1);
+ public static ItemStack rotorBlade3 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 10, 1);
+ public static ItemStack rotorBlade4 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 9, 1);
//Plates
public static String plateTier1 = "ore:plateMagnalium";
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
index d538b2df3d..7a5389e37c 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.common.compat;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.item.ItemStack;
public class COMPAT_EnderIO {
@@ -12,7 +12,7 @@ public class COMPAT_EnderIO {
}
private static final void run(){
- UtilsItems.getItemForOreDict("EnderIO:itemAlloy", "ingotVibrantAlloy", "Vibrant Alloy Ingot", 2);
+ ItemUtils.getItemForOreDict("EnderIO:itemAlloy", "ingotVibrantAlloy", "Vibrant Alloy Ingot", 2);
GT_OreDictUnificator.registerOre("plateConductiveIron", new ItemStack(ModItems.itemPlateConductiveIron));
GT_OreDictUnificator.registerOre("plateDarkSteel", new ItemStack(ModItems.itemPlateDarkSteel));
GT_OreDictUnificator.registerOre("plateElectricalSteel", new ItemStack(ModItems.itemPlateElectricalSteel));
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
index 5e21c432b5..d8ff219db7 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
@@ -2,25 +2,25 @@ package gtPlusPlus.core.common.compat;
import gtPlusPlus.core.lib.CORE.configSwitches;
import gtPlusPlus.core.recipe.RECIPES_Tools;
-import gtPlusPlus.core.util.item.UtilsItems;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import net.minecraft.item.ItemStack;
public class COMPAT_ExtraUtils {
public static void OreDict(){
- RECIPES_Tools.RECIPE_DivisionSigil = new ItemStack(UtilsItems.getItem("ExtraUtilities:divisionSigil"));
+ RECIPES_Tools.RECIPE_DivisionSigil = new ItemStack(ItemUtils.getItem("ExtraUtilities:divisionSigil"));
run();
}
private static final void run(){
- UtilsItems.getItemForOreDict("ExtraUtilities:bedrockiumIngot", "ingotBedrockium", "Bedrockium Ingot", 0);
+ ItemUtils.getItemForOreDict("ExtraUtilities:bedrockiumIngot", "ingotBedrockium", "Bedrockium Ingot", 0);
//GT_OreDictUnificator.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium));
if (configSwitches.enableAlternativeDivisionSigilRecipe){
//Division Sigil
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
"plateNetherStar", "gemIridium", "plateNetherStar",
"plateIridium", RECIPES_Tools.craftingToolHardHammer, "plateIridium",
"plateNetherStar", "gemIridium", "plateNetherStar",
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
index 14ec5dfd4d..c1546bba63 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
@@ -5,14 +5,14 @@ import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.lib.CORE.configSwitches;
import gtPlusPlus.core.recipe.ShapedRecipeObject;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.item.ItemStack;
public class COMPAT_IC2 {
- private static ItemStack itemCropnalyzer = UtilsItems.simpleMetaStack("IC2:itemCropnalyzer", 0, 1);
- private static ItemStack itemSolarHelmet = UtilsItems.simpleMetaStack("IC2:itemSolarHelmet", 0, 1);
+ private static ItemStack itemCropnalyzer = ItemUtils.simpleMetaStack("IC2:itemCropnalyzer", 0, 1);
+ private static ItemStack itemSolarHelmet = ItemUtils.simpleMetaStack("IC2:itemSolarHelmet", 0, 1);
public static ShapedRecipeObject Cropnalyzer = new ShapedRecipeObject(
"ore:cableGt02Copper", "ore:cableGt02Copper", null,
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java
index 3a996ed849..9e29458bce 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java
@@ -1,6 +1,6 @@
package gtPlusPlus.core.common.compat;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
public class COMPAT_MorePlanets {
@@ -11,27 +11,27 @@ public class COMPAT_MorePlanets {
private final static void run(){
//Metals
- UtilsItems.getItemForOreDict("MorePlanet:kapteyn-b_item", "ingotFrozenIron", "Frozen Iron Ingot", 0);
- UtilsItems.getItemForOreDict("MorePlanet:kapteyn-b_item", "ingotAnyIron", "Frozen Iron Ingot", 0);
- UtilsItems.getItemForOreDict("MorePlanet:polongnius_item", "ingotPalladium", "Palladium Ingot", 5);
- UtilsItems.getItemForOreDict("MorePlanet:fronos_item", "ingotIridium", "Iridium Ingot", 3);
- UtilsItems.getItemForOreDict("MorePlanet:nibiru_item", "ingotNorium", "Norium Ingot", 1);
- UtilsItems.getItemForOreDict("MorePlanet:venus_item", "ingotLead", "Lead Ingot", 0);
- UtilsItems.getItemForOreDict("MorePlanet:diona_item", "ingotQuontonium", "Quontonium Ingot", 0);
- UtilsItems.getItemForOreDict("MorePlanet:diona_item", "ingotFronisium", "Fronisium Ingot", 1);
- UtilsItems.getItemForOreDict("MorePlanet:sirius-b_item", "ingotSulfur", "Sulfur Ingot", 3);
- UtilsItems.getItemForOreDict("MorePlanet:koentus_item", "ingotKoentusMeteoricIron", "Koentus Meteoric Iron Ingot", 4);
- UtilsItems.getItemForOreDict("MorePlanet:mercury_item", "ingotMetallic", "Metallic Ingot", 2);
- UtilsItems.getItemForOreDict("MorePlanet:polongnius_item", "ingotPolongiusMeteoricIron", "Polongius Meteoric Iron Ingot", 4);
- UtilsItems.getItemForOreDict("MorePlanet:mercury_item", "ingotMeteoricSteel", "Meteoric Steel Ingot", 3);
- UtilsItems.getItemForOreDict("MorePlanet:sirius-b_item", "dustSulfur", "Sulfur Dust", 2);
+ ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "ingotFrozenIron", "Frozen Iron Ingot", 0);
+ ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "ingotAnyIron", "Frozen Iron Ingot", 0);
+ ItemUtils.getItemForOreDict("MorePlanet:polongnius_item", "ingotPalladium", "Palladium Ingot", 5);
+ ItemUtils.getItemForOreDict("MorePlanet:fronos_item", "ingotIridium", "Iridium Ingot", 3);
+ ItemUtils.getItemForOreDict("MorePlanet:nibiru_item", "ingotNorium", "Norium Ingot", 1);
+ ItemUtils.getItemForOreDict("MorePlanet:venus_item", "ingotLead", "Lead Ingot", 0);
+ ItemUtils.getItemForOreDict("MorePlanet:diona_item", "ingotQuontonium", "Quontonium Ingot", 0);
+ ItemUtils.getItemForOreDict("MorePlanet:diona_item", "ingotFronisium", "Fronisium Ingot", 1);
+ ItemUtils.getItemForOreDict("MorePlanet:sirius-b_item", "ingotSulfur", "Sulfur Ingot", 3);
+ ItemUtils.getItemForOreDict("MorePlanet:koentus_item", "ingotKoentusMeteoricIron", "Koentus Meteoric Iron Ingot", 4);
+ ItemUtils.getItemForOreDict("MorePlanet:mercury_item", "ingotMetallic", "Metallic Ingot", 2);
+ ItemUtils.getItemForOreDict("MorePlanet:polongnius_item", "ingotPolongiusMeteoricIron", "Polongius Meteoric Iron Ingot", 4);
+ ItemUtils.getItemForOreDict("MorePlanet:mercury_item", "ingotMeteoricSteel", "Meteoric Steel Ingot", 3);
+ ItemUtils.getItemForOreDict("MorePlanet:sirius-b_item", "dustSulfur", "Sulfur Dust", 2);
//Gems
- UtilsItems.getItemForOreDict("MorePlanet:fronos_item", "gemBlackDiamond", "Black Diamond Gem", 2);
- UtilsItems.getItemForOreDict("MorePlanet:koentus_item", "gemWhiteCrystal", "White Crystal", 0);
- UtilsItems.getItemForOreDict("MorePlanet:nibiru_item", "gemRedCrystal", "Red Crystal", 0);
- UtilsItems.getItemForOreDict("MorePlanet:pluto_item", "gemXeonius", "Xeonius Gem", 0);
- UtilsItems.getItemForOreDict("MorePlanet:kapteyn-b_item", "gemUranium", "Uranium Gem", 1);
+ ItemUtils.getItemForOreDict("MorePlanet:fronos_item", "gemBlackDiamond", "Black Diamond Gem", 2);
+ ItemUtils.getItemForOreDict("MorePlanet:koentus_item", "gemWhiteCrystal", "White Crystal", 0);
+ ItemUtils.getItemForOreDict("MorePlanet:nibiru_item", "gemRedCrystal", "Red Crystal", 0);
+ ItemUtils.getItemForOreDict("MorePlanet:pluto_item", "gemXeonius", "Xeonius Gem", 0);
+ ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "gemUranium", "Uranium Gem", 1);
}
}
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
index d99e81f48d..b1b7464dd2 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.common.compat;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.lib.CORE.configSwitches;
import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
public class COMPAT_Thaumcraft {
@@ -18,26 +18,26 @@ public class COMPAT_Thaumcraft {
for(int i=0; i<=6; i++){
//Utils.LOG_INFO(""+i);
- UtilsItems.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard "+i, i);
- GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("Thaumcraft:ItemShard:"+i, 1));
- UtilsItems.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard "+i, i);
- GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("Thaumcraft:ItemShard:"+i, 1));
+ ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard "+i, i);
+ GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStack("Thaumcraft:ItemShard:"+i, 1));
+ ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard "+i, i);
+ GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStack("Thaumcraft:ItemShard:"+i, 1));
//System.out.println("TC Shard registration count is: "+i);
}
if (LoadedMods.ForbiddenMagic){
for(int i=0; i<=6; i++){
//Utils.LOG_INFO(""+i);
- UtilsItems.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard "+i, i);
- GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("ForbiddenMagic:NetherShard:"+i, 1));
- UtilsItems.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard "+i, i);
- GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("ForbiddenMagic:NetherShard:"+i, 1));
+ ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard "+i, i);
+ GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStack("ForbiddenMagic:NetherShard:"+i, 1));
+ ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard "+i, i);
+ GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStack("ForbiddenMagic:NetherShard:"+i, 1));
//System.out.println("TC Shard registration count is: "+i);
}
- UtilsItems.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0);
- GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("ForbiddenMagic:GluttonyShard", 1));
- UtilsItems.getItemForOreDict("ForbiddenMagic:GluttonyShard", "gemInfusedAnything", "FM Gluttony Shard", 0);
- GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("ForbiddenMagic:GluttonyShard", 1));
+ ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0);
+ GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStack("ForbiddenMagic:GluttonyShard", 1));
+ ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "gemInfusedAnything", "FM Gluttony Shard", 0);
+ GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStack("ForbiddenMagic:GluttonyShard", 1));
}
}
diff --git a/src/Java/gtPlusPlus/core/container/Container_Workbench.java b/src/Java/gtPlusPlus/core/container/Container_Workbench.java
index 6e68eb7338..c814f8815e 100644
--- a/src/Java/gtPlusPlus/core/container/Container_Workbench.java
+++ b/src/Java/gtPlusPlus/core/container/Container_Workbench.java
@@ -14,7 +14,7 @@ import gtPlusPlus.core.slots.SlotNoInput;
import gtPlusPlus.core.slots.SlotOutput;
import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -216,9 +216,9 @@ public class Container_Workbench extends Container {
Utils.LOG_WARNING("Output slot was not empty.");
Utils.LOG_WARNING("Trying to manipulate NBT data on the blueprint stack, then replace it with the new one.");
tempItemBlueprint.setBlueprint(inventoryHolo.getStackInSlot(1), craftMatrix, inventoryHolo.getStackInSlot(0));
- ItemStack newTempBlueprint = UtilsItems.getSimpleStack(tempItemBlueprint);
+ ItemStack newTempBlueprint = ItemUtils.getSimpleStack(tempItemBlueprint);
inventoryHolo.setInventorySlotContents(1, newTempBlueprint);
- Utils.LOG_WARNING(UtilsItems.getArrayStackNames(tempItemBlueprint.getBlueprint(newTempBlueprint)));
+ Utils.LOG_WARNING(ItemUtils.getArrayStackNames(tempItemBlueprint.getBlueprint(newTempBlueprint)));
}
else {
if (tempItemBlueprint.hasBlueprint(tempBlueprint)){
diff --git a/src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java b/src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java
index 17ec451056..f7dc7bb08c 100644
--- a/src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java
+++ b/src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java
@@ -14,7 +14,7 @@ import gtPlusPlus.core.slots.SlotNoInput;
import gtPlusPlus.core.slots.SlotOutput;
import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -182,9 +182,9 @@ public class Container_WorkbenchAdvanced extends Container {
Utils.LOG_WARNING("Output slot was not empty.");
Utils.LOG_WARNING("Trying to manipulate NBT data on the blueprint stack, then replace it with the new one.");
tempItemBlueprint.setBlueprint(inventoryHolo.getStackInSlot(1), craftMatrix, inventoryHolo.getStackInSlot(0));
- ItemStack newTempBlueprint = UtilsItems.getSimpleStack(tempItemBlueprint);
+ ItemStack newTempBlueprint = ItemUtils.getSimpleStack(tempItemBlueprint);
inventoryHolo.setInventorySlotContents(1, newTempBlueprint);
- Utils.LOG_WARNING(UtilsItems.getArrayStackNames(tempItemBlueprint.getBlueprint(newTempBlueprint)));
+ Utils.LOG_WARNING(ItemUtils.getArrayStackNames(tempItemBlueprint.getBlueprint(newTempBlueprint)));
}
else {
if (tempItemBlueprint.hasBlueprint(tempBlueprint)){
diff --git a/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java b/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java
index ebd84f9654..703256267b 100644
--- a/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java
+++ b/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java
@@ -28,7 +28,7 @@ public class BlockFluidBase extends BlockFluidClassic {
@SuppressWarnings("deprecation")
public BlockFluidBase(Fluid fluid, Material material) {
- super(fluid, net.minecraft.block.material.Material.water);
+ super(fluid, net.minecraft.block.material.Material.lava);
short[] tempColour = material.getRGBA();
this.colour = Utils.rgbtoHexValue(tempColour[0], tempColour[1], tempColour[2]);
this.fluidMaterial = material;
@@ -40,7 +40,7 @@ public class BlockFluidBase extends BlockFluidClassic {
@SuppressWarnings("deprecation")
public BlockFluidBase(String fluidName, Fluid fluid, short[] colour) {
- super(fluid, net.minecraft.block.material.Material.water);
+ super(fluid, net.minecraft.block.material.Material.lava);
short[] tempColour = colour;
this.colour = Utils.rgbtoHexValue(tempColour[0], tempColour[1], tempColour[2]);
setCreativeTab(AddToCreativeTab.tabOther);
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index e51dc157c6..c57275edce 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -21,8 +21,8 @@ import gtPlusPlus.core.recipe.RECIPES_GREGTECH;
import gtPlusPlus.core.recipe.RECIPES_LaserEngraver;
import gtPlusPlus.core.recipe.ShapedRecipeObject;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechDehydrator;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechEnergyBuffer;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechGeothermalThermalGenerator;
@@ -65,7 +65,7 @@ public class COMPAT_HANDLER {
GT_OreDictUnificator.registerOre("craftingToolSandHammer", new ItemStack(ModItems.itemSandstoneHammer));
for(int i=1; i<=10; i++){
- GT_OreDictUnificator.registerOre("bufferCore_"+CORE.VOLTAGES[i-1], new ItemStack(UtilsItems.getItem("miscutils:item.itemBufferCore"+i)));
+ GT_OreDictUnificator.registerOre("bufferCore_"+CORE.VOLTAGES[i-1], new ItemStack(ItemUtils.getItem("miscutils:item.itemBufferCore"+i)));
}
}
@@ -135,7 +135,7 @@ public class COMPAT_HANDLER {
public static void RemoveRecipesFromOtherMods(){
//Removal of Recipes
for(Object item : RemoveRecipeQueue){
- UtilsRecipe.removeCraftingRecipe(item);
+ RecipeUtils.removeCraftingRecipe(item);
}
}
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index e77f457487..1d1b38bcfc 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.item;
import static gtPlusPlus.core.creative.AddToCreativeTab.tabMachines;
import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT;
-import static gtPlusPlus.core.util.item.UtilsItems.generateItemsFromMaterial;
+import static gtPlusPlus.core.util.item.ItemUtils.generateItemsFromMaterial;
import gregtech.api.enums.Materials;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.common.compat.COMPAT_Baubles;
@@ -33,7 +33,7 @@ import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.debug.DEBUG_INIT;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.item.Item;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.ItemFood;
@@ -256,32 +256,32 @@ public final class ModItems {
//Nuclear Fuel Dusts
- dustUraniumTetraFluoride = UtilsItems.generateSpecialUseDusts("UraniumTetrafluoride", "Uranium Tetrafluoride", Utils.rgbtoHexValue(17, 179, 42))[0];
- dustUraniumHexaFluoride = UtilsItems.generateSpecialUseDusts("UraniumHexafluoride", "Uranium Hexafluoride", Utils.rgbtoHexValue(9, 199, 32))[0];
+ dustUraniumTetraFluoride = ItemUtils.generateSpecialUseDusts("UraniumTetrafluoride", "Uranium Tetrafluoride", Utils.rgbtoHexValue(17, 179, 42))[0];
+ dustUraniumHexaFluoride = ItemUtils.generateSpecialUseDusts("UraniumHexafluoride", "Uranium Hexafluoride", Utils.rgbtoHexValue(9, 199, 32))[0];
- dustBerylliumFluoride = UtilsItems.generateSpecialUseDusts("BerylliumFluoride", "Beryllium Fluoride", Utils.rgbtoHexValue(175, 175, 175))[0]; //https://en.wikipedia.org/wiki/Beryllium_fluoride
+ dustBerylliumFluoride = ItemUtils.generateSpecialUseDusts("BerylliumFluoride", "Beryllium Fluoride", Utils.rgbtoHexValue(175, 175, 175))[0]; //https://en.wikipedia.org/wiki/Beryllium_fluoride
- dustLithiumCarbonate = UtilsItems.generateSpecialUseDusts("LithiumCarbonate", "Lithium Carbonate", Utils.rgbtoHexValue(240, 240, 240))[0]; //https://en.wikipedia.org/wiki/Lithium_carbonate
- dustLithiumFluoride = UtilsItems.generateSpecialUseDusts("LithiumFluoride", "Lithium Fluoride", Utils.rgbtoHexValue(245, 245, 245))[0]; //https://en.wikipedia.org/wiki/Lithium_fluoride
- dustLithiumPeroxide = UtilsItems.generateSpecialUseDusts("LithiumPeroxide", "Lithium Peroxide", Utils.rgbtoHexValue(250, 250, 250))[0]; //https://en.wikipedia.org/wiki/Lithium_peroxide
- dustLithiumHydroxide = UtilsItems.generateSpecialUseDusts("LithiumHydroxide", "Lithium Hydroxide", Utils.rgbtoHexValue(250, 250, 250))[0]; //https://en.wikipedia.org/wiki/Lithium_hydroxide
+ dustLithiumCarbonate = ItemUtils.generateSpecialUseDusts("LithiumCarbonate", "Lithium Carbonate", Utils.rgbtoHexValue(240, 240, 240))[0]; //https://en.wikipedia.org/wiki/Lithium_carbonate
+ dustLithiumFluoride = ItemUtils.generateSpecialUseDusts("LithiumFluoride", "Lithium Fluoride", Utils.rgbtoHexValue(245, 245, 245))[0]; //https://en.wikipedia.org/wiki/Lithium_fluoride
+ dustLithiumPeroxide = ItemUtils.generateSpecialUseDusts("LithiumPeroxide", "Lithium Peroxide", Utils.rgbtoHexValue(250, 250, 250))[0]; //https://en.wikipedia.org/wiki/Lithium_peroxide
+ dustLithiumHydroxide = ItemUtils.generateSpecialUseDusts("LithiumHydroxide", "Lithium Hydroxide", Utils.rgbtoHexValue(250, 250, 250))[0]; //https://en.wikipedia.org/wiki/Lithium_hydroxide
- if (UtilsItems.getItemStackOfAmountFromOreDict("dustQuicklime", 1).getItem() == ModItems.AAA_Broken || !LoadedMods.IHL){
- dustQuicklime = UtilsItems.generateSpecialUseDusts("Quicklime", "Quicklime", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_oxide
+ if (ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1).getItem() == ModItems.AAA_Broken || !LoadedMods.IHL){
+ dustQuicklime = ItemUtils.generateSpecialUseDusts("Quicklime", "Quicklime", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_oxide
}
- dustCalciumHydroxide = UtilsItems.generateSpecialUseDusts("CalciumHydroxide", "Hydrated Lime", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_hydroxide
- dustCalciumCarbonate = UtilsItems.generateSpecialUseDusts("CalciumCarbonate", "Calcium Carbonate", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_carbonate
- dust2LiOH_CaCO3 = UtilsItems.generateSpecialUseDusts("2LiOHCaCO3", "2LiOH & CaCO3 Compound", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_carbonate
+ dustCalciumHydroxide = ItemUtils.generateSpecialUseDusts("CalciumHydroxide", "Hydrated Lime", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_hydroxide
+ dustCalciumCarbonate = ItemUtils.generateSpecialUseDusts("CalciumCarbonate", "Calcium Carbonate", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_carbonate
+ dust2LiOH_CaCO3 = ItemUtils.generateSpecialUseDusts("2LiOHCaCO3", "2LiOH & CaCO3 Compound", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_carbonate
//FLiBe Fuel Compounds
- dustLi2BeF4 = UtilsItems.generateSpecialUseDusts("Li2BeF4", "Li2BeF4 Fuel Compound", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/FLiBe
+ dustLi2BeF4 = ItemUtils.generateSpecialUseDusts("Li2BeF4", "Li2BeF4 Fuel Compound", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/FLiBe
boolean gtStyleTools = LoadedMods.Gregtech;
Materials[] rm = Materials.values();
for (Materials m : rm){
- MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, m);
- MS_GTMATERIAL = UtilsItems.generateMultiShovel(gtStyleTools, m);
+ MP_GTMATERIAL = ItemUtils.generateMultiPick(gtStyleTools, m);
+ MS_GTMATERIAL = ItemUtils.generateMultiShovel(gtStyleTools, m);
/*itemBaseDecidust = UtilsItems.generateDecidust(m);
itemBaseCentidust = UtilsItems.generateCentidust(m);*/
}
@@ -320,7 +320,7 @@ public final class ModItems {
//Item Init
try {
- UtilsItems.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16);
+ ItemUtils.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16);
itemPlateVoidMetal = new BaseItemPlate("itemPlate"+"Void", "Void", new short[]{82, 17, 82}, 2, 0);
GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal));
} catch (NullPointerException e){
@@ -446,7 +446,7 @@ public final class ModItems {
itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemStickyRubber");
GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber");
- GT_OreDictUnificator.registerOre("ingotRubber", UtilsItems.getItemStack(CORE.MODID+":itemStickyRubber", 1));
+ GT_OreDictUnificator.registerOre("ingotRubber", ItemUtils.getItemStack(CORE.MODID+":itemStickyRubber", 1));
itemHeliumBlob = new CoreItem("itemHeliumBlob", tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob");
//GameRegistry.registerItem(itemHeliumBlob, "itemHeliumBlob");
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java b/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java
index 316f922639..391f7bb986 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java
@@ -5,7 +5,7 @@ import gtPlusPlus.GTplusplus;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.handler.GuiHandler;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
@@ -28,7 +28,7 @@ public class BaseItemBackpack extends Item{
this.setTextureName(CORE.MODID + ":" + "itemBackpack");
this.colourValue = colour;
GameRegistry.registerItem(this, unlocalizedName);
- GT_OreDictUnificator.registerOre("storageBackpack", UtilsItems.getSimpleStack(this));
+ GT_OreDictUnificator.registerOre("storageBackpack", ItemUtils.getSimpleStack(this));
setMaxStackSize(1);
setCreativeTab(AddToCreativeTab.tabOther);
}
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 7ee08cabee..2d4344ce5a 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -5,7 +5,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.entity.EntityUtils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import java.util.List;
@@ -34,7 +34,7 @@ public class BaseItemComponent extends Item{
this.setMaxStackSize(64);
this.setTextureName(CORE.MODID + ":" + "item"+componentType.COMPONENT_NAME);
GameRegistry.registerItem(this, unlocalName);
- GT_OreDictUnificator.registerOre(componentType.getOreDictName()+material.getUnlocalizedName(), UtilsItems.getSimpleStack(this));
+ GT_OreDictUnificator.registerOre(componentType.getOreDictName()+material.getUnlocalizedName(), ItemUtils.getSimpleStack(this));
}
@Override
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index f199f87f68..69d5363240 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -8,7 +8,7 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.entity.EntityUtils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import java.util.List;
@@ -70,7 +70,7 @@ public class BaseItemDust extends Item{
}
if (temp != null && temp != ""){
oredictName = temp;
- GT_OreDictUnificator.registerOre(temp, UtilsItems.getSimpleStack(this));
+ GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
}
addFurnaceRecipe();
addMacerationRecipe();
@@ -157,8 +157,8 @@ public class BaseItemDust extends Item{
Utils.LOG_WARNING("Generating OreDict Name: "+tempIngot);
ItemStack[] outputStacks = {dustInfo.getDust(1)};
if (tempIngot != null && tempIngot != ""){
- tempInputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
- tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempDust, 1);
+ tempInputStack = ItemUtils.getItemStackOfAmountFromOreDict(tempIngot, 1);
+ tempOutputStack = ItemUtils.getItemStackOfAmountFromOreDict(tempDust, 1);
ItemStack tempStackOutput2 = null;
int chance = mTier*10/MathUtils.randInt(10, 20);
if (outputStacks.length != 0){
@@ -202,19 +202,19 @@ public class BaseItemDust extends Item{
if (dustInfo.requiresBlastFurnace()){
Utils.LOG_WARNING("Adding recipe for Hot "+materialName+" Ingots in a Blast furnace.");
String tempIngot = temp.replace("ingot", "ingotHot");
- ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
+ ItemStack tempOutputStack = ItemUtils.getItemStackOfAmountFromOreDict(tempIngot, 1);
Utils.LOG_WARNING("This will produce "+tempOutputStack.getDisplayName() + " Debug: "+tempIngot);
if (null != tempOutputStack){
- addBlastFurnaceRecipe(UtilsItems.getSimpleStack(this), null, tempOutputStack, null, 350*mTier);
+ addBlastFurnaceRecipe(ItemUtils.getSimpleStack(this), null, tempOutputStack, null, 350*mTier);
}
return;
}
Utils.LOG_WARNING("Adding recipe for "+materialName+" Ingots in a furnace.");
- ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1);
+ ItemStack tempOutputStack = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1);
Utils.LOG_WARNING("This will produce an ingot of "+tempOutputStack.getDisplayName() + " Debug: "+temp);
if (null != tempOutputStack){
if (mTier < 5 || !dustInfo.requiresBlastFurnace()){
- if (CORE.GT_Recipe.addSmeltingAndAlloySmeltingRecipe(UtilsItems.getSimpleStack(this), tempOutputStack)){
+ if (CORE.GT_Recipe.addSmeltingAndAlloySmeltingRecipe(ItemUtils.getSimpleStack(this), tempOutputStack)){
Utils.LOG_WARNING("Successfully added a furnace recipe for "+materialName);
}
else {
@@ -225,7 +225,7 @@ public class BaseItemDust extends Item{
Utils.LOG_WARNING("Adding recipe for "+materialName+" Ingots in a Blast furnace.");
Utils.LOG_WARNING("This will produce "+tempOutputStack.getDisplayName());
if (null != tempOutputStack){
- addBlastFurnaceRecipe(UtilsItems.getSimpleStack(this), null, tempOutputStack, null, 350*mTier);
+ addBlastFurnaceRecipe(ItemUtils.getSimpleStack(this), null, tempOutputStack, null, 350*mTier);
}
return;
}
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index 77e0b7324b..d5dd78a49b 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -5,7 +5,7 @@ import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.entity.EntityUtils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import java.util.List;
@@ -36,7 +36,7 @@ public class BaseItemDustUnique extends Item{
this.setCreativeTab(tabMisc);
this.colour = colour;
this.materialName = materialName;
- this.sRadiation = UtilsItems.getRadioactivityLevel(materialName);
+ this.sRadiation = ItemUtils.getRadioactivityLevel(materialName);
GameRegistry.registerItem(this, unlocalizedName);
String temp = "";
@@ -61,7 +61,7 @@ public class BaseItemDustUnique extends Item{
Utils.LOG_WARNING("Generating OreDict Name: "+temp);
}
if (temp != null && temp != ""){
- GT_OreDictUnificator.registerOre(temp, UtilsItems.getSimpleStack(this));
+ GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
}
}
diff --git a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java
index aaad22be9c..92b8c8c224 100644
--- a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java
+++ b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java
@@ -1,7 +1,7 @@
package gtPlusPlus.core.item.base.foods;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import java.util.List;
@@ -42,7 +42,7 @@ public class BaseItemHotFood extends BaseItemFood{
if(iStack.getItemDamage() == cooldownTime) {
if (entityHolding instanceof EntityPlayer){
Utils.LOG_INFO("Foods Done.");
- ((EntityPlayer) entityHolding).inventory.addItemStackToInventory(UtilsItems.getSimpleStack(output));
+ ((EntityPlayer) entityHolding).inventory.addItemStackToInventory(ItemUtils.getSimpleStack(output));
((EntityPlayer) entityHolding).inventory.consumeInventoryItem(this);
}
}else if(iStack.getItemDamage() < cooldownTime){
diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
index d58522756f..9a0ef0d097 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
@@ -6,7 +6,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.entity.EntityUtils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import java.util.List;
@@ -45,7 +45,7 @@ public class BaseItemIngot extends Item{
temp = unlocalName.replace("itemHotIngot", "ingotHot");
}
if (temp != null && temp != ""){
- GT_OreDictUnificator.registerOre(temp, UtilsItems.getSimpleStack(this));
+ GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
}
generateCompressorRecipe();
}
@@ -85,7 +85,7 @@ public class BaseItemIngot extends Item{
private void generateCompressorRecipe(){
if (unlocalName.contains("itemIngot")){
- ItemStack tempStack = UtilsItems.getSimpleStack(this, 9);
+ ItemStack tempStack = ItemUtils.getSimpleStack(this, 9);
ItemStack tempOutput = null;
String temp = getUnlocalizedName().replace("item.itemIngot", "block");
Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName());
@@ -96,7 +96,7 @@ public class BaseItemIngot extends Item{
temp = temp.replace("itemIngot", "block");
Utils.LOG_WARNING("Generating OreDict Name: "+temp);
if (temp != null && temp != ""){
- tempOutput = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1);
+ tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1);
if (tempOutput != null){
GT_ModHandler.addCompressionRecipe(tempStack, tempOutput);
}
diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
index 6fa358f36f..6b60e7f8d3 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.item.base.ingots;
import gregtech.api.enums.GT_Values;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import java.util.List;
@@ -50,7 +50,7 @@ public class BaseItemIngotHot extends BaseItemIngot{
private void generateRecipe(){
Utils.LOG_WARNING("Adding Vacuum Freezer recipe for a Hot Ingot of "+materialName+".");
- GT_Values.RA.addVacuumFreezerRecipe(UtilsItems.getSimpleStack(this), outputIngot.copy(), 60*mTier);
+ GT_Values.RA.addVacuumFreezerRecipe(ItemUtils.getSimpleStack(this), outputIngot.copy(), 60*mTier);
}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java
index 77af69f809..8d3871187a 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.item.base.itemblock;
import gtPlusPlus.core.fluids.BlockFluidBase;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import java.util.List;
@@ -26,7 +26,7 @@ public class ItemBlockFluid extends ItemBlock{
this.baseBlock = (BlockFluidBase) block;
this.blockColour = baseBlock.getRenderColor(1);
this.thisFluid = baseBlock.getFluidMaterial();
- this.sRadiation=UtilsItems.getRadioactivityLevel(baseBlock.getUnlocalizedName());
+ this.sRadiation=ItemUtils.getRadioactivityLevel(baseBlock.getUnlocalizedName());
this.name = baseBlock.getLocalizedName().replace("tile", "").replace("fluid", "").replace("name", "").replace("block", "").replace(".", "");
//GT_OreDictUnificator.registerOre("frameGt"+block.getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), UtilsItems.getSimpleStack(this));
}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
index cd89b027d0..8bf5346084 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
@@ -4,7 +4,7 @@ import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.block.base.BlockBaseModular;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.entity.EntityUtils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import java.util.List;
@@ -30,7 +30,7 @@ public class ItemBlockGtBlock extends ItemBlock{
else {
sRadiation = 0;
}
- GT_OreDictUnificator.registerOre("block"+block.getUnlocalizedName().replace("tile.block", "").replace("tile.", "").replace("of", "").replace("Of", "").replace("Block", "").replace("-", "").replace("_", "").replace(" ", ""), UtilsItems.getSimpleStack(this));
+ GT_OreDictUnificator.registerOre("block"+block.getUnlocalizedName().replace("tile.block", "").replace("tile.", "").replace("of", "").replace("Of", "").replace("Block", "").replace("-", "").replace("_", "").replace(" ", ""), ItemUtils.getSimpleStack(this));
}
public int getRenderColor(int aMeta) {
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
index b4628f12ab..9d442e3102 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.item.base.itemblock;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.block.base.BlockBaseModular;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
@@ -14,7 +14,7 @@ public class ItemBlockGtFrameBox extends ItemBlock{
super(block);
BlockBaseModular baseBlock = (BlockBaseModular) block;
this.blockColour = baseBlock.getRenderColor(1);
- GT_OreDictUnificator.registerOre("frameGt"+block.getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), UtilsItems.getSimpleStack(this));
+ GT_OreDictUnificator.registerOre("frameGt"+block.getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), ItemUtils.getSimpleStack(this));
}
public int getRenderColor(int aMeta) {
diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java
index 4c1d36f945..882dc8b2bf 100644
--- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java
+++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.GT_Values;
import gtPlusPlus.core.item.base.BaseItemComponent;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.item.ItemStack;
public class BaseItemRodLong extends BaseItemComponent{
@@ -24,8 +24,8 @@ public class BaseItemRodLong extends BaseItemComponent{
String tempStick = unlocalName.replace("itemRodLong", "stick");
String tempStickLong = unlocalName.replace("itemRodLong", "stickLong");
- ItemStack stackStick = UtilsItems.getItemStackOfAmountFromOreDict(tempStick, 1);
- ItemStack stackLong = UtilsItems.getItemStackOfAmountFromOreDict(tempStickLong, 1);
+ ItemStack stackStick = ItemUtils.getItemStackOfAmountFromOreDict(tempStick, 1);
+ ItemStack stackLong = ItemUtils.getItemStackOfAmountFromOreDict(tempStickLong, 1);
ItemStack temp = stackStick;
temp.stackSize = 2;
diff --git a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
index 212dcd0fc1..93aa5b7526 100644
--- a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
+++ b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.GT_Values;
import gtPlusPlus.core.item.base.BaseItemComponent;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.item.ItemStack;
public class BaseItemScrew extends BaseItemComponent{
@@ -16,11 +16,11 @@ public class BaseItemScrew extends BaseItemComponent{
private void addLatheRecipe(){
Utils.LOG_WARNING("Adding recipe for "+materialName+" Screws");
- ItemStack boltStack = UtilsItems.getItemStackOfAmountFromOreDict(unlocalName.replace("itemScrew", "bolt"), 1);
+ ItemStack boltStack = ItemUtils.getItemStackOfAmountFromOreDict(unlocalName.replace("itemScrew", "bolt"), 1);
if (null != boltStack){
GT_Values.RA.addLatheRecipe(
boltStack,
- UtilsItems.getSimpleStack(this),
+ ItemUtils.getSimpleStack(this),
null,
(int) Math.max(componentMaterial.getMass() / 8L, 1L),
4);
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java b/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java
index efecb03d9f..3c8e09e9e5 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java
@@ -4,7 +4,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.interfaces.IItemBlueprint;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.player.PlayerUtils;
@@ -87,7 +87,7 @@ public class ItemBlueprint extends Item implements IItemBlueprint{
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer par3Entity) {
//Let the player know what blueprint is held
if (itemStack.hasTagCompound()) {
- PlayerUtils.messagePlayer(par3Entity, "This Blueprint holds NBT data. "+"|"+getNBT(itemStack, "mID")+"|"+getNBT(itemStack, "mBlueprint")+"|"+getNBT(itemStack, "mName")+"|"+UtilsItems.getArrayStackNames(readItemsFromNBT(itemStack)));
+ PlayerUtils.messagePlayer(par3Entity, "This Blueprint holds NBT data. "+"|"+getNBT(itemStack, "mID")+"|"+getNBT(itemStack, "mBlueprint")+"|"+getNBT(itemStack, "mName")+"|"+ItemUtils.getArrayStackNames(readItemsFromNBT(itemStack)));
}
else {
createNBT(itemStack);
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java b/src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
index 04503c5a62..c5f383955c 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.item.general;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
@@ -38,7 +38,7 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric
this.setUnlocalizedName(unlocalizedName);
this.setMaxStackSize(1);
this.setTextureName(CORE.MODID + ":" + "personalCloakingDevice");
- this.thisStack = UtilsItems.getSimpleStack(this);
+ this.thisStack = ItemUtils.getSimpleStack(this);
this.charge(thisStack, charge, 3, true, false);
if (charge == 10000*20*500){
this.setDamage(thisStack, 13);
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
index aa67e0f10c..4f1d7f4ecf 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.item.general;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.player.PlayerUtils;
import ic2.api.item.ElectricItem;
@@ -37,7 +37,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
this.setUnlocalizedName(unlocalizedName);
this.setMaxStackSize(1);
this.setTextureName(CORE.MODID + ":" + "personalCloakingDevice");
- this.thisStack = UtilsItems.getSimpleStack(this);
+ this.thisStack = ItemUtils.getSimpleStack(this);
GameRegistry.registerItem(this, unlocalizedName);
}
diff --git a/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java b/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java
index f1141e1ef4..7844d96f3f 100644
--- a/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java
+++ b/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.item.general;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
@@ -44,7 +44,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
this.setUnlocalizedName(unlocalizedName);
this.setMaxStackSize(1);
this.setTextureName(CORE.MODID + ":" + "itemIngot");
- this.thisStack = UtilsItems.getSimpleStack(this);
+ this.thisStack = ItemUtils.getSimpleStack(this);
GameRegistry.registerItem(this, unlocalizedName);
}
@@ -206,7 +206,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
public double discharge(ItemStack stack, double amount, int tier,
boolean ignoreTransferLimit, boolean externally, boolean simulate) {
if ((stack.stackTagCompound == null) || (!stack.stackTagCompound.hasKey("Energy"))) {
- double euCharge = getCharge(UtilsItems.getSimpleStack(this));
+ double euCharge = getCharge(ItemUtils.getSimpleStack(this));
if (euCharge != 0 && euCharge >= 1){
return (int) (MathUtils.decimalRoundingToWholes(euCharge*rfPerEU));
}
@@ -254,7 +254,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate)
{
if ((container.stackTagCompound == null) || (!container.stackTagCompound.hasKey("Energy"))) {
- double euCharge = getCharge(UtilsItems.getSimpleStack(this));
+ double euCharge = getCharge(ItemUtils.getSimpleStack(this));
if (euCharge != 0 && euCharge >= 1){
return (int) (MathUtils.decimalRoundingToWholes(euCharge*rfPerEU));
}
@@ -277,7 +277,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
public int extractEnergy(ItemStack container, int maxExtract, boolean simulate)
{
if ((container.stackTagCompound == null) || (!container.stackTagCompound.hasKey("Energy"))) {
- double euCharge = getCharge(UtilsItems.getSimpleStack(this));
+ double euCharge = getCharge(ItemUtils.getSimpleStack(this));
if (euCharge != 0 && euCharge >= 1){
return (int) (MathUtils.decimalRoundingToWholes(euCharge*rfPerEU));
}
@@ -299,7 +299,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
public int getEnergyStored(ItemStack container)
{
if ((container.stackTagCompound == null) || (!container.stackTagCompound.hasKey("Energy"))) {
- double euCharge = getCharge(UtilsItems.getSimpleStack(this));
+ double euCharge = getCharge(ItemUtils.getSimpleStack(this));
if (euCharge != 0 && euCharge >= 1){
return (int) (MathUtils.decimalRoundingToWholes(euCharge*rfPerEU));
}
diff --git a/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java b/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java
index 8f1a2083ac..7fbfca0ac8 100644
--- a/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java
+++ b/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java
@@ -5,7 +5,7 @@ import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.base.foods.BaseItemFood;
import gtPlusPlus.core.item.base.foods.BaseItemHotFood;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
@@ -19,24 +19,24 @@ public class ItemsFoods {
//Raisin Bread
ModItems.itemIngotRaisinBread = new BaseItemFood("itemIngotRaisinBread", "Raisin Bread", 3, 1.5f, false, new PotionEffect(Potion.weakness.id, 40, 1)).setAlwaysEdible();
- GT_OreDictUnificator.registerOre("foodRaisinBread", UtilsItems.getItemStack(CORE.MODID+":itemIngotRaisinBread", 1));
+ GT_OreDictUnificator.registerOre("foodRaisinBread", ItemUtils.getItemStack(CORE.MODID+":itemIngotRaisinBread", 1));
//Hot Raisin Bread
ModItems.itemHotIngotRaisinBread = new BaseItemHotFood("itemHotIngotRaisinBread", 1, 0.5f, "Raisin Bread", 120, ModItems.itemIngotRaisinBread);
- GT_OreDictUnificator.registerOre("foodHotRaisinBread", UtilsItems.getItemStack(CORE.MODID+":itemHotIngotRaisinBread", 1));
+ GT_OreDictUnificator.registerOre("foodHotRaisinBread", ItemUtils.getItemStack(CORE.MODID+":itemHotIngotRaisinBread", 1));
//Raisin Bread
ModItems.itemFoodRaisinToast = new BaseItemFood("itemFoodRaisinToast", "Raisin Toast", 1, 0.5f, false).setAlwaysEdible();
- GT_OreDictUnificator.registerOre("foodRaisinToast", UtilsItems.getItemStack(CORE.MODID+":itemFoodRaisinToast", 1));
+ GT_OreDictUnificator.registerOre("foodRaisinToast", ItemUtils.getItemStack(CORE.MODID+":itemFoodRaisinToast", 1));
//Hot Raisin Bread
ModItems.itemHotFoodRaisinToast = new BaseItemHotFood("itemHotFoodRaisinToast", 1, 0.5f, "Raisin Toast", 20, ModItems.itemFoodRaisinToast);
- GT_OreDictUnificator.registerOre("foodHotRaisinToast", UtilsItems.getItemStack(CORE.MODID+":itemHotFoodRaisinToast", 1));
+ GT_OreDictUnificator.registerOre("foodHotRaisinToast", ItemUtils.getItemStack(CORE.MODID+":itemHotFoodRaisinToast", 1));
//Raisin Bread
ModItems.itemFoodCurriedSausages = new BaseItemFood("itemFoodCurriedSausages", "Curried Sausages", 5, 2f, false);
- GT_OreDictUnificator.registerOre("foodCurriedSausages", UtilsItems.getItemStack(CORE.MODID+":itemFoodCurriedSausages", 1));
+ GT_OreDictUnificator.registerOre("foodCurriedSausages", ItemUtils.getItemStack(CORE.MODID+":itemFoodCurriedSausages", 1));
//Hot Raisin Bread
ModItems.itemHotFoodCurriedSausages = new BaseItemHotFood("itemHotFoodCurriedSausages", 1, 0.5f, "Curried Sausages", 240, ModItems.itemFoodCurriedSausages);
- GT_OreDictUnificator.registerOre("foodHotCurriedSausages", UtilsItems.getItemStack(CORE.MODID+":itemHotFoodCurriedSausages", 1));
+ GT_OreDictUnificator.registerOre("foodHotCurriedSausages", ItemUtils.getItemStack(CORE.MODID+":itemHotFoodCurriedSausages", 1));
}
diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
index 2978579d0b..99ee699dcf 100644
--- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
+++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
@@ -3,10 +3,10 @@ package gtPlusPlus.core.item.tool.staballoy;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.player.UtilsMining;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@@ -74,18 +74,18 @@ public class MultiPickaxeBase extends StaballoyPickaxe{
String toolFile = "craftingToolFile";
String toolScrewDriver = "craftingToolScrewdriver";
- if (null == UtilsItems.getItemStackOfAmountFromOreDictNoBroken(rodLong, 1)){
+ if (null == ItemUtils.getItemStackOfAmountFromOreDictNoBroken(rodLong, 1)){
return false;
}
- if (null == UtilsItems.getItemStackOfAmountFromOreDictNoBroken(plateDense, 1)){
+ if (null == ItemUtils.getItemStackOfAmountFromOreDictNoBroken(plateDense, 1)){
return false;
}
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
plateDense, plateDense, plateDense,
toolFile, rodLong, toolHammer,
toolWrench, rodLong, toolScrewDriver,
- UtilsItems.getSimpleStack(this));
+ ItemUtils.getSimpleStack(this));
return true;
}
diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java
index 972ba0ca12..0560893490 100644
--- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java
+++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java
@@ -3,9 +3,9 @@ package gtPlusPlus.core.item.tool.staballoy;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
@@ -60,18 +60,18 @@ public class MultiSpadeBase extends StaballoySpade{
String toolFile = "craftingToolFile";
String toolScrewDriver = "craftingToolScrewdriver";
- if (null == UtilsItems.getItemStackOfAmountFromOreDictNoBroken(rodLong, 1)){
+ if (null == ItemUtils.getItemStackOfAmountFromOreDictNoBroken(rodLong, 1)){
return false;
}
- if (null == UtilsItems.getItemStackOfAmountFromOreDictNoBroken(plateDense, 1)){
+ if (null == ItemUtils.getItemStackOfAmountFromOreDictNoBroken(plateDense, 1)){
return false;
}
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
toolFile, plateDense, toolHammer,
null, rodLong, null,
toolWrench, rodLong, toolScrewDriver,
- UtilsItems.getSimpleStack(this));
+ ItemUtils.getSimpleStack(this));
return true;
}
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index e2648c667e..ae1928a749 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -506,10 +506,11 @@ public final class ALLOY {
128, //Neutrons
true, //Uses Blast furnace?
new MaterialStack[]{
- new MaterialStack(ELEMENT.NICKEL, 25),
- new MaterialStack(ELEMENT.CHROMIUM, 25),
- new MaterialStack(ELEMENT.IRON, 25),
- new MaterialStack(ELEMENT.TUNGSTEN, 25)
+ new MaterialStack(ELEMENT.NICKEL, 30),
+ new MaterialStack(ELEMENT.CHROMIUM, 10),
+ new MaterialStack(ELEMENT.ZIRCONIUM, 20),
+ new MaterialStack(ELEMENT.IRON, 30),
+ new MaterialStack(ELEMENT.TUNGSTEN, 10)
}); //Material Stacks with Percentage of required elements.
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 3190486537..78d7d73bd4 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -3,10 +3,12 @@ package gtPlusPlus.core.material;
import static gregtech.api.enums.GT_Values.M;
import gregtech.api.enums.OrePrefixes;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.fluid.FluidUtils;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.materials.MaterialUtils;
import gtPlusPlus.core.util.math.MathUtils;
import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
public class Material {
@@ -15,7 +17,7 @@ public class Material {
protected Object dataVar;
- private MaterialStack[] materialInput = new MaterialStack[4];
+ private MaterialStack[] vMaterialInput = new MaterialStack[9];
public final long[] vSmallestRatio;
final short[] RGBA;
@@ -119,21 +121,21 @@ public class Material {
this.vVoltageMultiplier = this.getMeltingPoint_K() >= 2800 ? 64 : 16;
if (inputs == null){
- this.materialInput = null;
+ this.vMaterialInput = null;
}
else {
if (inputs.length != 0){
for (int i=0; i < inputs.length; i++){
if (inputs[i] != null){
- this.materialInput[i] = inputs[i];
+ this.vMaterialInput[i] = inputs[i];
}
}
}
}
-
- this.vSmallestRatio = getSmallestRatio(materialInput);
+
+ this.vSmallestRatio = getSmallestRatio(vMaterialInput);
int tempSmallestSize = 0;
-
+
if (vSmallestRatio != null){
for (int v=0;v<this.vSmallestRatio.length;v++){
tempSmallestSize=(int) (tempSmallestSize+vSmallestRatio[v]);
@@ -143,9 +145,9 @@ public class Material {
else {
this.smallestStackSizeWhenProcessing = 1; //Valid stacksizes
}
-
-
-
+
+
+
/*if (tempSmallestSize <= 64 && tempSmallestSize >= 1){
this.smallestStackSizeWhenProcessing = tempSmallestSize; //Valid stacksizes
}
@@ -155,15 +157,15 @@ public class Material {
//Makes a Fancy Chemical Tooltip
this.vChemicalSymbol = chemicalSymbol;
- if (materialInput != null){
+ if (vMaterialInput != null){
this.vChemicalFormula = getToolTip(chemicalSymbol, OrePrefixes.dust.mMaterialAmount / M, true);
}
else if (!this.vChemicalSymbol.equals("")){
- Utils.LOG_INFO("materialInput is null, using a valid chemical symbol.");
+ Utils.LOG_WARNING("materialInput is null, using a valid chemical symbol.");
this.vChemicalFormula = this.vChemicalSymbol;
}
else{
- Utils.LOG_INFO("MaterialInput == null && chemicalSymbol probably equals nothing");
+ Utils.LOG_WARNING("MaterialInput == null && chemicalSymbol probably equals nothing");
this.vChemicalFormula = "??";
}
@@ -232,97 +234,104 @@ public class Material {
}
public ItemStack getDust(int stacksize){
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dust"+unlocalizedName, stacksize);
+ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+unlocalizedName, stacksize);
}
public ItemStack getSmallDust(int stacksize){
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dustSmall"+unlocalizedName, stacksize);
+ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustSmall"+unlocalizedName, stacksize);
}
public ItemStack getTinyDust(int stacksize){
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dustTiny"+unlocalizedName, stacksize);
+ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustTiny"+unlocalizedName, stacksize);
}
public ItemStack[] getValidInputStacks(){
- return UtilsItems.validItemsForOreDict(unlocalizedName);
+ return ItemUtils.validItemsForOreDict(unlocalizedName);
}
public ItemStack getIngot(int stacksize){
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("ingot"+unlocalizedName, stacksize);
+ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingot"+unlocalizedName, stacksize);
}
public ItemStack getPlate(int stacksize){
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("plate"+unlocalizedName, stacksize);
+ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plate"+unlocalizedName, stacksize);
}
public ItemStack getPlateDouble(int stacksize){
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("plateDouble"+unlocalizedName, stacksize);
+ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDouble"+unlocalizedName, stacksize);
}
public ItemStack getGear(int stacksize){
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("gear"+unlocalizedName, stacksize);
+ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gear"+unlocalizedName, stacksize);
}
public ItemStack getRod(int stacksize){
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("stick"+unlocalizedName, stacksize);
+ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("stick"+unlocalizedName, stacksize);
}
public ItemStack getLongRod(int stacksize){
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("stickLong"+unlocalizedName, stacksize);
+ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("stickLong"+unlocalizedName, stacksize);
}
public ItemStack getBolt(int stacksize){
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("bolt"+unlocalizedName, stacksize);
+ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("bolt"+unlocalizedName, stacksize);
}
public ItemStack getScrew(int stacksize){
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("screw"+unlocalizedName, stacksize);
+ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("screw"+unlocalizedName, stacksize);
}
public ItemStack getRing(int stacksize){
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("ring"+unlocalizedName, stacksize);
+ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ring"+unlocalizedName, stacksize);
}
public ItemStack getRotor(int stacksize){
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("rotor"+unlocalizedName, stacksize);
+ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("rotor"+unlocalizedName, stacksize);
}
public ItemStack getFrameBox(int stacksize){
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("frameGt"+unlocalizedName, stacksize);
+ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("frameGt"+unlocalizedName, stacksize);
}
public ItemStack[] getMaterialComposites(){
//Utils.LOG_INFO("Something requested the materials needed for "+localizedName);
- if (materialInput != null && materialInput.length >= 1){
- ItemStack[] temp = new ItemStack[materialInput.length];
- for (int i=0;i<materialInput.length;i++){
+ if (vMaterialInput != null && vMaterialInput.length >= 1){
+ ItemStack[] temp = new ItemStack[vMaterialInput.length];
+ for (int i=0;i<vMaterialInput.length;i++){
//Utils.LOG_INFO("i:"+i);
ItemStack testNull = null;
try {
- testNull = materialInput[i].getDustStack();
+ testNull = vMaterialInput[i].getDustStack();
} catch (Throwable r){
- Utils.LOG_INFO("Failed gathering material stack for "+localizedName+".");
- Utils.LOG_INFO("What Failed: Length:"+materialInput.length+" current:"+i);
+ Utils.LOG_WARNING("Failed gathering material stack for "+localizedName+".");
+ Utils.LOG_WARNING("What Failed: Length:"+vMaterialInput.length+" current:"+i);
}
try {
if (testNull != null){
//Utils.LOG_INFO("not null");
- temp[i] = materialInput[i].getDustStack();
+ temp[i] = vMaterialInput[i].getDustStack();
}
} catch (Throwable r){
- Utils.LOG_INFO("Failed setting slot "+i+", using "+localizedName);
+ Utils.LOG_WARNING("Failed setting slot "+i+", using "+localizedName);
}
}
return temp;
}
return new ItemStack[]{};
}
+
+ public MaterialStack[] getComposites(){
+ return this.vMaterialInput;
+ }
public int[] getMaterialCompositeStackSizes(){
- if (materialInput != null && materialInput.length >= 1){
- int[] temp = new int[materialInput.length];
- for (int i=0;i<materialInput.length;i++){
- temp[i] = materialInput[i].getDustStack().stackSize;
+ if (vMaterialInput != null && vMaterialInput.length >= 1){
+ int[] temp = new int[vMaterialInput.length];
+ for (int i=0;i<vMaterialInput.length;i++){
+ if (vMaterialInput[i] != null)
+ temp[i] = vMaterialInput[i].getDustStack().stackSize;
+ else
+ temp[i]=0;
}
return temp;
}
@@ -355,13 +364,13 @@ public class Material {
try {
if (materialInput[i] != null){
formulaComponents[i] = materialInput[i].stackMaterial.vChemicalFormula;
- Utils.LOG_INFO("LOOK AT ME IN THE LOG - " + formulaComponents[i]);
+ Utils.LOG_WARNING("LOOK AT ME IN THE LOG - " + formulaComponents[i]);
}
else{
- Utils.LOG_INFO("LOOK AT ME IN THE LOG - materialInput[i] was null");
+ Utils.LOG_WARNING("LOOK AT ME IN THE LOG - materialInput[i] was null");
}
} catch (Throwable e){
- Utils.LOG_INFO("LOOK AT ME IN THE LOG - got an error");
+ Utils.LOG_WARNING("LOOK AT ME IN THE LOG - got an error");
return "??";
}
}
@@ -369,7 +378,7 @@ public class Material {
String properName = "";
for (int r = 0; r < f; r++){
properName = properName + formulaComponents[r];
- Utils.LOG_INFO("LOOK AT ME IN THE LOG - "+properName);
+ Utils.LOG_WARNING("LOOK AT ME IN THE LOG - "+properName);
}
if (!properName.equals(""))
return properName;
@@ -382,8 +391,8 @@ public class Material {
public long[] getSmallestRatio(MaterialStack[] inputs){
if (inputs != null){
if (inputs.length > 0){
- Utils.LOG_INFO("length: "+inputs.length);
- Utils.LOG_INFO("(inputs != null): "+(inputs != null));
+ Utils.LOG_WARNING("length: "+inputs.length);
+ Utils.LOG_WARNING("(inputs != null): "+(inputs != null));
//Utils.LOG_INFO("length: "+inputs.length);
double tempPercentage=0;
long[] tempRatio = new long[inputs.length];
@@ -406,7 +415,7 @@ public class Material {
for (int r=0;r<tempRatio.length;r++){
tempRatioStringThing1 = tempRatioStringThing1 + tempRatio[r] +" : ";
}
- Utils.LOG_INFO("Default Ratio: "+tempRatioStringThing1);
+ Utils.LOG_WARNING("Default Ratio: "+tempRatioStringThing1);
String tempRatioStringThing = "";
int tempSmallestCraftingUseSize = 0;
@@ -415,7 +424,7 @@ public class Material {
tempSmallestCraftingUseSize = (int) (tempSmallestCraftingUseSize + smallestRatio[r]);
}
//this.smallestStackSizeWhenProcessing = tempSmallestCraftingUseSize;
- Utils.LOG_INFO("Smallest Ratio: "+tempRatioStringThing);
+ Utils.LOG_WARNING("Smallest Ratio: "+tempRatioStringThing);
return smallestRatio;
}
}
@@ -442,10 +451,10 @@ public class Material {
public String getToolTip(String chemSymbol, long aMultiplier, boolean aShowQuestionMarks) {
if (!aShowQuestionMarks && (vChemicalFormula.equals("?")||vChemicalFormula.equals("??"))) return "";
- Utils.LOG_INFO("===============| Calculating Atomic Formula for "+this.localizedName+" |===============");
+ Utils.LOG_WARNING("===============| Calculating Atomic Formula for "+this.localizedName+" |===============");
if (!chemSymbol.equals(""))
return chemSymbol;
- MaterialStack[] tempInput = materialInput;
+ MaterialStack[] tempInput = vMaterialInput;
if (tempInput != null){
if (tempInput.length >= 1){
String dummyFormula = "";
@@ -475,17 +484,22 @@ public class Material {
return MaterialUtils.subscript(dummyFormula);
//return dummyFormula;
}
- Utils.LOG_INFO("dummyFormulaArray <= 0");
+ Utils.LOG_WARNING("dummyFormulaArray <= 0");
}
- Utils.LOG_INFO("dummyFormulaArray == null");
+ Utils.LOG_WARNING("dummyFormulaArray == null");
}
- Utils.LOG_INFO("tempInput.length <= 0");
+ Utils.LOG_WARNING("tempInput.length <= 0");
}
- Utils.LOG_INFO("tempInput == null");
+ Utils.LOG_WARNING("tempInput == null");
return "??";
}
+ public FluidStack getMolten(int fluidAmount) {
+ Utils.LOG_INFO("Getting "+fluidAmount+"L of "+unlocalizedName.toLowerCase());
+ return FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), fluidAmount);
+ }
+
diff --git a/src/Java/gtPlusPlus/core/material/MaterialStack.java b/src/Java/gtPlusPlus/core/material/MaterialStack.java
index 8d9de3faf4..a804a09da2 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialStack.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialStack.java
@@ -1,6 +1,6 @@
package gtPlusPlus.core.material;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -14,12 +14,9 @@ public class MaterialStack {
final double percentageToUse;
public MaterialStack(Material inputs, double partOutOf100){
-
this.stackMaterial = inputs;
this.percentageToUse = partOutOf100;
this.vAmount = math(partOutOf100);
-
-
}
private int[] math(double val){
@@ -37,6 +34,19 @@ public class MaterialStack {
public ItemStack getDustStack(){
return this.stackMaterial.getDust(this.vAmount[0]);
}
+
+ public ItemStack getDustStack(int amount){
+ return this.stackMaterial.getDust(amount);
+ }
+
+ public Material getStackMaterial(){
+ return this.stackMaterial;
+ }
+
+ public long[] getSmallestStackSizes(){
+ return this.stackMaterial.getSmallestRatio(stackMaterial.getComposites());
+ }
+
public int getPartsPerOneHundred(){
if (this.vAmount != null){
if (this.vAmount[0] >= 1 && this.vAmount[0] <= 100){
@@ -61,83 +71,8 @@ public class MaterialStack {
}
}
- /*public ItemStack getDustStack(){
- int caseStatus = 0;
- int amount = 0;
- if (percentageToUse >= 0 && percentageToUse <= 0.99){
- caseStatus = 1;
- amount = (int) (1/percentageToUse);
- //amount = Integer.valueOf(String.valueOf(percentageToUse).charAt(2));
- }
- else if (percentageToUse >= 1 && percentageToUse <= 9.99){
- caseStatus = 2;
- amount = (int) (percentageToUse);
- //amount = Integer.valueOf(String.valueOf(percentageToUse).charAt(0));
- }
- else if (percentageToUse >= 10 && percentageToUse <= 99.99){
- caseStatus = 3;
- amount = (int) (percentageToUse/10);
- //amount = Integer.valueOf(String.valueOf(percentageToUse).charAt(0));
- }
- else if (percentageToUse == 100){
- caseStatus = 4;
- amount = 10;
- }
- else {
- amount = 0;
- }
- switch (caseStatus) {
- case 1: {
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dustTiny"+stackMaterial.unlocalizedName, amount);
- }
- case 2: {
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dustSmall"+stackMaterial.unlocalizedName, amount);
- }
- case 3: {
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dust"+stackMaterial.unlocalizedName, amount);
- }
- case 4: {
- return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dust"+stackMaterial.unlocalizedName, amount);
- }
- default:
- return null;
- }
-
- }*/
-
- /*public int getDustCount(){
- int amount = 0;
-
- //No Dust
- if (percentageToUse >= 0 && percentageToUse <= 11.1111111111111111111111110){
- //amount = (int) (1/percentageToUse);
- amount = 0; //Less than a tiny dust.
- }
-
- //Tiny Dust
- else if (percentageToUse >= 11.1111111111111111111111111 && percentageToUse <= 25){
- amount = (int) (percentageToUse);
- }
-
- //Small Dust
- else if (percentageToUse >= 10 && percentageToUse <= 99.99){
- amount = (int) (percentageToUse/10);
- }
-
- //Dust
- else if (percentageToUse == 100){
- amount = 10;
- }
-
- //Error - Nothing
- else {
- amount = 0;
- }
- return amount;
- }*/
-
public ItemStack[] getValidItemStacks(){
- return UtilsItems.validItemsForOreDict(stackMaterial.unlocalizedName);
+ return ItemUtils.validItemsForOreDict(stackMaterial.unlocalizedName);
}
diff --git a/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java b/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java
index 0f31c4c61d..bb5732c319 100644
--- a/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java
+++ b/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.recipe;
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -35,28 +35,28 @@ public class Gregtech_Recipe_Adder {
resetVars();
if (addMaceratorRecipe){
- inputStack1 = UtilsItems.getSimpleStack(maceratorInput, maceratorInputAmount1);
- outputStack1 = UtilsItems.getSimpleStack(maceratorOutput, maceratorOutputAmount1);
+ inputStack1 = ItemUtils.getSimpleStack(maceratorInput, maceratorInputAmount1);
+ outputStack1 = ItemUtils.getSimpleStack(maceratorOutput, maceratorOutputAmount1);
addMaceratorRecipe(inputStack1, outputStack1);
}
resetVars();
if (addCompressorRecipe){
- inputStack1 = UtilsItems.getSimpleStack(compressorInput, compressorInputAmount1);
- outputStack1 = UtilsItems.getSimpleStack(compressorOutput, compressorOutputAmount1);
+ inputStack1 = ItemUtils.getSimpleStack(compressorInput, compressorInputAmount1);
+ outputStack1 = ItemUtils.getSimpleStack(compressorOutput, compressorOutputAmount1);
addCompressorRecipe(inputStack1, outputStack1);
}
resetVars();
if (addBlastFurnaceRecipe){
- inputStack1 = UtilsItems.getSimpleStack(blastFurnaceInput, blastFurnaceInputAmount1);
- inputStack2 = UtilsItems.getSimpleStack(blastFurnaceInput2, blastFurnaceInputAmount2);
- outputStack1 = UtilsItems.getSimpleStack(blastFurnaceOutput, blastFurnaceOutputAmount1);
- outputStack2 = UtilsItems.getSimpleStack(blastFurnaceOutput2, blastFurnaceOutputAmount2);
+ inputStack1 = ItemUtils.getSimpleStack(blastFurnaceInput, blastFurnaceInputAmount1);
+ inputStack2 = ItemUtils.getSimpleStack(blastFurnaceInput2, blastFurnaceInputAmount2);
+ outputStack1 = ItemUtils.getSimpleStack(blastFurnaceOutput, blastFurnaceOutputAmount1);
+ outputStack2 = ItemUtils.getSimpleStack(blastFurnaceOutput2, blastFurnaceOutputAmount2);
addBlastFurnaceRecipe(inputStack1, inputStack2, outputStack1, outputStack2, blastFurnaceTemp);
}
resetVars();
if (addSmeltingRecipe){
- inputStack1 = UtilsItems.getSimpleStack(smeltingInput, smeltingInputAmount1);
- outputStack1 = UtilsItems.getSimpleStack(smeltingOutput, smeltingOutputAmount1);
+ inputStack1 = ItemUtils.getSimpleStack(smeltingInput, smeltingInputAmount1);
+ outputStack1 = ItemUtils.getSimpleStack(smeltingOutput, smeltingOutputAmount1);
addSmeltingRecipe(inputStack1, outputStack1);
}
resetVars();
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 298e012143..46cf4e0a7d 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -11,7 +11,7 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.fluid.FluidUtils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
@@ -61,7 +61,7 @@ public class RECIPES_GREGTECH {
GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), //Input 2
Materials.SulfuricAcid.getFluid(60L), //Fluid Input
Materials.Creosote.getFluid(250L), //Fluid Output
- UtilsItems.getItemStack("Railcraft:fuel.coke", 2), //Item Output
+ ItemUtils.getItemStack("Railcraft:fuel.coke", 2), //Item Output
600, //Time in ticks
120); //EU
}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
@@ -87,7 +87,7 @@ public class RECIPES_GREGTECH {
GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), //Input 2
FluidUtils.getFluidStack("oxygen", 185), //Fluid Input
Materials.Creosote.getFluid(200L), //Fluid Output
- UtilsItems.getItemStack("Railcraft:fuel.coke", 2), //Item Output
+ ItemUtils.getItemStack("Railcraft:fuel.coke", 2), //Item Output
900, //Time in ticks
120); //EU
}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
@@ -134,24 +134,24 @@ public class RECIPES_GREGTECH {
}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}*/
try {
- ItemStack cells = UtilsItems.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemCellEmpty", "Empty Fluid Cells", 0, 12);
+ ItemStack cells = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemCellEmpty", "Empty Fluid Cells", 0, 12);
if (cells == null){
- cells = UtilsItems.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 12);
+ cells = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 12);
}
- ItemStack[] input = {cells, UtilsItems.getItemStackOfAmountFromOreDict("dustLepidolite", 20)};
+ ItemStack[] input = {cells, ItemUtils.getItemStackOfAmountFromOreDict("dustLepidolite", 20)};
CORE.RA.addDehydratorRecipe(
input, //Item input (Array, up to 2)
FluidUtils.getFluidStack("sulfuricacid", 10000), //Fluid input (slot 1)
FluidUtils.getFluidStack("sulfuriclithium", 10000), //Fluid output (slot 2)
new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("dustPotassium", 1),
- UtilsItems.getItemStackOfAmountFromOreDict("dustAluminium", 4),
- UtilsItems.getItemStackOfAmountFromOreDict("cellOxygen", 10),
- UtilsItems.getItemStackOfAmountFromOreDict("cellFluorine", 2),
- UtilsItems.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), //LithiumCarbonate
+ ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 10),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), //LithiumCarbonate
}, //Output Array of Items - Upto 9,
new int[]{0},
75*20, //Time in ticks
@@ -162,13 +162,13 @@ public class RECIPES_GREGTECH {
CORE.RA.addDehydratorRecipe(
new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("cellWater", 10)
+ ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10)
}, //Item input (Array, up to 2)
FluidUtils.getFluidStack("uraniumtetrafluoride", 1440), //Fluid input (slot 1)
null, //Fluid output (slot 2)
new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10),
- UtilsItems.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10)
+ ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10),
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10)
}, //Output Array of Items - Upto 9,
new int[]{0},
150*20, //Time in ticks
@@ -179,13 +179,13 @@ public class RECIPES_GREGTECH {
CORE.RA.addDehydratorRecipe(
new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("cellWater", 10)
+ ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10)
}, //Item input (Array, up to 2)
FluidUtils.getFluidStack("uraniumhexafluoride", 1440), //Fluid input (slot 1)
null, //Fluid output (slot 2)
new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10),
- UtilsItems.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10)
+ ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10),
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10)
}, //Output Array of Items - Upto 9,
new int[]{0},
300*20, //Time in ticks
@@ -198,12 +198,12 @@ public class RECIPES_GREGTECH {
CORE.RA.addDehydratorRecipe(
new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("cropGrape", 1)
+ ItemUtils.getItemStackOfAmountFromOreDict("cropGrape", 1)
}, //Item input (Array, up to 2)
null, //Fluid input (slot 1)
null, //Fluid output (slot 2)
new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("foodRaisins", 1)
+ ItemUtils.getItemStackOfAmountFromOreDict("foodRaisins", 1)
}, //Output Array of Items - Upto 9,
new int[]{0},
10*20, //Time in ticks
@@ -212,17 +212,17 @@ public class RECIPES_GREGTECH {
}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
//Calcium Hydroxide
- if (UtilsItems.getItemStackOfAmountFromOreDict("dustQuicklime", 1).getItem() != ModItems.AAA_Broken || LoadedMods.IHL){
+ if (ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1).getItem() != ModItems.AAA_Broken || LoadedMods.IHL){
try {
CORE.RA.addDehydratorRecipe(
new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("dustQuicklime", 10)
+ ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 10)
}, //Item input (Array, up to 2)
FluidUtils.getFluidStack("water", 10000), //Fluid input (slot 1)
null, //Fluid output (slot 2)
new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 20)
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 20)
}, //Output Array of Items - Upto 9,
new int[]{0},
120*20, //Time in ticks
@@ -235,13 +235,13 @@ public class RECIPES_GREGTECH {
CORE.RA.addDehydratorRecipe(
new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("dust2LiOHCaCO3", 5)
+ ItemUtils.getItemStackOfAmountFromOreDict("dust2LiOHCaCO3", 5)
}, //Item input (Array, up to 2)
null, //Fluid input (slot 1)
null, //Fluid output (slot 2)
new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2),
- UtilsItems.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3)
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3)
}, //Output Array of Items - Upto 9,
new int[]{0},
120*20, //Time in ticks
@@ -261,21 +261,21 @@ public class RECIPES_GREGTECH {
private static void distilleryRecipes(){
Utils.LOG_INFO("Registering Distillery/Distillation Tower Recipes.");
GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), FluidUtils.getFluidStack("air", 1000), FluidUtils.getFluidStack("helium", 1), 400, 30, false);
- GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("air", 20000), FluidUtils.getFluidStackArray("helium", 25), UtilsItems.getSimpleStack(ModItems.itemHeliumBlob, 1), 200, 60);
+ GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("air", 20000), FluidUtils.getFluidStackArray("helium", 25), ItemUtils.getSimpleStack(ModItems.itemHeliumBlob, 1), 200, 60);
}
private static void addFuels(){
Utils.LOG_INFO("Registering New Fuels.");
- GT_Values.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketFire_water", 0, 1), null, 120, 0);
- GT_Values.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0);
- GT_Values.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketHootch", 0, 1), null, 36, 0);
+ GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketFire_water", 0, 1), null, 120, 0);
+ GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0);
+ GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketHootch", 0, 1), null, 36, 0);
//CORE.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0);
- GT_Values.RA.addFuel(UtilsItems.getSimpleStack(Items.lava_bucket), null, 32, 2);
- GT_Values.RA.addFuel(UtilsItems.getIC2Cell(2), null, 32, 2);
- GT_Values.RA.addFuel(UtilsItems.getIC2Cell(11), null, 24, 2);
+ GT_Values.RA.addFuel(ItemUtils.getSimpleStack(Items.lava_bucket), null, 32, 2);
+ GT_Values.RA.addFuel(ItemUtils.getIC2Cell(2), null, 32, 2);
+ GT_Values.RA.addFuel(ItemUtils.getIC2Cell(11), null, 24, 2);
//System.exit(1);
}
@@ -288,18 +288,18 @@ public class RECIPES_GREGTECH {
private static void chemicalBathRecipes(){
int[] chances = {10000, 5000, 2500};
- GT_Values.RA.addChemicalBathRecipe(UtilsItems.getItemStackOfAmountFromOreDict("dustTin", 12), FluidUtils.getFluidStack("chlorine", 2400),
- UtilsItems.getItemStackOfAmountFromOreDict("dustZirconium", 1),
- UtilsItems.getItemStackOfAmountFromOreDict("dustZirconium", 1),
- UtilsItems.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+ GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 12), FluidUtils.getFluidStack("chlorine", 2400),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
chances,
30*20,
240);
GT_Values.RA.addChemicalBathRecipe(
- UtilsItems.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 10),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 10),
FluidUtils.getFluidStack("hydrofluoricacid", 20000),
- UtilsItems.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5),
null,
null,
new int[]{},
@@ -309,30 +309,30 @@ public class RECIPES_GREGTECH {
private static void chemicalReactorRecipes(){
GT_Values.RA.addChemicalRecipe(
- UtilsItems.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 5), //Input Stack 1
- UtilsItems.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5), //Input Stack 2
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 5), //Input Stack 1
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5), //Input Stack 2
null, //Fluid Input
null, //Fluid Output
- UtilsItems.getItemStackOfAmountFromOreDict("dust2LiOHCaCO3", 10), //Output Stack
+ ItemUtils.getItemStackOfAmountFromOreDict("dust2LiOHCaCO3", 10), //Output Stack
600*20
);
GT_Values.RA.addChemicalRecipe(
- UtilsItems.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 5), //Input Stack 1
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 5), //Input Stack 1
null, //Input Stack 2
FluidUtils.getFluidStack("hydrofluoricacid", 2500), //Fluid Input
FluidUtils.getFluidStack("water", 2500), //Fluid Output
- UtilsItems.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), //Output Stack
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), //Output Stack
600*20
);
}
private static void blastFurnaceRecipes(){
GT_Values.RA.addBlastRecipe(
- UtilsItems.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 2),
- UtilsItems.getItemStackOfAmountFromOreDict("dustBerylliumFluoride", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustBerylliumFluoride", 1),
GT_Values.NF, GT_Values.NF,
- UtilsItems.getItemStackOfAmountFromOreDict("dustLi2BeF4", 3),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 3),
null,
60*20,
2000,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 5d1a4cc353..aa3026133e 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -3,8 +3,8 @@ package gtPlusPlus.core.recipe;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.item.UtilsItems;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
@@ -12,19 +12,19 @@ import net.minecraft.item.ItemStack;
public class RECIPES_General {
- static ItemStack RECIPE_Paper = UtilsItems.getSimpleStack(Items.paper);
+ static ItemStack RECIPE_Paper = ItemUtils.getSimpleStack(Items.paper);
static String RECIPE_LapisDust = "dustLazurite";
- static ItemStack OUTPUT_Blueprint = UtilsItems.getSimpleStack(ModItems.itemBlueprintBase);
- static ItemStack RECIPE_CraftingTable = UtilsItems.getSimpleStack(Item.getItemFromBlock(Blocks.crafting_table));
+ static ItemStack OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase);
+ static ItemStack RECIPE_CraftingTable = ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.crafting_table));
static String RECIPE_BronzePlate = "plateAnyBronze";
static ItemStack RECIPE_BasicCasingIC2;
- static ItemStack OUTPUT_Workbench_Bronze = UtilsItems.getSimpleStack(Item.getItemFromBlock(ModBlocks.blockWorkbench));
+ static ItemStack OUTPUT_Workbench_Bronze = ItemUtils.getSimpleStack(Item.getItemFromBlock(ModBlocks.blockWorkbench));
static ItemStack NULL = null;
public static void RECIPES_LOAD(){
if (LoadedMods.Gregtech){
- RECIPE_BasicCasingIC2 = UtilsItems.getItemStack("IC2:blockMachine", 1);
+ RECIPE_BasicCasingIC2 = ItemUtils.getItemStack("IC2:blockMachine", 1);
run();
}
}
@@ -32,13 +32,13 @@ public class RECIPES_General {
private static void run(){
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
RECIPE_Paper, RECIPE_LapisDust, NULL,
RECIPE_Paper, RECIPE_LapisDust, NULL,
RECIPE_LapisDust, RECIPE_LapisDust, NULL,
OUTPUT_Blueprint);
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
RECIPE_BronzePlate, RECIPE_CraftingTable, RECIPE_BronzePlate,
RECIPE_BronzePlate, RECIPE_BasicCasingIC2, RECIPE_BronzePlate,
RECIPE_BronzePlate, RECIPE_BronzePlate, RECIPE_BronzePlate,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java
index 6d81ba42ad..14f4a1c998 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java
@@ -1,8 +1,8 @@
package gtPlusPlus.core.recipe;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import gtPlusPlus.core.util.wrapper.var;
import java.util.ArrayList;
@@ -70,7 +70,7 @@ public class RECIPES_MTWRAPPER {
*
*/
- ItemStack outputItem = UtilsItems.getCorrectStacktype(item_Output, 1);
+ ItemStack outputItem = ItemUtils.getCorrectStacktype(item_Output, 1);
ArrayList<Object> validSlots = new ArrayList<Object>();
String a,b,c,d,e,f,g,h,i;
@@ -92,7 +92,7 @@ public class RECIPES_MTWRAPPER {
validSlots.add(2, lineThree);
try {
- UtilsRecipe.recipeBuilder((Object[]) validSlots.toArray(), outputItem.copy());
+ RecipeUtils.recipeBuilder((Object[]) validSlots.toArray(), outputItem.copy());
MT_RECIPES_LOADED++;
}
catch(NullPointerException | ClassCastException k){
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
index 2e69775b78..e3f47844c7 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
@@ -8,7 +8,7 @@ import gregtech.api.enums.SubTag;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
public class RECIPES_MachineComponents {
@@ -99,176 +99,176 @@ public class RECIPES_MachineComponents {
private static void run(){
//Electric Motors
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
cableTier7, wireTier7, rodTier7a,
wireTier7, rodTier7b, wireTier7,
rodTier7a, wireTier7, cableTier7,
RECIPE_CONSTANTS.electricMotor_LuV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
cableTier8, wireTier8, rodTier8a,
wireTier8, rodTier8b, wireTier8,
rodTier8a, wireTier8, cableTier8,
RECIPE_CONSTANTS.electricMotor_ZPM);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
cableTier9, wireTier9, rodTier9a,
wireTier9, rodTier9b, wireTier9,
rodTier9a, wireTier9, cableTier9,
RECIPE_CONSTANTS.electricMotor_UV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
cableTier10, wireTier10, rodTier10a,
wireTier10, rodTier10b, wireTier10,
rodTier10a, wireTier10, cableTier10,
RECIPE_CONSTANTS.electricMotor_MAX);
//Electric Pump
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
cableTier7, rotorTier7, itemRubberRing,
craftingToolScrewdriver, pipeTier7, craftingToolWrench,
itemRubberRing, RECIPE_CONSTANTS.electricMotor_LuV, cableTier7,
RECIPE_CONSTANTS.electricPump_LuV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
cableTier8, rotorTier8, itemRubberRing,
craftingToolScrewdriver, pipeTier8, craftingToolWrench,
itemRubberRing, RECIPE_CONSTANTS.electricMotor_ZPM, cableTier8,
RECIPE_CONSTANTS.electricPump_ZPM);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
cableTier9, rotorTier9, itemRubberRing,
craftingToolScrewdriver, pipeTier9, craftingToolWrench,
itemRubberRing, RECIPE_CONSTANTS.electricMotor_UV, cableTier9,
RECIPE_CONSTANTS.electricPump_UV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
cableTier10, rotorTier10, itemRubberRing,
craftingToolScrewdriver, pipeTier10, craftingToolWrench,
itemRubberRing, RECIPE_CONSTANTS.electricMotor_MAX, cableTier10,
RECIPE_CONSTANTS.electricPump_MAX);
//Electric Pump
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier7, plateTier7, plateTier7,
cableTier7, rodTier7a, rodTier7a,
cableTier7, RECIPE_CONSTANTS.electricMotor_LuV, smallGearTier7,
RECIPE_CONSTANTS.electricPiston_LuV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier8, plateTier8, plateTier8,
cableTier8, rodTier8a, rodTier8a,
cableTier8, RECIPE_CONSTANTS.electricMotor_ZPM, smallGearTier8,
RECIPE_CONSTANTS.electricPiston_ZPM);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier9, plateTier9, plateTier9,
cableTier9, rodTier9a, rodTier9a,
cableTier9, RECIPE_CONSTANTS.electricMotor_UV, smallGearTier9,
RECIPE_CONSTANTS.electricPiston_UV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier10, plateTier10, plateTier10,
cableTier10, rodTier10a, rodTier10a,
cableTier10, RECIPE_CONSTANTS.electricMotor_MAX, smallGearTier10,
RECIPE_CONSTANTS.electricPiston_MAX);
//Robot Arms
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
cableTier7, cableTier7, cableTier7,
RECIPE_CONSTANTS.electricMotor_LuV, rodTier7a, RECIPE_CONSTANTS.electricMotor_LuV,
RECIPE_CONSTANTS.electricPiston_LuV, circuitTier7, rodTier7a,
RECIPE_CONSTANTS.robotArm_LuV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
cableTier8, cableTier8, cableTier8,
RECIPE_CONSTANTS.electricMotor_ZPM, rodTier8a, RECIPE_CONSTANTS.electricMotor_ZPM,
RECIPE_CONSTANTS.electricPiston_ZPM, circuitTier8, rodTier8a,
RECIPE_CONSTANTS.robotArm_ZPM);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
cableTier9, cableTier9, cableTier9,
RECIPE_CONSTANTS.electricMotor_UV, rodTier9a, RECIPE_CONSTANTS.electricMotor_UV,
RECIPE_CONSTANTS.electricPiston_UV, circuitTier9, rodTier9a,
RECIPE_CONSTANTS.robotArm_UV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
cableTier10, cableTier10, cableTier10,
RECIPE_CONSTANTS.electricMotor_MAX, rodTier10a, RECIPE_CONSTANTS.electricMotor_MAX,
RECIPE_CONSTANTS.electricPiston_MAX, circuitTier10, rodTier10a,
RECIPE_CONSTANTS.robotArm_MAX);
//Conveyor Modules
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateRubber, plateRubber, plateRubber,
RECIPE_CONSTANTS.electricMotor_LuV, cableTier7, RECIPE_CONSTANTS.electricMotor_LuV,
plateRubber, plateRubber, plateRubber,
RECIPE_CONSTANTS.conveyorModule_LuV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateRubber, plateRubber, plateRubber,
RECIPE_CONSTANTS.electricMotor_ZPM, cableTier8, RECIPE_CONSTANTS.electricMotor_ZPM,
plateRubber, plateRubber, plateRubber,
RECIPE_CONSTANTS.conveyorModule_ZPM);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateRubber, plateRubber, plateRubber,
RECIPE_CONSTANTS.electricMotor_UV, cableTier9, RECIPE_CONSTANTS.electricMotor_UV,
plateRubber, plateRubber, plateRubber,
RECIPE_CONSTANTS.conveyorModule_UV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateRubber, plateRubber, plateRubber,
RECIPE_CONSTANTS.electricMotor_MAX, cableTier10, RECIPE_CONSTANTS.electricMotor_MAX,
plateRubber, plateRubber, plateRubber,
RECIPE_CONSTANTS.conveyorModule_MAX);
//Emitter Modules
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
rodTier7c, rodTier7c, circuitTier7,
cableTier7, circuitTier6, rodTier7c,
circuitTier7, cableTier7, rodTier7c,
RECIPE_CONSTANTS.emitter_LuV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
rodTier8c, rodTier8c, circuitTier8,
cableTier8, circuitTier7, rodTier8c,
circuitTier8, cableTier8, rodTier8c,
RECIPE_CONSTANTS.emitter_ZPM);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
rodTier9c, rodTier9c, circuitTier9,
cableTier9, circuitTier8, rodTier9c,
circuitTier9, cableTier9, rodTier9c,
RECIPE_CONSTANTS.emitter_UV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
rodTier10c, rodTier10c, circuitTier10,
cableTier10, circuitTier9, rodTier10c,
circuitTier10, cableTier10, rodTier10c,
RECIPE_CONSTANTS.emitter_MAX);
//Field Generator Modules
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
wireTier7, circuitTier7, wireTier7,
circuitTier7, circuitTier6, circuitTier7,
wireTier7, circuitTier7, wireTier7,
RECIPE_CONSTANTS.fieldGenerator_LuV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
wireTier8, circuitTier8, wireTier8,
circuitTier8, circuitTier7, circuitTier8,
wireTier8, circuitTier8, wireTier8,
RECIPE_CONSTANTS.fieldGenerator_ZPM);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
wireTier9, circuitTier9, wireTier9,
circuitTier9, circuitTier8, circuitTier9,
wireTier9, circuitTier9, wireTier9,
RECIPE_CONSTANTS.fieldGenerator_UV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
wireTier10, circuitTier10, wireTier10,
circuitTier10, circuitTier9, circuitTier10,
wireTier10, circuitTier10, wireTier10,
RECIPE_CONSTANTS.fieldGenerator_MAX);
//Sensor Modules
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier7, null, circuitTier6,
plateTier7, rodTier7c, null,
circuitTier7, plateTier7, plateTier7,
RECIPE_CONSTANTS.sensor_LuV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier8, null, circuitTier7,
plateTier8, rodTier8c, null,
circuitTier8, plateTier8, plateTier8,
RECIPE_CONSTANTS.sensor_ZPM);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier9, null, circuitTier8,
plateTier9, rodTier9c, null,
circuitTier9, plateTier9, plateTier9,
RECIPE_CONSTANTS.sensor_UV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier10, null, circuitTier9,
plateTier10, rodTier10c, null,
circuitTier10, plateTier10, plateTier10,
@@ -279,42 +279,42 @@ public class RECIPES_MachineComponents {
}
private static void onlyMaxComponents(){
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
cableTier10, wireTier10, rodTier10a,
wireTier10, rodTier10b, wireTier10,
rodTier10a, wireTier10, cableTier10,
RECIPE_CONSTANTS.electricMotor_MAX);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
cableTier10, rotorTier10, itemRubberRing,
craftingToolScrewdriver, pipeTier10, craftingToolWrench,
itemRubberRing, RECIPE_CONSTANTS.electricMotor_MAX, cableTier10,
RECIPE_CONSTANTS.electricPump_MAX);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier10, plateTier10, plateTier10,
cableTier10, rodTier10a, rodTier10a,
cableTier10, RECIPE_CONSTANTS.electricMotor_MAX, smallGearTier10,
RECIPE_CONSTANTS.electricPiston_MAX);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
cableTier10, cableTier10, cableTier10,
RECIPE_CONSTANTS.electricMotor_MAX, rodTier10a, RECIPE_CONSTANTS.electricMotor_MAX,
RECIPE_CONSTANTS.electricPiston_MAX, circuitTier10, rodTier10a,
RECIPE_CONSTANTS.robotArm_MAX);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateRubber, plateRubber, plateRubber,
RECIPE_CONSTANTS.electricMotor_MAX, cableTier10, RECIPE_CONSTANTS.electricMotor_MAX,
plateRubber, plateRubber, plateRubber,
RECIPE_CONSTANTS.conveyorModule_MAX);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
rodTier10c, rodTier10c, circuitTier10,
cableTier10, circuitTier9, rodTier10c,
circuitTier10, cableTier10, rodTier10c,
RECIPE_CONSTANTS.emitter_MAX);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
wireTier10, circuitTier10, wireTier10,
circuitTier10, circuitTier9, circuitTier10,
wireTier10, circuitTier10, wireTier10,
RECIPE_CONSTANTS.fieldGenerator_MAX);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier10, null, circuitTier9,
plateTier10, rodTier10c, null,
circuitTier10, plateTier10, plateTier10,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index eac35d586f..4e317d6b7e 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -4,8 +4,8 @@ import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
@@ -51,16 +51,16 @@ public class RECIPES_Machines {
//Buffer Cores
- static ItemStack RECIPE_BufferCore_ULV = UtilsItems.getItemStack("miscutils:item.itemBufferCore1", 1);
- static ItemStack RECIPE_BufferCore_LV = UtilsItems.getItemStack("miscutils:item.itemBufferCore2", 1);
- static ItemStack RECIPE_BufferCore_MV = UtilsItems.getItemStack("miscutils:item.itemBufferCore3", 1);
- static ItemStack RECIPE_BufferCore_HV = UtilsItems.getItemStack("miscutils:item.itemBufferCore4", 1);
- static ItemStack RECIPE_BufferCore_EV = UtilsItems.getItemStack("miscutils:item.itemBufferCore5", 1);
- static ItemStack RECIPE_BufferCore_IV = UtilsItems.getItemStack("miscutils:item.itemBufferCore6", 1);
- static ItemStack RECIPE_BufferCore_LuV = UtilsItems.getItemStack("miscutils:item.itemBufferCore7", 1);
- static ItemStack RECIPE_BufferCore_ZPM = UtilsItems.getItemStack("miscutils:item.itemBufferCore8", 1);
- static ItemStack RECIPE_BufferCore_UV = UtilsItems.getItemStack("miscutils:item.itemBufferCore9", 1);
- static ItemStack RECIPE_BufferCore_MAX = UtilsItems.getItemStack("miscutils:item.itemBufferCore10", 1);
+ static ItemStack RECIPE_BufferCore_ULV = ItemUtils.getItemStack("miscutils:item.itemBufferCore1", 1);
+ static ItemStack RECIPE_BufferCore_LV = ItemUtils.getItemStack("miscutils:item.itemBufferCore2", 1);
+ static ItemStack RECIPE_BufferCore_MV = ItemUtils.getItemStack("miscutils:item.itemBufferCore3", 1);
+ static ItemStack RECIPE_BufferCore_HV = ItemUtils.getItemStack("miscutils:item.itemBufferCore4", 1);
+ static ItemStack RECIPE_BufferCore_EV = ItemUtils.getItemStack("miscutils:item.itemBufferCore5", 1);
+ static ItemStack RECIPE_BufferCore_IV = ItemUtils.getItemStack("miscutils:item.itemBufferCore6", 1);
+ static ItemStack RECIPE_BufferCore_LuV = ItemUtils.getItemStack("miscutils:item.itemBufferCore7", 1);
+ static ItemStack RECIPE_BufferCore_ZPM = ItemUtils.getItemStack("miscutils:item.itemBufferCore8", 1);
+ static ItemStack RECIPE_BufferCore_UV = ItemUtils.getItemStack("miscutils:item.itemBufferCore9", 1);
+ static ItemStack RECIPE_BufferCore_MAX = ItemUtils.getItemStack("miscutils:item.itemBufferCore10", 1);
//Wire
@@ -173,7 +173,7 @@ public class RECIPES_Machines {
//Lava Boiler
static ItemStack boiler_Coal;
- static ItemStack blockBricks = UtilsItems.getItemStack("minecraft:brick_block", 1);
+ static ItemStack blockBricks = ItemUtils.getItemStack("minecraft:brick_block", 1);
//Batteries
static String batteryBasic = "batteryBasic";
@@ -258,11 +258,11 @@ public class RECIPES_Machines {
private static void initModItems(){
if (LoadedMods.IndustrialCraft2){
- IC2MFE = UtilsItems.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", "IC2_MFE", 1, 1);
- IC2MFSU = UtilsItems.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", "IC2_MFSU", 2, 1);
+ IC2MFE = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", "IC2_MFE", 1, 1);
+ IC2MFSU = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", "IC2_MFSU", 2, 1);
}
if (LoadedMods.Gregtech){
- RECIPES_Shapeless.dustStaballoy = UtilsItems.getItemStackWithMeta(LoadedMods.MiscUtils, "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 2);
+ RECIPES_Shapeless.dustStaballoy = ItemUtils.getItemStackWithMeta(LoadedMods.MiscUtils, "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 2);
machineCasing_ULV = ItemList.Casing_ULV.get(1);
machineCasing_LV = ItemList.Casing_LV.get(1);
machineCasing_MV = ItemList.Casing_MV.get(1);
@@ -339,11 +339,11 @@ public class RECIPES_Machines {
if(LoadedMods.Railcraft){
//Misc
- INPUT_RCCokeOvenBlock = UtilsItems.getItemStackWithMeta(LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1);
+ INPUT_RCCokeOvenBlock = ItemUtils.getItemStackWithMeta(LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1);
}
if(LoadedMods.ImmersiveEngineering){
//Misc
- INPUT_IECokeOvenBlock = UtilsItems.getItemStackWithMeta(LoadedMods.ImmersiveEngineering, "ImmersiveEngineering:stoneDecoration", "Coke_Oven_IE", 1, 1);
+ INPUT_IECokeOvenBlock = ItemUtils.getItemStackWithMeta(LoadedMods.ImmersiveEngineering, "ImmersiveEngineering:stoneDecoration", "Coke_Oven_IE", 1, 1);
}
runModRecipes();
}
@@ -351,141 +351,141 @@ public class RECIPES_Machines {
private static void runModRecipes(){
if (LoadedMods.Gregtech){
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
ItemList.Electric_Piston_EV, GregtechOrePrefixes.circuit.get(Materials.Ultimate), ItemList.Electric_Piston_EV,
ItemList.Electric_Motor_EV, machineCasing_EV, ItemList.Electric_Motor_EV,
"gearGtTitanium", "cableGt02Aluminium", "gearGtTitanium",
- UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 793, 1));
- UtilsRecipe.addShapedGregtechRecipe(
+ ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 793, 1));
+ RecipeUtils.addShapedGregtechRecipe(
ItemList.Electric_Piston_IV, GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic), ItemList.Electric_Piston_IV,
ItemList.Electric_Motor_IV, machineCasing_IV, ItemList.Electric_Motor_IV,
"gearGtTungstenSteel", "cableGt02Platinum", "gearGtTungstenSteel",
- UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 794, 1));
- UtilsRecipe.addShapedGregtechRecipe(
+ ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 794, 1));
+ RecipeUtils.addShapedGregtechRecipe(
RECIPE_CONSTANTS.electricPiston_LuV, GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic), RECIPE_CONSTANTS.electricPiston_LuV,
RECIPE_CONSTANTS.electricMotor_LuV, machineCasing_LuV, RECIPE_CONSTANTS.electricMotor_LuV,
"gearGtChrome", "cableGt02Tungsten", "gearGtChrome",
- UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 795, 1));
+ ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 795, 1));
//Buffer Core
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier1, cableTier1, plateTier1,
circuitPrimitive, IC2MFE, circuitPrimitive,
plateTier1, cableTier1, plateTier1,
RECIPE_BufferCore_ULV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier2, cableTier2, plateTier2,
circuitTier1, IC2MFE, circuitTier1,
plateTier2, cableTier2, plateTier2,
RECIPE_BufferCore_LV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier3, cableTier3, plateTier3,
RECIPE_BufferCore_LV, circuitTier2, RECIPE_BufferCore_LV,
plateTier3, cableTier3, plateTier3,
RECIPE_BufferCore_MV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier4, cableTier4, plateTier4,
RECIPE_BufferCore_MV, circuitTier3, RECIPE_BufferCore_MV,
plateTier4, cableTier4, plateTier4,
RECIPE_BufferCore_HV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier5, cableTier5, plateTier5,
RECIPE_BufferCore_HV, circuitTier4, RECIPE_BufferCore_HV,
plateTier5, cableTier5, plateTier5,
RECIPE_BufferCore_EV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier6, cableTier6, plateTier6,
RECIPE_BufferCore_EV, circuitTier5, RECIPE_BufferCore_EV,
plateTier6, cableTier6, plateTier6,
RECIPE_BufferCore_IV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier7, cableTier7, plateTier7,
RECIPE_BufferCore_IV, circuitTier6, RECIPE_BufferCore_IV,
plateTier7, cableTier7, plateTier7,
RECIPE_BufferCore_LuV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier8, cableTier8, plateTier8,
RECIPE_BufferCore_LuV, circuitTier7, RECIPE_BufferCore_LuV,
plateTier8, cableTier8, plateTier8,
RECIPE_BufferCore_ZPM);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier9, cableTier9, plateTier9,
RECIPE_BufferCore_ZPM, circuitTier8, RECIPE_BufferCore_ZPM,
plateTier9, cableTier9, plateTier9,
RECIPE_BufferCore_UV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier10, cableTier10, plateTier10,
RECIPE_BufferCore_UV, circuitTier9, RECIPE_BufferCore_UV,
plateTier10, cableTier10, plateTier10,
RECIPE_BufferCore_MAX);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
wireTier1, RECIPE_BufferCore_ULV, wireTier1,
wireTier1, machineCasing_ULV, wireTier1,
circuitPrimitive, circuitTier1, circuitPrimitive,
RECIPE_Buffer_ULV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
wireTier2, RECIPE_BufferCore_LV, wireTier2,
wireTier2, machineCasing_LV, wireTier2,
circuitTier1, RECIPE_BufferCore_LV, circuitTier1,
RECIPE_Buffer_LV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
wireTier3, RECIPE_BufferCore_MV, wireTier3,
wireTier3, machineCasing_MV, wireTier3,
circuitTier2, RECIPE_BufferCore_MV, circuitTier2,
RECIPE_Buffer_MV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
wireTier4, RECIPE_BufferCore_HV, wireTier4,
wireTier4, machineCasing_HV, wireTier4,
circuitTier3, RECIPE_BufferCore_HV, circuitTier3,
RECIPE_Buffer_HV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
wireTier5, RECIPE_BufferCore_EV, wireTier5,
wireTier5, machineCasing_EV, wireTier5,
circuitTier4, RECIPE_BufferCore_EV, circuitTier4,
RECIPE_Buffer_EV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
wireTier6, RECIPE_BufferCore_IV, wireTier6,
wireTier6, machineCasing_IV, wireTier6,
circuitTier5, RECIPE_BufferCore_IV, circuitTier5,
RECIPE_Buffer_IV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
wireTier7, RECIPE_BufferCore_LuV, wireTier7,
wireTier7, machineCasing_LuV, wireTier7,
circuitTier6, RECIPE_BufferCore_LuV, circuitTier6,
RECIPE_Buffer_LuV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
wireTier8, RECIPE_BufferCore_ZPM, wireTier8,
wireTier8, machineCasing_ZPM, wireTier8,
circuitTier7, RECIPE_BufferCore_ZPM, circuitTier7,
RECIPE_Buffer_ZPM);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
wireTier9, RECIPE_BufferCore_UV, wireTier9,
wireTier9, machineCasing_UV, wireTier9,
circuitTier8, RECIPE_BufferCore_UV, circuitTier8,
RECIPE_Buffer_UV);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier11, RECIPE_BufferCore_MAX, plateTier11,
wireTier10, machineCasing_MAX, wireTier10,
circuitTier9, RECIPE_BufferCore_MAX, circuitTier9,
RECIPE_Buffer_MAX);
//Steam Condenser
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
pipeLargeCopper, pipeHugeSteel, pipeLargeCopper,
plateEnergeticAlloy, electricPump_HV, plateEnergeticAlloy,
plateEnergeticAlloy, pipeLargeCopper, plateEnergeticAlloy,
RECIPE_SteamCondenser);
//Iron BF
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
"plateDoubleAnyIron", "craftingFurnace", "plateDoubleAnyIron",
boiler_Coal, machineCasing_ULV, boiler_Coal,
"plateDoubleAnyIron", "bucketLava", "plateDoubleAnyIron",
RECIPE_IronBlastFurnace);
//Iron plated Bricks
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
"plateAnyIron", RECIPES_Tools.craftingToolHardHammer, "plateAnyIron",
"plateAnyIron", blockBricks, "plateAnyIron",
"plateAnyIron", RECIPES_Tools.craftingToolWrench, "plateAnyIron",
@@ -505,13 +505,13 @@ public class RECIPES_Machines {
RECIPE_IndustrialCentrifugeController);*/
//Industrial Centrifuge
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
circuitTier6, pipeHugeStainlessSteel, circuitTier6,
plateTier6, IV_MACHINE_Centrifuge, plateTier6,
plateTier8, machineCasing_IV, plateTier8,
RECIPE_IndustrialCentrifugeController);
//Centrifuge Casing
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier6, "stickTumbaga", plateTier6,
plateTier8, "stickTumbaga", plateTier8,
plateTier6, "stickTumbaga", plateTier6,
@@ -519,7 +519,7 @@ public class RECIPES_Machines {
if (LoadedMods.Railcraft){
//Industrial Coke Oven
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateCobalt, circuitTier4, plateCobalt,
machineCasing_HV, INPUT_RCCokeOvenBlock, machineCasing_HV,
plateCobalt, circuitTier5, plateCobalt,
@@ -527,78 +527,78 @@ public class RECIPES_Machines {
}
if (LoadedMods.ImmersiveEngineering){
//Industrial Coke Oven
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier8, circuitTier4, plateTier8,
machineCasing_HV, INPUT_IECokeOvenBlock, machineCasing_HV,
plateTier8, circuitTier3, plateTier8,
RECIPE_IndustrialCokeOvenController);
}
//Coke Oven Frame Casing
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier7, rodTier7, plateTier7,
rodTier7, "frameGtTantalloy61", rodTier7,
plateTier7, rodTier7, plateTier7,
RECIPE_IndustrialCokeOvenFrame);
//Coke Oven Coil 1
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateBronze, plateBronze, plateBronze,
"frameGtBronze", gearboxCasing_Tier_1, "frameGtBronze",
plateBronze, plateBronze, plateBronze,
RECIPE_IndustrialCokeOvenCasingA);
//Coke Oven Coil 2
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateSteel, plateSteel, plateSteel,
"frameGtSteel", gearboxCasing_Tier_2, "frameGtSteel",
plateSteel, plateSteel, plateSteel,
RECIPE_IndustrialCokeOvenCasingB);
//Electrolyzer Frame Casing
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
"platePotin", "stickLongChrome", "platePotin",
"stickLongPotin", "frameGtPotin", "stickLongPotin",
"platePotin", "stickLongPotin", "platePotin",
RECIPE_IndustrialElectrolyzerFrame);
//Industrial Electrolyzer
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
"plateStellite", circuitTier6, "plateStellite",
machineCasing_EV, IV_MACHINE_Electrolyzer, machineCasing_EV,
"plateStellite", "rotorStellite", "plateStellite",
RECIPE_IndustrialElectrolyzerController);
//Material Press Frame Casing
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
"plateTitanium", "stickLongTumbaga", "plateTitanium",
"stickTantalloy60", "frameGtTumbaga", "stickTantalloy60",
"plateTitanium", "stickLongTumbaga", "plateTitanium",
RECIPE_IndustrialMaterialPressFrame);
//Industrial Material Press
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
"plateTitanium", circuitTier5, "plateTitanium",
machineCasing_EV, IV_MACHINE_BendingMachine, machineCasing_EV,
"plateTitanium", circuitTier5, "plateTitanium",
RECIPE_IndustrialMaterialPressController);
//Maceration Frame Casing
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
"platePalladium", "platePalladium", "platePalladium",
"stickPlatinum", "frameGtInconel625", "stickPlatinum",
"platePalladium", "stickLongPalladium", "platePalladium",
RECIPE_IndustrialMacerationStackFrame);
//Industrial Maceration stack
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
"plateTungstenCarbide", IV_MACHINE_Macerator, "plateTungstenCarbide",
IV_MACHINE_Macerator, circuitTier8, IV_MACHINE_Macerator,
"plateTungstenCarbide", machineCasing_IV, "plateTungstenCarbide",
RECIPE_IndustrialMacerationStackController);
//Wire Factory Frame Casing
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
"plateBlueSteel", "stickBlueSteel", "plateBlueSteel",
"stickBlueSteel", "frameGtBlueSteel", "stickBlueSteel",
"plateBlueSteel", "stickBlueSteel", "plateBlueSteel",
RECIPE_IndustrialWireFactoryFrame);
//Industrial Wire Factory
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
"plateZeron100", machineCasing_IV, "plateZeron100",
circuitTier6, IV_MACHINE_Wiremill, circuitTier6,
"plateZeron100", machineCasing_IV, "plateZeron100",
@@ -607,52 +607,52 @@ public class RECIPES_Machines {
//Tiered Tanks
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier1, plateTier1, plateTier1,
plateTier1, pipeTier1, plateTier1,
plateTier1, GregtechItemList.Fluid_Cell_144L.get(1), plateTier1,
GregtechItemList.GT_FluidTank_ULV.get(1));
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier2, plateTier2, plateTier2,
plateTier2, pipeTier2, plateTier2,
plateTier2, electricPump_LV, plateTier2,
GregtechItemList.GT_FluidTank_LV.get(1));
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier3, plateTier3, plateTier3,
plateTier3, pipeTier3, plateTier3,
plateTier3, electricPump_MV, plateTier3,
GregtechItemList.GT_FluidTank_MV.get(1));
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier4, plateTier4, plateTier4,
plateTier4, pipeTier4, plateTier4,
plateTier4, electricPump_HV, plateTier4,
GregtechItemList.GT_FluidTank_HV.get(1));
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier5, plateTier5, plateTier5,
plateTier5, pipeTier5, plateTier5,
plateTier5, electricPump_EV, plateTier5,
GregtechItemList.GT_FluidTank_EV.get(1));
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier6, plateTier6, plateTier6,
plateTier6, pipeTier6, plateTier6,
plateTier6, electricPump_IV, plateTier6,
GregtechItemList.GT_FluidTank_IV.get(1));
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier7, plateTier7, plateTier7,
plateTier7, pipeTier7, plateTier7,
plateTier7, RECIPE_CONSTANTS.electricPump_LuV, plateTier7,
GregtechItemList.GT_FluidTank_LuV.get(1));
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier8, plateTier8, plateTier8,
plateTier8, pipeTier8, plateTier8,
plateTier8, RECIPE_CONSTANTS.electricPump_ZPM, plateTier8,
GregtechItemList.GT_FluidTank_ZPM.get(1));
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier9, plateTier9, plateTier9,
plateTier9, pipeTier9, plateTier9,
plateTier9, RECIPE_CONSTANTS.electricPump_UV, plateTier9,
GregtechItemList.GT_FluidTank_UV.get(1));
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
plateTier10, plateTier10, plateTier10,
plateTier10, pipeTier10, plateTier10,
plateTier10, RECIPE_CONSTANTS.electricPump_MAX, plateTier10,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
index 2a79aa92c9..fa11783f70 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.recipe;
import gregtech.api.enums.ItemList;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import net.minecraft.item.ItemStack;
public class RECIPES_Shapeless {
@@ -31,12 +31,12 @@ public class RECIPES_Shapeless {
if (LoadedMods.Gregtech){
gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1);
- UtilsRecipe.shapelessBuilder(dustStaballoy,
+ RecipeUtils.shapelessBuilder(dustStaballoy,
"dustTitanium", "dustUranium", "dustUranium",
"dustUranium", "dustUranium", "dustUranium",
"dustUranium", "dustUranium", "dustUranium");
- UtilsRecipe.shapelessBuilder(gearboxCasing_Tier_1,
+ RecipeUtils.shapelessBuilder(gearboxCasing_Tier_1,
circuitPrimitive, circuitPrimitive, circuitPrimitive,
circuitPrimitive, circuitPrimitive, circuitPrimitive,
circuitPrimitive, circuitPrimitive, circuitPrimitive);
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
index 91337d3e0f..17fa4ef93d 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
@@ -2,8 +2,8 @@ package gtPlusPlus.core.recipe;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.item.UtilsItems;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -119,7 +119,7 @@ public class RECIPES_Tools {
public static ItemStack sandHammer = new ItemStack (ModItems.itemSandstoneHammer, 1, OreDictionary.WILDCARD_VALUE);
public static String craftingToolSandHammer = "craftingToolSandHammer";
- public static ItemStack personalCloakingDevice = UtilsItems.getSimpleStack(ModItems.itemPersonalCloakingDevice);
+ public static ItemStack personalCloakingDevice = ItemUtils.getSimpleStack(ModItems.itemPersonalCloakingDevice);
public static String plateDoubleNiChrome = "plateDoubleNichrome";
public static String plateIridiumAlloy = "plateAlloyIridium";
@@ -132,21 +132,21 @@ public class RECIPES_Tools {
private static void run(){
//Staballoy Pickaxe
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
plateStaballoy, plateStaballoy, ingotStaballoy,
craftingToolFile, stickTungsten, craftingToolHardHammer,
craftingToolWrench, stickTungsten, craftingToolHardHammer,
RECIPE_StaballoyPickaxe);
//Staballoy Axe
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
plateStaballoy, ingotStaballoy, craftingToolHardHammer,
plateStaballoy, stickTungsten, craftingToolHardHammer,
craftingToolFile, stickTungsten, craftingToolWrench,
RECIPE_StaballoyAxe);
//Cobble to Sand
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
CobbleStone, CobbleStone, CobbleStone,
CobbleStone, sandHammer, CobbleStone,
CobbleStone, CobbleStone, CobbleStone,
@@ -154,7 +154,7 @@ public class RECIPES_Tools {
if (LoadedMods.Baubles){
//Cloaking Device
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
plateDoubleNiChrome, plateIridiumAlloy, plateDoubleNiChrome,
plateIridiumAlloy, batteryUltimate, plateIridiumAlloy,
plateDoubleNiChrome, plateIridiumAlloy, plateDoubleNiChrome,
@@ -162,14 +162,14 @@ public class RECIPES_Tools {
}
//Sand to Sandstone
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
Sand, Sand, Sand,
Sand, sandHammer, Sand,
Sand, Sand, Sand,
RECIPE_SandStone);
//Sandstone Hammer
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
plateElectrum, ingotElectrum, plateElectrum,
craftingToolScrewdriver, stickBronze, craftingToolHardHammer,
null, stickSteel, null,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java b/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
index 80ee79e292..440f8815bc 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
@@ -2,8 +2,8 @@ package gtPlusPlus.core.recipe;
import gregtech.api.enums.ItemList;
import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.item.UtilsItems;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import net.minecraft.item.ItemStack;
@@ -12,9 +12,9 @@ public class RECIPE_Batteries {
static ItemStack RECIPE_Battery_Sodium = GregtechItemList.Battery_RE_EV_Sodium.get(1);
static ItemStack RECIPE_Battery_Cadmium = GregtechItemList.Battery_RE_EV_Cadmium.get(1);
static ItemStack RECIPE_Battery_Lithium = GregtechItemList.Battery_RE_EV_Lithium.get(1);
- static ItemStack GT_Battery_Sodium = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32539, 1);
- static ItemStack GT_Battery_Cadmium = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32537, 1);
- static ItemStack GT_Battery_Lithium = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32538, 1);
+ static ItemStack GT_Battery_Sodium = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32539, 1);
+ static ItemStack GT_Battery_Cadmium = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32537, 1);
+ static ItemStack GT_Battery_Lithium = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32538, 1);
static ItemStack machineTransformer_EV;
public static void RECIPES_LOAD(){
@@ -28,17 +28,17 @@ public class RECIPE_Batteries {
private static void run(){
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
GT_Battery_Sodium, RECIPES_Machines.cableTier4, GT_Battery_Sodium,
RECIPES_Machines.circuitTier3, machineTransformer_EV, RECIPES_Machines.circuitTier3,
GT_Battery_Sodium, RECIPES_Machines.cableTier4, GT_Battery_Sodium,
RECIPE_Battery_Sodium);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
GT_Battery_Cadmium, RECIPES_Machines.cableTier4, GT_Battery_Cadmium,
RECIPES_Machines.circuitTier3, machineTransformer_EV, RECIPES_Machines.circuitTier3,
GT_Battery_Cadmium, RECIPES_Machines.cableTier4, GT_Battery_Cadmium,
RECIPE_Battery_Cadmium);
- UtilsRecipe.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
GT_Battery_Lithium, RECIPES_Machines.cableTier4, GT_Battery_Lithium,
RECIPES_Machines.circuitTier3, machineTransformer_EV, RECIPES_Machines.circuitTier3,
GT_Battery_Lithium, RECIPES_Machines.cableTier4, GT_Battery_Lithium,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java b/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java
index b294dd9cef..c0548e9e74 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java
@@ -1,7 +1,7 @@
package gtPlusPlus.core.recipe;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import net.minecraft.item.ItemStack;
@@ -52,30 +52,30 @@ public class RECIPE_CONSTANTS {
private static void registerGTExperimentalComponents(){
//Machine Components
- electricMotor_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32606, 1);
- electricMotor_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32607, 1);
- electricMotor_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32608, 1);
- electricPump_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32620, 1);
- electricPump_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32621, 1);
- electricPump_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32622, 1);
- electricPiston_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32645, 1);
- electricPiston_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32646, 1);
- electricPiston_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32647, 1);
- robotArm_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32655, 1);
- robotArm_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32656, 1);
- robotArm_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32657, 1);
- conveyorModule_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32636, 1);
- conveyorModule_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32637, 1);
- conveyorModule_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32638, 1);
- emitter_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32685, 1);
- emitter_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32686, 1);
- emitter_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32687, 1);
- fieldGenerator_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32675, 1);
- fieldGenerator_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32676, 1);
- fieldGenerator_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32677, 1);
- sensor_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1);
- sensor_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1);
- sensor_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
+ electricMotor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32606, 1);
+ electricMotor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32607, 1);
+ electricMotor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32608, 1);
+ electricPump_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32620, 1);
+ electricPump_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32621, 1);
+ electricPump_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32622, 1);
+ electricPiston_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32645, 1);
+ electricPiston_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32646, 1);
+ electricPiston_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32647, 1);
+ robotArm_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32655, 1);
+ robotArm_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32656, 1);
+ robotArm_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32657, 1);
+ conveyorModule_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32636, 1);
+ conveyorModule_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32637, 1);
+ conveyorModule_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32638, 1);
+ emitter_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32685, 1);
+ emitter_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32686, 1);
+ emitter_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32687, 1);
+ fieldGenerator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32675, 1);
+ fieldGenerator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32676, 1);
+ fieldGenerator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32677, 1);
+ sensor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1);
+ sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1);
+ sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
//Max Tier Components Blood Never added... Useless, lol.
electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1);
diff --git a/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java b/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java
index c6dc1ede1b..348f9907c0 100644
--- a/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java
+++ b/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java
@@ -1,7 +1,7 @@
package gtPlusPlus.core.recipe;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import net.minecraft.item.ItemStack;
public class ShapedRecipeObject {
@@ -36,7 +36,7 @@ public class ShapedRecipeObject {
}
public void buildRecipe(){
- UtilsRecipe.recipeBuilder(object_A, object_B, object_C, object_D, object_E, object_F, object_G, object_H, object_I, object_OUTPUT);
+ RecipeUtils.recipeBuilder(object_A, object_B, object_C, object_D, object_E, object_F, object_G, object_H, object_I, object_OUTPUT);
}
}
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index 93621200ab..2e25b8b0e9 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -6,7 +6,7 @@ import gregtech.api.enums.TC_Aspects.TC_AspectStack;
import gtPlusPlus.GTplusplus;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.fluid.FluidUtils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import ic2.core.Ic2Items;
import ic2.core.init.InternalName;
@@ -488,7 +488,7 @@ public class Utils {
ItemStack temp = (ItemStack) methode.invoke(item, cellID++, yourName, new Block[0]);
Utils.LOG_INFO("Successfully created "+temp.getDisplayName()+"s.");
FluidContainerRegistry.registerFluidContainer(FluidUtils.getFluidStack(s.toLowerCase(), 0), temp.copy(), Ic2Items.cell.copy());
- UtilsItems.addItemToOreDictionary(temp.copy(), "cell"+s);
+ ItemUtils.addItemToOreDictionary(temp.copy(), "cell"+s);
return temp;
}
catch(Exception e){
diff --git a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
index dcc73860d0..89d78413c0 100644
--- a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
+++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
@@ -32,6 +32,7 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.fluid.FluidUtils;
import gtPlusPlus.core.util.materials.MaterialUtils;
import gtPlusPlus.core.util.wrapper.var;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelter;
import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration;
import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Extruder;
import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plates;
@@ -48,7 +49,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.common.registry.GameRegistry;
-public class UtilsItems {
+public class ItemUtils {
public static ItemStack getSimpleStack(Item x){
return getSimpleStack(x, 1);
@@ -72,7 +73,7 @@ public class UtilsItems {
}
public static ItemStack getIC2Cell(String S){
- ItemStack moreTemp = UtilsItems.getItemStackOfAmountFromOreDictNoBroken("cell"+S, 1);
+ ItemStack moreTemp = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+S, 1);
if (moreTemp == null){
int cellID = 0;
@@ -192,12 +193,12 @@ public class UtilsItems {
ItemStack temp;
if (fqrn.toLowerCase().contains(oreDict.toLowerCase())){
String sanitizedName = fqrn.replace(oreDict, "");
- temp = UtilsItems.getItemStack(sanitizedName, stackSize);
+ temp = ItemUtils.getItemStack(sanitizedName, stackSize);
return temp;
}
String[] fqrnSplit = fqrn.split(":");
if(fqrnSplit[2] == null){fqrnSplit[2] = "0";}
- temp = UtilsItems.getItemStackWithMeta(LoadedMods.MiscUtils, fqrn, fqrnSplit[1], Integer.parseInt(fqrnSplit[2]), stackSize);
+ temp = ItemUtils.getItemStackWithMeta(LoadedMods.MiscUtils, fqrn, fqrnSplit[1], Integer.parseInt(fqrnSplit[2]), stackSize);
return temp;
}
@@ -341,7 +342,7 @@ public class UtilsItems {
temp = new BaseItemIngot("itemIngot"+unlocalizedName, materialName, Colour, sRadiation);
if (hotIngot){
Item tempIngot = temp;
- temp = new BaseItemIngotHot("itemHotIngot"+unlocalizedName, materialName, UtilsItems.getSimpleStack(tempIngot, 1), materialTier);
+ temp = new BaseItemIngotHot("itemHotIngot"+unlocalizedName, materialName, ItemUtils.getSimpleStack(tempIngot, 1), materialTier);
}
temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", materialTier, sRadiation);
temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", materialTier, sRadiation);
@@ -363,6 +364,7 @@ public class UtilsItems {
RecipeGen_Extruder.generateRecipes(matInfo);
RecipeGen_ShapedCrafting.generateRecipes(matInfo);
RecipeGen_DustGeneration.generateRecipes(matInfo);
+ RecipeGen_BlastSmelter.generateARecipe(matInfo);
FluidUtils.generateFluid(matInfo, 1);
@@ -559,7 +561,7 @@ public class UtilsItems {
}
public static ItemStack getGregtechCircuit(int Meta){
- return UtilsItems.getItemStackWithMeta(LoadedMods.Gregtech, "gregtech:gt.integrated_circuit", "Gregtech Circuit", Meta, 0);
+ return ItemUtils.getItemStackWithMeta(LoadedMods.Gregtech, "gregtech:gt.integrated_circuit", "Gregtech Circuit", Meta, 0);
}
}
diff --git a/src/Java/gtPlusPlus/core/util/recipe/UtilsRecipe.java b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
index ee582c0646..39a118e440 100644
--- a/src/Java/gtPlusPlus/core/util/recipe/UtilsRecipe.java
+++ b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
@@ -6,7 +6,8 @@ import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.shapeless.ShapelessUtils;
import java.util.ArrayList;
import java.util.Iterator;
@@ -21,7 +22,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import cpw.mods.fml.common.registry.GameRegistry;
-public class UtilsRecipe {
+public class RecipeUtils {
public static boolean recipeBuilder(Object slot_1, Object slot_2, Object slot_3, Object slot_4, Object slot_5, Object slot_6, Object slot_7, Object slot_8, Object slot_9, ItemStack resultItem){
@@ -243,7 +244,7 @@ public class UtilsRecipe {
public static boolean removeCraftingRecipe(Object x){
if (null == x){return false;}
if (x instanceof String){
- Item R = UtilsItems.getItem((String) x);
+ Item R = ItemUtils.getItem((String) x);
if (R != null){
x = R;
}
@@ -269,7 +270,7 @@ public class UtilsRecipe {
return false;
}
}
- if (UtilsRecipe.attemptRecipeRemoval((Item) x)){
+ if (RecipeUtils.attemptRecipeRemoval((Item) x)){
Utils.LOG_INFO("Recipe removal successful");
return true;
}
@@ -358,12 +359,12 @@ public class UtilsRecipe {
public static void addShapelessGregtechRecipe(ItemStack OutputItem, Object... inputItems){
for(Object whatever : inputItems){
- if (!(whatever instanceof ItemStack) && !(whatever instanceof String)){
+ if (!(whatever instanceof ItemStack) && !(whatever instanceof String)){
Utils.LOG_INFO("One Input item was not an ItemStack of an OreDict String.");
- return;
- }
- }
-
+ return;
+ }
+ }
+
GT_ModHandler.addShapelessCraftingRecipe(OutputItem,
GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
new Object[]{inputItems});
@@ -374,4 +375,8 @@ public class UtilsRecipe {
return oreDictList.get(0);
}
+ public static boolean buildShapelessRecipe(ItemStack output, Object[] input){
+ return ShapelessUtils.addShapelessRecipe(output, input);
+ }
+
}
diff --git a/src/Java/gtPlusPlus/core/util/recipe/shapeless/ShapelessUtils.java b/src/Java/gtPlusPlus/core/util/recipe/shapeless/ShapelessUtils.java
new file mode 100644
index 0000000000..bf9d4960d8
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/util/recipe/shapeless/ShapelessUtils.java
@@ -0,0 +1,56 @@
+package gtPlusPlus.core.util.recipe.shapeless;
+
+import gtPlusPlus.core.util.Utils;
+
+import java.util.ArrayList;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.item.crafting.ShapelessRecipes;
+
+public class ShapelessUtils {
+
+
+ public static boolean addShapelessRecipe(ItemStack output, Object ... params)
+ {
+ ArrayList<ItemStack> arraylist = new ArrayList<ItemStack>();
+ Object[] aobject = params;
+ int i = params.length;
+
+ for (int j = 0; j < i; ++j)
+ {
+ Object object1 = aobject[j];
+
+ if (object1 instanceof ItemStack)
+ {
+ arraylist.add(((ItemStack)object1).copy());
+ }
+ else if (object1 instanceof Item)
+ {
+ arraylist.add(new ItemStack((Item)object1));
+ }
+ else
+ {
+ if ((object1 == null))
+ {
+ Utils.LOG_INFO(("Invalid shapeless input, ignoring!"));
+ }
+ else if (!(object1 instanceof Block) && (object1 != null))
+ {
+ Utils.LOG_INFO(("Invalid shapeless recipe!"));
+ return false;
+ }
+ else {
+ arraylist.add(new ItemStack((Block)object1));
+ }
+ }
+ }
+ CraftingManager.getInstance().getRecipeList().add(new ShapelessRecipes(output, arraylist));
+ //CraftingManager.getInstance().addShapelessRecipe(output, arraylist);
+ return true;
+ }
+
+
+}
diff --git a/src/Java/gtPlusPlus/core/util/wrapper/var.java b/src/Java/gtPlusPlus/core/util/wrapper/var.java
index d5e55bd658..3e7413ed85 100644
--- a/src/Java/gtPlusPlus/core/util/wrapper/var.java
+++ b/src/Java/gtPlusPlus/core/util/wrapper/var.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.util.wrapper;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.item.ItemStack;
public class var{
@@ -42,7 +42,7 @@ public class var{
}
private ItemStack getOreDictStack(int stackSize){
- ItemStack v = UtilsItems.getItemStack(sanitizedName, stackSize);
+ ItemStack v = ItemUtils.getItemStack(sanitizedName, stackSize);
return v;
}
@@ -56,10 +56,10 @@ public class var{
String meta = "0";
try {
if(fqrnSplit[2] != null){meta = fqrnSplit[2];}
- temp = UtilsItems.getItemStackWithMeta(LoadedMods.MiscUtils, fqrn, fqrnSplit[1], Integer.parseInt(meta), stackSize);
+ temp = ItemUtils.getItemStackWithMeta(LoadedMods.MiscUtils, fqrn, fqrnSplit[1], Integer.parseInt(meta), stackSize);
}
catch (ArrayIndexOutOfBoundsException a){
- temp = UtilsItems.getItemStackWithMeta(LoadedMods.MiscUtils, fqrn, fqrnSplit[1], Integer.parseInt(meta), stackSize);
+ temp = ItemUtils.getItemStackWithMeta(LoadedMods.MiscUtils, fqrn, fqrnSplit[1], Integer.parseInt(meta), stackSize);
}
return temp;
}
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
index 95049df43b..ced6dd1d27 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
@@ -1,8 +1,8 @@
package gtPlusPlus.xmod.forestry.bees.recipe;
import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.item.UtilsItems;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -16,17 +16,17 @@ public class FR_Gregtech_Recipes {
private static String rod_Uranium = "stickUranium";
private static String rod_LongUranium = "stickLongUranium";
private static String foil_Uranium235 = "foilUranium235";
- private static ItemStack hiveFrameAccelerated = UtilsItems.getSimpleStack(FR_ItemRegistry.hiveFrameAccelerated);
- private static ItemStack hiveFrameMutagenic = UtilsItems.getSimpleStack(FR_ItemRegistry.hiveFrameMutagenic);
+ private static ItemStack hiveFrameAccelerated = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameAccelerated);
+ private static ItemStack hiveFrameMutagenic = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameMutagenic);
- private static ItemStack hiveFrameCocoa = UtilsItems.getSimpleStack(FR_ItemRegistry.hiveFrameCocoa);
- private static ItemStack hiveFrameCaged = UtilsItems.getSimpleStack(FR_ItemRegistry.hiveFrameCaged);
- private static ItemStack hiveFrameSoul = UtilsItems.getSimpleStack(FR_ItemRegistry.hiveFrameSoul);
- private static ItemStack hiveFrameClay = UtilsItems.getSimpleStack(FR_ItemRegistry.hiveFrameClay);
- private static ItemStack hiveFrameNova = UtilsItems.getSimpleStack(FR_ItemRegistry.hiveFrameNova);
+ private static ItemStack hiveFrameCocoa = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameCocoa);
+ private static ItemStack hiveFrameCaged = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameCaged);
+ private static ItemStack hiveFrameSoul = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameSoul);
+ private static ItemStack hiveFrameClay = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameClay);
+ private static ItemStack hiveFrameNova = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameNova);
- private static ItemStack hiveFrameImpregnated = UtilsItems.getItemStack("Forestry:frameImpregnated", 1);
+ private static ItemStack hiveFrameImpregnated = ItemUtils.getItemStack("Forestry:frameImpregnated", 1);
private static ItemStack blockSoulSand = new ItemStack(Blocks.soul_sand, 1);
private static ItemStack blockIronBars = new ItemStack (Blocks.iron_bars, 1);
private static ItemStack itemClayDust = new ItemStack(Items.clay_ball, 1);
@@ -36,13 +36,13 @@ public class FR_Gregtech_Recipes {
public static void registerItems(){
//Magic Bee Like Frames
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
rod_LongElectrumFlux, rod_ElectrumFlux, rod_LongElectrumFlux,
rod_LongElectrumFlux, foil_Electrum, rod_LongElectrumFlux,
rod_ElectrumFlux, rod_ElectrumFlux, rod_ElectrumFlux,
hiveFrameAccelerated);
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
rod_LongUranium, rod_Uranium, rod_LongUranium,
rod_LongUranium, foil_Uranium235, rod_LongUranium,
rod_Uranium, rod_Uranium, rod_Uranium,
@@ -50,25 +50,25 @@ public class FR_Gregtech_Recipes {
if (!LoadedMods.ExtraBees){
//Extra Bee Like Frames
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
null, itemCocoaBeans, null,
itemCocoaBeans, hiveFrameImpregnated, itemCocoaBeans,
null, itemCocoaBeans, null,
hiveFrameCocoa);
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
hiveFrameImpregnated, blockIronBars, null,
null, null, null,
null, null, null,
hiveFrameCaged);
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
hiveFrameImpregnated, blockSoulSand, null,
null, null, null,
null, null, null,
hiveFrameSoul);
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
null, itemClayDust, null,
itemClayDust, hiveFrameImpregnated, itemClayDust,
null, itemClayDust, null,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index b30b0144bc..4ed8c6caae 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -7,7 +7,7 @@ import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.fluid.FluidUtils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import net.minecraftforge.fluids.FluidStack;
@@ -69,7 +69,7 @@ public class GregtechFluidHandler {
//Check for IHL Hydrogen Chloride
- if (!LoadedMods.IHL || UtilsItems.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 1) == null){
+ if (!LoadedMods.IHL || ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 1) == null){
if (FluidUtils.getFluidStack("hydrogenchloride", 1) == null){
if (LoadedMods.IHL){
Utils.LOG_INFO("IHL Loaded but hydrogen chloride could not be found for some reason. How about we add our own.");
@@ -101,11 +101,11 @@ public class GregtechFluidHandler {
//Chemical Bath Recipes
GT_Values.RA.addChemicalRecipe(
- UtilsItems.getItemStackOfAmountFromOreDict("dustApatite", 16),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustApatite", 16),
null,
FluidUtils.getFluidStack("sulfuricacid", 144*32),
FluidUtils.getFluidStack("sulfuricapatite", 144*4),
- UtilsItems.getItemStackOfAmountFromOreDict("dustSmallSulfur", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSulfur", 1),
20*20);
/*GT_Values.RA.addChemicalRecipe(
@@ -117,8 +117,8 @@ public class GregtechFluidHandler {
20*20);*/
GT_Values.RA.addChemicalRecipe(
- UtilsItems.getItemStackOfAmountFromOreDict("cellOxygen", 1),
- UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 16),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithium", 16),
FluidUtils.getFluidStack("water", 1000),
FluidUtils.getFluidStack("lithiumhydroxide", 144*4),
null,
@@ -132,9 +132,9 @@ public class GregtechFluidHandler {
//Mixer Recipes
- GT_Values.RA.addMixerRecipe(UtilsItems.getItemStackOfAmountFromOreDict("dustSulfur", 1), null, null, null, FluidUtils.getFluidStack("oxygen", 288), FluidUtils.getFluidStack("sulfurdioxide", 432), null, 600, 60);
- GT_Values.RA.addMixerRecipe(UtilsItems.getItemStackOfAmountFromOreDict("dustUranium235", 1), UtilsItems.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null, FluidUtils.getFluidStack("hydrofluoricacid", 2000), FluidUtils.getFluidStack("uraniumtetrafluoride", 288), null, 3000, 500);
- GT_Values.RA.addMixerRecipe(UtilsItems.getItemStackOfAmountFromOreDict("cellFluorine", 1), UtilsItems.getItemStackOfAmountFromOreDict("cellFluorine", 1), null, null, FluidUtils.getFluidStack("uraniumtetrafluoride", 720), FluidUtils.getFluidStack("uraniumhexafluoride", 288), null, 5000, 2000);
+ GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), null, null, null, FluidUtils.getFluidStack("oxygen", 288), FluidUtils.getFluidStack("sulfurdioxide", 432), null, 600, 60);
+ GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null, FluidUtils.getFluidStack("hydrofluoricacid", 2000), FluidUtils.getFluidStack("uraniumtetrafluoride", 288), null, 3000, 500);
+ GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), null, null, FluidUtils.getFluidStack("uraniumtetrafluoride", 720), FluidUtils.getFluidStack("uraniumhexafluoride", 288), null, 5000, 2000);
@@ -177,7 +177,7 @@ public class GregtechFluidHandler {
GT_Values.RA.addDistillationTowerRecipe(
FluidUtils.getFluidStack("sulfurdioxide", 144*3),
sulfurdioxideOutput,
- UtilsItems.getItemStackOfAmountFromOreDict("dustSulfur", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1),
5*20,
30);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
index db984d18b8..202647913c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
@@ -13,7 +13,7 @@ import gregtech.api.util.Recipe_GT;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
import java.util.ArrayList;
@@ -34,7 +34,7 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
public static int sDurationMultiplier = 3215;
public static boolean sRequiresUUA = false;
private int recipeCounter = 0;
- private static Block IC2Glass = Block.getBlockFromItem(UtilsItems.getItem("IC2:blockAlloyGlass"));
+ private static Block IC2Glass = Block.getBlockFromItem(ItemUtils.getItem("IC2:blockAlloyGlass"));
//public FluidStack mFluidOut = Materials.UUMatter.getFluid(1L);
public GregtechMTE_NuclearReactor(int aID, String aName, String aNameRegional) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java
index 9bd6bdb2a6..f474effec5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java
@@ -16,7 +16,7 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.fluid.FluidUtils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.gui.GUI_MatterFab;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlocks;
@@ -39,7 +39,7 @@ public class GregtechMetaTileEntity_MassFabricator extends GT_MetaTileEntity_Mul
public static boolean sRequiresUUA = false;
private int mAmplifierUsed = 0;
private int mMatterProduced = 0;
- private static Block IC2Glass = Block.getBlockFromItem(UtilsItems.getItem("IC2:blockAlloyGlass"));
+ private static Block IC2Glass = Block.getBlockFromItem(ItemUtils.getItem("IC2:blockAlloyGlass"));
FluidStack tempFake = FluidUtils.getFluidStack("uuamplifier", 1);
GT_Recipe fakeRecipe;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java
index fe27c09fef..b34aead51e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java
@@ -7,7 +7,7 @@ import gregtech.api.enums.ToolDictNames;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
@@ -56,7 +56,7 @@ public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrato
ItemStack hammerhead = GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L);
if (null != plate && null != ingot && null != hammerhead && null != longrod && null != screw){
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
hammerhead, ToolDictNames.craftingToolScrewdriver.name(), plate,
ingot, plate, plate,
longrod, screw, null,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index 875375cc12..4c5606b125 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -6,8 +6,10 @@ import gregtech.api.enums.SubTag;
import gregtech.api.objects.MaterialStack;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import net.minecraft.item.ItemStack;
public class RecipeGen_BlastSmelter {
@@ -18,10 +20,13 @@ public class RecipeGen_BlastSmelter {
for (Materials M : GregMaterials){
- if (!M.equals(Materials.Osmiridium)){
+ if (M.equals(Materials.Iridium) || M.equals(Materials.Osmium) || M.equals(Materials.Osmiridium)
+ /*|| !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
+ || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
+ || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
+ || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)*/
+ ){
- }
- else {
//Add a Blast Smelting Recipe, Let's go!
ItemStack tStack;
@@ -33,26 +38,26 @@ public class RecipeGen_BlastSmelter {
short counter=0;
int inputStackCount=0;
int fluidAmount=0;
- boolean doTest = false;
+ boolean doTest = true;
//This Bad boy here is what dictates unique recipes. Fuck life, right?
- ItemStack circuitGT = UtilsItems.getGregtechCircuit(0);
+ ItemStack circuitGT = ItemUtils.getGregtechCircuit(0);
//Set a duration
int duration = 0;
- if (M.mBlastFurnaceTemp > 100){
- duration = (int) Math.max(M.getMass() / 30L, 1L) * M.mBlastFurnaceTemp;
+ if (M.mBlastFurnaceTemp > 150){
+ duration = (int) Math.max(M.getMass() / 50L, 1L) * M.mBlastFurnaceTemp;
}
else {
- duration = (int) Math.max(M.getMass() / 30L, 1L) * 200;
+ duration = (int) Math.max(M.getMass() / 50L, 1L) * 150;
}
//Make a simple one Material Materialstack[] and log it for validity.
tMaterial = new MaterialStack[]{new MaterialStack(M, 1)};
- circuitGT = UtilsItems.getGregtechCircuit(1);
- ItemStack[] tItemStackTest = new ItemStack[]{circuitGT, UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dust"+M, 1)};
+ circuitGT = ItemUtils.getGregtechCircuit(1);
+ ItemStack[] tItemStackTest = new ItemStack[]{circuitGT, ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+M, 1)};
inputStackCount = 1;
fluidAmount = 144*inputStackCount;
Utils.LOG_INFO("Adding an Alloy Blast Smelter Recipe for "+M+". Gives "+fluidAmount+"L of molten metal.");
@@ -64,10 +69,10 @@ public class RecipeGen_BlastSmelter {
//Generate Recipes for all singular materials that can be made molten.
if (M.mBlastFurnaceRequired) {
- doTest = CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100, duration, 240);
+ //doTest = CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100, duration, 240);
}
else {
- doTest = CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100, duration/2, 120);
+ //doTest = CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100, duration/2, 120);
}
if (doTest){
@@ -84,7 +89,7 @@ public class RecipeGen_BlastSmelter {
//If this Material has some kind of compound list, proceed
if (mMaterialListSize > 1){
MaterialStack[] tempStack = new MaterialStack[mMaterialListSize];
- circuitGT = UtilsItems.getGregtechCircuit(mMaterialListSize);
+ circuitGT = ItemUtils.getGregtechCircuit(mMaterialListSize);
//Just double checking
if (tempStack.length > 1){
@@ -102,7 +107,7 @@ public class RecipeGen_BlastSmelter {
for (MaterialStack aOutputPart : tempStack){
if (aOutputPart != null){
Utils.LOG_INFO("Finding dust: "+aOutputPart.mMaterial);
- ItemStack rStack = UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dust"+aOutputPart.mMaterial, (int) aOutputPart.mAmount);
+ ItemStack rStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+aOutputPart.mMaterial, (int) aOutputPart.mAmount);
if (rStack != null){
Utils.LOG_INFO("Found dust: "+aOutputPart.mMaterial);
components[counter] = rStack;
@@ -112,20 +117,28 @@ public class RecipeGen_BlastSmelter {
counter++;
}
- ItemStack[] components_NoCircuit = components;
-
- //Builds me an ItemStack[] of the materials. - With a circuit
- components = new ItemStack[components_NoCircuit.length+1];
- for (int fr=0;fr<components.length;fr++){
- if (fr==0){
- components[0] = circuitGT;
+ if (mMaterialListSize > 0 && mMaterialListSize < 9){
+ ItemStack[] components_NoCircuit = components;
+ //Builds me an ItemStack[] of the materials. - With a circuit
+ components = new ItemStack[components_NoCircuit.length+1];
+ for (int fr=0;fr<components.length;fr++){
+ if (fr==0){
+ components[0] = circuitGT;
+ }
+ else {
+ components[fr] = components_NoCircuit[fr-1];
+ }
}
- else {
- components[fr] = components_NoCircuit[fr-1];
- }
}
+ //Add a shapeless recipe for each dust this way - Compat mode.
+ ItemStack outputStack = tStack;
+ outputStack.stackSize = mMaterialListSize;
+ RecipeUtils.buildShapelessRecipe(outputStack, components);
+
+
+
//Set Fluid output
fluidAmount = 144*inputStackCount;
@@ -137,10 +150,10 @@ public class RecipeGen_BlastSmelter {
Utils.LOG_INFO("tMaterial["+das+"]: "+components[das].getDisplayName()+" Meta: "+components[das].getItemDamage()+", Amount: "+components[das].stackSize);
}
if (M.mBlastFurnaceRequired) {
- CORE.RA.addBlastSmelterRecipe(components, M.getMolten(fluidAmount), 100, duration, 500);
+ //CORE.RA.addBlastSmelterRecipe(components, M.getMolten(fluidAmount), 100, duration, 500);
}
else {
- CORE.RA.addBlastSmelterRecipe(components, M.getMolten(fluidAmount), 100, duration, 240);
+ //CORE.RA.addBlastSmelterRecipe(components, M.getMolten(fluidAmount), 100, duration, 240);
}
}
}
@@ -148,6 +161,120 @@ public class RecipeGen_BlastSmelter {
}
}
}
+ }
+
+
+ public static void generateARecipe(Material M){
+
+ //Add a Blast Smelting Recipe, Let's go!
+ ItemStack tStack;
+ if (null != (tStack = M.getDust(1))) {
+
+ //Prepare some Variables
+ ItemStack[] components;
+ gtPlusPlus.core.material.MaterialStack[] tMaterial;
+ short counter=0;
+ int inputStackCount=0;
+ int fluidAmount=0;
+ boolean doTest = true;
+ tMaterial = M.getComposites();
+
+ //This Bad boy here is what dictates unique recipes. Fuck life, right?
+ ItemStack circuitGT = ItemUtils.getGregtechCircuit(0);
+
+
+ //Set a duration
+ int duration = 0;
+ if (M.getMeltingPoint_K() > 150){
+ duration = (int) Math.max(M.getMass() / 50L, 1L) * M.getMeltingPoint_K();
+ }
+ else {
+ duration = (int) Math.max(M.getMass() / 50L, 1L) * 150;
+ }
+
+
+ //Make a simple one Material Materialstack[] and log it for validity.
+ circuitGT = ItemUtils.getGregtechCircuit(1);
+ ItemStack[] tItemStackTest = new ItemStack[]{/*circuitGT,*/ tStack};
+ inputStackCount = 1;
+ fluidAmount = 144*inputStackCount;
+ Utils.LOG_INFO("Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+". Gives "+fluidAmount+"L of molten metal.");
+ for (int das=0;das<tItemStackTest.length;das++){
+ if (tItemStackTest[das] != null)
+ Utils.LOG_INFO("tMaterial["+das+"]: "+tItemStackTest[das].getDisplayName()+" Meta: "+tItemStackTest[das].getItemDamage()+", Amount: "+tItemStackTest[das].stackSize);
+ }
+
+ //Generate Recipes for all singular materials that can be made molten.
+ if (M.requiresBlastFurnace()) {
+ CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100, duration, 240);
+ }
+ else {
+ CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100, duration/2, 120);
+ }
+
+ if (tMaterial != null){
+ //Reset the Variables for compounds if last recipe was a success.
+ inputStackCount=0;
+ counter=0;
+
+
+ int mMaterialListSize=0;
+ for (gtPlusPlus.core.material.MaterialStack ternkfsdf:M.getComposites()){
+ mMaterialListSize++;
+ }
+ Utils.LOG_INFO("Size: "+mMaterialListSize);
+ //If this Material has some kind of compound list, proceed
+ if (mMaterialListSize > 1){
+ gtPlusPlus.core.material.MaterialStack[] tempStack = new gtPlusPlus.core.material.MaterialStack[mMaterialListSize];
+ circuitGT = ItemUtils.getGregtechCircuit(mMaterialListSize);
+ //Just double checking
+ if (tempStack.length > 1){
+
+ //Builds me a MaterialStack[] from the MaterialList of M.
+ int ooo=0;
+ for (gtPlusPlus.core.material.MaterialStack xMaterial : M.getComposites()){
+ if (xMaterial != null){
+ Utils.LOG_INFO("FOUND: "+xMaterial.getStackMaterial().getLocalizedName());
+ Utils.LOG_INFO("ADDING: "+xMaterial.getStackMaterial().getLocalizedName());
+ tempStack[ooo] = xMaterial;
+ }
+ ooo++;
+ }
+
+ //Builds me an ItemStack[] of the materials. - Without a circuit - this gets a good count for the 144L fluid multiplier
+ components = new ItemStack[9];
+ inputStackCount=0;
+ for (int irc=0;irc<M.getComposites().length;irc++){
+ if (M.getComposites()[irc] != null){
+ int r = (int) M.vSmallestRatio[irc];
+ inputStackCount = inputStackCount+r;
+ components[irc] = M.getComposites()[irc].getDustStack(r);
+ }
+ }
+
+ //Set Fluid output
+ fluidAmount = 144*inputStackCount;
+
+
+ Utils.LOG_INFO("Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+" using it's compound dusts. This material has "+ inputStackCount+" parts. Gives "+fluidAmount+"L of molten metal.");
+ Utils.LOG_INFO("tMaterial.length: "+components.length+".");
+ for (int das=0;das<components.length;das++){
+ if (components[das] != null)
+ Utils.LOG_INFO("tMaterial["+das+"]: "+components[das].getDisplayName()+" Meta: "+components[das].getItemDamage()+", Amount: "+components[das].stackSize);
+ }
+ if (M.requiresBlastFurnace()) {
+ CORE.RA.addBlastSmelterRecipe(components, M.getMolten(fluidAmount), 100, duration, 500);
+ }
+ else {
+ CORE.RA.addBlastSmelterRecipe(components, M.getMolten(fluidAmount), 100, duration, 240);
+ }
+ }
+ }
+ }
+ else {
+ Utils.LOG_INFO("doTest: "+doTest+" | tMaterial != null: "+(tMaterial != null));
+ }
+ }
}
@@ -157,7 +284,7 @@ public class RecipeGen_BlastSmelter {
short counter=0;
for (MaterialStack aOutputPart : aInput){
if (aOutputPart != null && components[counter] != null){
- ItemStack aStack = UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dust"+aOutputPart.mMaterial, (int) aOutputPart.mAmount);
+ ItemStack aStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+aOutputPart.mMaterial, (int) aOutputPart.mAmount);
components[counter] = aStack;
}
counter++;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index 6a499a640e..2d4038c74f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -3,8 +3,8 @@ package gtPlusPlus.xmod.gregtech.loaders;
import gregtech.api.enums.GT_Values;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import net.minecraft.item.ItemStack;
public class RecipeGen_DustGeneration {
@@ -15,7 +15,7 @@ public class RecipeGen_DustGeneration {
Utils.LOG_INFO("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO
//Ring Recipe
- if (UtilsRecipe.addShapedGregtechRecipe(
+ if (RecipeUtils.addShapedGregtechRecipe(
"craftingToolWrench", null, null,
null, material.getRod(1), null,
null, null, null,
@@ -34,7 +34,7 @@ public class RecipeGen_DustGeneration {
ItemStack[] inputStacks = material.getMaterialComposites();
ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing);
- if (UtilsRecipe.recipeBuilder(
+ if (RecipeUtils.recipeBuilder(
tinyDust, tinyDust, tinyDust,
tinyDust, tinyDust, tinyDust,
tinyDust, tinyDust, tinyDust,
@@ -45,7 +45,7 @@ public class RecipeGen_DustGeneration {
Utils.LOG_INFO("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
}
- if (UtilsRecipe.recipeBuilder(
+ if (RecipeUtils.recipeBuilder(
normalDust, null, null,
null, null, null,
null, null, null,
@@ -57,7 +57,7 @@ public class RecipeGen_DustGeneration {
}
- if (UtilsRecipe.recipeBuilder(
+ if (RecipeUtils.recipeBuilder(
smallDust, smallDust, null,
smallDust, smallDust, null,
null, null, null,
@@ -69,7 +69,7 @@ public class RecipeGen_DustGeneration {
}
- if (UtilsRecipe.recipeBuilder(
+ if (RecipeUtils.recipeBuilder(
null, normalDust, null,
null, null, null,
null, null, null,
@@ -82,14 +82,14 @@ public class RecipeGen_DustGeneration {
if (inputStacks.length > 0){
- Utils.LOG_INFO(UtilsItems.getArrayStackNames(inputStacks));
+ Utils.LOG_INFO(ItemUtils.getArrayStackNames(inputStacks));
long[] inputStackSize = material.vSmallestRatio;
if (inputStackSize != null){
for (short x=0;x<inputStacks.length;x++){
if (inputStacks[x] != null && inputStackSize[x] != 0)
inputStacks[x].stackSize = (int) inputStackSize[x];
}
- Utils.LOG_INFO(UtilsItems.getArrayStackNames(inputStacks));
+ Utils.LOG_INFO(ItemUtils.getArrayStackNames(inputStacks));
if (GT_Values.RA.addMixerRecipe(
inputStacks[0], inputStacks[1],
inputStacks[2], inputStacks[3],
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
index d62e472b0d..804d226f67 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
@@ -3,25 +3,25 @@ package gtPlusPlus.xmod.gregtech.loaders;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import net.minecraft.item.ItemStack;
public class RecipeGen_ShapedCrafting {
public static void generateRecipes(Material material){
Utils.LOG_INFO("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO
-
+
//Plates
-
+
//Single Plate Shaped/Shapeless
GT_ModHandler.addCraftingRecipe(
material.getPlate(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
new Object[]{"h", "B", "I",
- Character.valueOf('I'),
- material.getIngot(1),
- Character.valueOf('B'),
- material.getIngot(1)});
+ Character.valueOf('I'),
+ material.getIngot(1),
+ Character.valueOf('B'),
+ material.getIngot(1)});
GT_ModHandler.addShapelessCraftingRecipe(
material.getPlate(1),
@@ -34,20 +34,20 @@ public class RecipeGen_ShapedCrafting {
material.getPlateDouble(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
new Object[]{"I", "B", "h",
- Character.valueOf('I'),
- material.getPlate(1),
- Character.valueOf('B'),
- material.getPlate(1)});
-
+ Character.valueOf('I'),
+ material.getPlate(1),
+ Character.valueOf('B'),
+ material.getPlate(1)});
+
GT_ModHandler.addShapelessCraftingRecipe(
material.getPlateDouble(1),
new Object[]{gregtech.api.enums.ToolDictNames.craftingToolForgeHammer,
material.getPlate(1),
material.getPlate(1)});
-
+
//Ring Recipe
if (!material.isRadioactive){
- if (UtilsRecipe.recipeBuilder(
+ if (RecipeUtils.recipeBuilder(
"craftingToolHardHammer", null, null,
null, material.getRod(1), null,
null, null, null,
@@ -59,10 +59,11 @@ public class RecipeGen_ShapedCrafting {
}
}
+
//Framebox Recipe
if (!material.isRadioactive){
ItemStack stackStick = material.getRod(1);
- if (UtilsRecipe.recipeBuilder(
+ if (RecipeUtils.recipeBuilder(
stackStick, stackStick, stackStick,
stackStick, "craftingToolWrench", stackStick,
stackStick, stackStick, stackStick,
@@ -74,9 +75,32 @@ public class RecipeGen_ShapedCrafting {
}
}
+
+ //Add a shapeless recipe for each dust this way - Compat mode.
+ ItemStack[] shapelessInput = new ItemStack[material.getMaterialComposites().length];
+ int arrayLocation=0;
+ if (shapelessInput.length > 1){
+ for (ItemStack I : material.getMaterialComposites()){
+ if (I != null && material.vSmallestRatio != null){
+ shapelessInput[arrayLocation] = I;
+ shapelessInput[arrayLocation].stackSize = (int) material.vSmallestRatio[arrayLocation];
+ }
+ }
+ if (RecipeUtils.buildShapelessRecipe(
+ material.getDust(material.smallestStackSizeWhenProcessing),
+ shapelessInput
+ )){
+ Utils.LOG_INFO("Shapeless Recipe: "+material.getLocalizedName()+" - Success");
+ }
+ else {
+ Utils.LOG_INFO("Shapeless Recipe: "+material.getLocalizedName()+" - Failed");
+ }
+ }
+
+
//Shaped Recipe - Bolts
if (!material.isRadioactive){
- if (UtilsRecipe.recipeBuilder(
+ if (RecipeUtils.recipeBuilder(
"craftingToolSaw", null, null,
null, material.getRod(1), null,
null, null, null,
@@ -90,7 +114,7 @@ public class RecipeGen_ShapedCrafting {
//Shaped Recipe - Ingot to Rod
- if (UtilsRecipe.recipeBuilder(
+ if (RecipeUtils.recipeBuilder(
"craftingToolFile", null, null,
null, material.getIngot(1), null,
null, null, null,
@@ -103,7 +127,7 @@ public class RecipeGen_ShapedCrafting {
//Shaped Recipe - Long Rod to two smalls
- if (UtilsRecipe.recipeBuilder(
+ if (RecipeUtils.recipeBuilder(
"craftingToolSaw", null, null,
material.getLongRod(1), null, null,
null, null, null,
@@ -115,7 +139,7 @@ public class RecipeGen_ShapedCrafting {
}
//Two small to long rod
- if (UtilsRecipe.recipeBuilder(
+ if (RecipeUtils.recipeBuilder(
material.getRod(1), "craftingToolHardHammer", material.getRod(1),
null, null, null,
null, null, null,
@@ -128,7 +152,7 @@ public class RecipeGen_ShapedCrafting {
//Rotor Recipe
if (!material.isRadioactive){
- if (UtilsRecipe.recipeBuilder(
+ if (RecipeUtils.recipeBuilder(
material.getPlate(1), "craftingToolHardHammer", material.getPlate(1),
material.getScrew(1), material.getRing(1), "craftingToolFile",
material.getPlate(1), "craftingToolScrewdriver", material.getPlate(1),
@@ -142,7 +166,7 @@ public class RecipeGen_ShapedCrafting {
//Screws
if (!material.isRadioactive){
- if (UtilsRecipe.recipeBuilder(
+ if (RecipeUtils.recipeBuilder(
"craftingToolFile", material.getBolt(1), null,
material.getBolt(1), null, null,
null, null, null,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 428042501d..b2e5c7ca09 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -4,7 +4,7 @@ import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
import gregtech.api.util.Recipe_GT;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
import gtPlusPlus.xmod.gregtech.recipes.machines.RECIPEHANDLER_CokeOven;
import gtPlusPlus.xmod.gregtech.recipes.machines.RECIPEHANDLER_MatterFabricator;
@@ -204,7 +204,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
return false;
}
if (aOutputItems != null){
- Utils.LOG_INFO("Recipe will output: "+UtilsItems.getArrayStackNames(aOutputItems));
+ Utils.LOG_INFO("Recipe will output: "+ItemUtils.getArrayStackNames(aOutputItems));
}
if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) {
return false;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java
index ea30cc1e6f..0a5094412f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java
@@ -1,7 +1,7 @@
package gtPlusPlus.xmod.gregtech.recipes.machines;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
@@ -72,7 +72,7 @@ public class RECIPEHANDLER_Dehydrator {
outputFluidName = "null";
}
- Utils.LOG_INFO("Successfully added a Chemical Dehydrator recipe for: "+UtilsItems.getArrayStackNames(aOutput)+" & "+outputFluidName+", Using "+inputAname+" & "+inputBname+" & liquid "+inputFluidname+". This takes "+(aDuration/20)+" seconds for "+aEUt+"eu/t.");
+ Utils.LOG_INFO("Successfully added a Chemical Dehydrator recipe for: "+ItemUtils.getArrayStackNames(aOutput)+" & "+outputFluidName+", Using "+inputAname+" & "+inputBname+" & liquid "+inputFluidname+". This takes "+(aDuration/20)+" seconds for "+aEUt+"eu/t.");
Utils.LOG_WARNING("==================================================================================");
Utils.LOG_WARNING("==================================================================================");
Utils.LOG_WARNING("==================================================================================");
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index 7834d4dc9d..791d7b5ea4 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -13,8 +13,8 @@ import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntityFluid;
@@ -241,15 +241,15 @@ public class GregtechConduits {
Utils.LOG_INFO("Generating "+output+" pipes & respective recipes.");
- ItemStack pipeIngot = UtilsItems.getItemStackOfAmountFromOreDict("ingot"+output, 1).copy();
- ItemStack pipePlate = UtilsItems.getItemStackOfAmountFromOreDict("plate"+output, 1).copy();
+ ItemStack pipeIngot = ItemUtils.getItemStackOfAmountFromOreDict("ingot"+output, 1).copy();
+ ItemStack pipePlate = ItemUtils.getItemStackOfAmountFromOreDict("plate"+output, 1).copy();
//Check all pipes are not null
- Utils.LOG_INFO("Generated pipeTiny from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 1) != null) ? true : false));
- Utils.LOG_INFO("Generated pipeSmall from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1) != null) ? true : false));
- Utils.LOG_INFO("Generated pipeNormal from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1) != null) ? true : false));
- Utils.LOG_INFO("Generated pipeLarge from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1) != null) ? true : false));
- Utils.LOG_INFO("Generated pipeHuge from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1) != null) ? true : false));
+ Utils.LOG_INFO("Generated pipeTiny from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 1) != null) ? true : false));
+ Utils.LOG_INFO("Generated pipeSmall from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1) != null) ? true : false));
+ Utils.LOG_INFO("Generated pipeNormal from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1) != null) ? true : false));
+ Utils.LOG_INFO("Generated pipeLarge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1) != null) ? true : false));
+ Utils.LOG_INFO("Generated pipeHuge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1) != null) ? true : false));
int eut = 128;
int time = 0;
@@ -260,62 +260,62 @@ public class GregtechConduits {
//Add the Three Shaped Recipes First
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
pipePlate, "craftingToolWrench", pipePlate,
pipePlate, null, pipePlate,
pipePlate, "craftingToolHardHammer", pipePlate,
- UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 6));
+ ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 6));
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
pipePlate, pipePlate, pipePlate,
"craftingToolWrench", null, "craftingToolHardHammer",
pipePlate, pipePlate, pipePlate,
- UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 2));
+ ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 2));
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
pipePlate, "craftingToolHardHammer", pipePlate,
pipePlate, null, pipePlate,
pipePlate, "craftingToolWrench", pipePlate,
- UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1));
+ ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1));
GT_Values.RA.addExtruderRecipe(
- UtilsItems.getSimpleStack(pipeIngot, 1),
+ ItemUtils.getSimpleStack(pipeIngot, 1),
ItemList.Shape_Extruder_Pipe_Tiny.get(0),
- UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 2),
time, eut);
GT_Values.RA.addExtruderRecipe(
- UtilsItems.getSimpleStack(pipeIngot, 1),
+ ItemUtils.getSimpleStack(pipeIngot, 1),
ItemList.Shape_Extruder_Pipe_Small.get(0),
- UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1),
time+=bonusMulti, eut);
GT_Values.RA.addExtruderRecipe(
- UtilsItems.getSimpleStack(pipeIngot, 3),
+ ItemUtils.getSimpleStack(pipeIngot, 3),
ItemList.Shape_Extruder_Pipe_Medium.get(0),
- UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1),
time+=bonusMulti, eut);
GT_Values.RA.addExtruderRecipe(
- UtilsItems.getSimpleStack(pipeIngot, 6),
+ ItemUtils.getSimpleStack(pipeIngot, 6),
ItemList.Shape_Extruder_Pipe_Large.get(0),
- UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1),
time+=bonusMulti, eut);
GT_Values.RA.addExtruderRecipe(
- UtilsItems.getSimpleStack(pipeIngot, 12),
+ ItemUtils.getSimpleStack(pipeIngot, 12),
ItemList.Shape_Extruder_Pipe_Huge.get(0),
- UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1),
time+=bonusMulti, eut);
if (eut < 512 && !output.equals("Void")){
- ItemStack pipePlateDouble = UtilsItems.getItemStackOfAmountFromOreDict("plateDouble"+output, 1).copy();
+ ItemStack pipePlateDouble = ItemUtils.getItemStackOfAmountFromOreDict("plateDouble"+output, 1).copy();
if (pipePlateDouble != null)
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
pipePlateDouble, "craftingToolHardHammer", pipePlateDouble,
pipePlateDouble, null, pipePlateDouble,
pipePlateDouble, "craftingToolWrench", pipePlateDouble,
- UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1));
+ ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1));
else
Utils.LOG_INFO("Failed to add a recipe for "+materialName+" Huge pipes. Double plates probably do not exist.");
}
@@ -330,6 +330,6 @@ public class GregtechConduits {
returnValue.stackSize = amount;
return returnValue;
}
- return UtilsItems.getSimpleStack(ModItems.AAA_Broken, amount);
+ return ItemUtils.getSimpleStack(ModItems.AAA_Broken, amount);
}
}
diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
index 64eee08fd4..7f62c7fe53 100644
--- a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
+++ b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
@@ -5,7 +5,7 @@ import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.fluid.FluidUtils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.item.ItemStack;
public class FishTrapHandler {
@@ -48,21 +48,21 @@ public class FishTrapHandler {
for (int i = 0; i < harvestcraftFish.length; i++){
String itemName = prefix+harvestcraftFish[i]+suffix;
int lootChance = getLootChance(harvestcraftFish[i]);
- if (UtilsItems.getItemStackOfAmountFromOreDictNoBroken(itemName, 1) != null){
- addFish("fish", UtilsItems.getItemStackOfAmountFromOreDict(itemName, 1), lootChance);
- addGregtechMaceratorRecipe(UtilsItems.getItemStackOfAmountFromOreDict(itemName, 1));
- addGregtechCentrifugeRecipe(UtilsItems.getItemStackOfAmountFromOreDict(itemName, 1));
- addGregtechFluidRecipe(UtilsItems.getItemStackOfAmountFromOreDict(itemName, 1));
+ if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(itemName, 1) != null){
+ addFish("fish", ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1), lootChance);
+ addGregtechMaceratorRecipe(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1));
+ addGregtechCentrifugeRecipe(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1));
+ addGregtechFluidRecipe(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1));
}
}
- if (UtilsItems.getItemStackOfAmountFromOreDictNoBroken(greenheartFish, 1) != null){
- addFish("fish", UtilsItems.getItemStackOfAmountFromOreDict(greenheartFish, 1), getLootChance(greenheartFish));
- addGregtechMaceratorRecipe(UtilsItems.getItemStackOfAmountFromOreDict(greenheartFish, 1));
- addGregtechCentrifugeRecipe(UtilsItems.getItemStackOfAmountFromOreDict(greenheartFish, 1));
- addGregtechFluidRecipe(UtilsItems.getItemStackOfAmountFromOreDict(greenheartFish, 1));
+ if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(greenheartFish, 1) != null){
+ addFish("fish", ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1), getLootChance(greenheartFish));
+ addGregtechMaceratorRecipe(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1));
+ addGregtechCentrifugeRecipe(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1));
+ addGregtechFluidRecipe(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1));
}
- if (UtilsItems.getItemStackOfAmountFromOreDictNoBroken(seaweed, 1) != null){
- addFish("junk", UtilsItems.getItemStackOfAmountFromOreDict(seaweed, 1), getLootChance(seaweed));
+ if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(seaweed, 1) != null){
+ addFish("junk", ItemUtils.getItemStackOfAmountFromOreDict(seaweed, 1), getLootChance(seaweed));
}
}
@@ -155,7 +155,7 @@ public class FishTrapHandler {
private static void addGregtechMaceratorRecipe(ItemStack input){
if (LoadedMods.Gregtech){
- GT_ModHandler.addPulverisationRecipe(input, UtilsItems.getItemStackOfAmountFromOreDict("dustMeatRaw", 1), UtilsItems.getItemStackOfAmountFromOreDict("dustTinyBone", 1), 0);
+ GT_ModHandler.addPulverisationRecipe(input, ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyBone", 1), 0);
}
}
diff --git a/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
index af648e73e2..6b95487773 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
@@ -9,8 +9,8 @@ import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.ic2.item.IC2_Items;
import net.minecraft.item.ItemStack;
@@ -32,20 +32,20 @@ public class RECIPE_IC2 {
public static String ingot_T3 = "ingotVibrantAlloy";
public static String ingot_T4 = "ingotIridium";
- private static ItemStack rotor_blade_T1 = UtilsItems.getSimpleStack(IC2_Items.rotor_Blade_Material_1.getItem());
- private static ItemStack rotor_blade_T2 = UtilsItems.getSimpleStack(IC2_Items.rotor_Blade_Material_2.getItem());
- private static ItemStack rotor_blade_T3 = UtilsItems.getSimpleStack(IC2_Items.rotor_Blade_Material_3.getItem());
- private static ItemStack rotor_blade_T4 = UtilsItems.getSimpleStack(IC2_Items.rotor_Blade_Material_4.getItem());
+ private static ItemStack rotor_blade_T1 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_1.getItem());
+ private static ItemStack rotor_blade_T2 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_2.getItem());
+ private static ItemStack rotor_blade_T3 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_3.getItem());
+ private static ItemStack rotor_blade_T4 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_4.getItem());
- private static ItemStack shaft_T1 = UtilsItems.getSimpleStack(IC2_Items.shaft_Material_1.getItem());
- private static ItemStack shaft_T2 = UtilsItems.getSimpleStack(IC2_Items.shaft_Material_2.getItem());
- private static ItemStack shaft_T3 = UtilsItems.getSimpleStack(IC2_Items.shaft_Material_3.getItem());
- private static ItemStack shaft_T4 = UtilsItems.getSimpleStack(IC2_Items.shaft_Material_4.getItem());
+ private static ItemStack shaft_T1 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_1.getItem());
+ private static ItemStack shaft_T2 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_2.getItem());
+ private static ItemStack shaft_T3 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_3.getItem());
+ private static ItemStack shaft_T4 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_4.getItem());
- private static ItemStack rotor_T1 = UtilsItems.getSimpleStack(IC2_Items.rotor_Material_1.getItem());
- private static ItemStack rotor_T2 = UtilsItems.getSimpleStack(IC2_Items.rotor_Material_2.getItem());
- private static ItemStack rotor_T3 = UtilsItems.getSimpleStack(IC2_Items.rotor_Material_3.getItem());
- private static ItemStack rotor_T4 = UtilsItems.getSimpleStack(IC2_Items.rotor_Material_4.getItem());
+ private static ItemStack rotor_T1 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_1.getItem());
+ private static ItemStack rotor_T2 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_2.getItem());
+ private static ItemStack rotor_T3 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_3.getItem());
+ private static ItemStack rotor_T4 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_4.getItem());
private static void checkForEnderIO(){
if(!LoadedMods.EnderIO){
@@ -69,25 +69,25 @@ public class RECIPE_IC2 {
public static void initRecipes(){
//Rotor Blade Recipes
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
plate_T1, ingot_T1, plate_T1,
plate_T1, ingot_T1, plate_T1,
plate_T1, ingot_T1, plate_T1,
rotor_blade_T1);
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
plate_T2, ingot_T2, plate_T2,
plate_T2, ingot_T2, plate_T2,
plate_T2, ingot_T2, plate_T2,
rotor_blade_T2);
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
plate_T3, ingot_T3, plate_T3,
plate_T3, ingot_T3, plate_T3,
plate_T3, ingot_T3, plate_T3,
rotor_blade_T3);
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
plate_T4, ingot_T4, plate_T4,
plate_T4, ingot_T4, plate_T4,
plate_T4, ingot_T4, plate_T4,
@@ -120,25 +120,25 @@ public class RECIPE_IC2 {
Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Iridium]");
//Rotor Recipes
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
null, rotor_blade_T1, null,
rotor_blade_T1, shaft_T1, rotor_blade_T1,
null, rotor_blade_T1, null,
rotor_T1);
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
null, rotor_blade_T2, null,
rotor_blade_T2, shaft_T2, rotor_blade_T2,
null, rotor_blade_T2, null,
rotor_T2);
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
null, rotor_blade_T3, null,
rotor_blade_T3, shaft_T3, rotor_blade_T3,
null, rotor_blade_T3, null,
rotor_T3);
- UtilsRecipe.recipeBuilder(
+ RecipeUtils.recipeBuilder(
null, rotor_blade_T4, null,
rotor_blade_T4, shaft_T4, rotor_blade_T4,
null, rotor_blade_T4, null,
diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
index 880bad71cc..4d89207817 100644
--- a/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
@@ -1,7 +1,7 @@
package gtPlusPlus.xmod.thermalfoundation.item;
import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.xmod.thermalfoundation.block.TF_Blocks;
import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
import net.minecraft.init.Items;
@@ -46,10 +46,10 @@ public class TF_Items {
FurnaceFuelHandler.registerFuel(dustPyrotheum, 2400);
- itemRodBlizz = UtilsItems.simpleMetaStack(itemMaterial, 1, 1);
- itemDustBlizz = UtilsItems.simpleMetaStack(itemMaterial, 2, 1);
- itemDustPyrotheum = UtilsItems.simpleMetaStack(itemMaterial, 3, 1);
- itemDustCryotheum = UtilsItems.simpleMetaStack(itemMaterial, 4, 1);
+ itemRodBlizz = ItemUtils.simpleMetaStack(itemMaterial, 1, 1);
+ itemDustBlizz = ItemUtils.simpleMetaStack(itemMaterial, 2, 1);
+ itemDustPyrotheum = ItemUtils.simpleMetaStack(itemMaterial, 3, 1);
+ itemDustCryotheum = ItemUtils.simpleMetaStack(itemMaterial, 4, 1);
diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
index 24096749f2..cab0741da2 100644
--- a/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
@@ -6,7 +6,7 @@ import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.xmod.thermalfoundation.item.TF_Items;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
@@ -24,7 +24,7 @@ public class TF_Gregtech_Recipes {
ItemStack dust_Cryotheum = TF_Items.itemDustCryotheum.copy();
ItemStack dust_Pyrotheum = TF_Items.itemDustPyrotheum.copy();
ItemStack dust_Blizz = TF_Items.itemDustBlizz.copy();
- ItemStack dust_Blizz3 = UtilsItems.simpleMetaStack(TF_Items.itemMaterial, 2, 3);
+ ItemStack dust_Blizz3 = ItemUtils.simpleMetaStack(TF_Items.itemMaterial, 2, 3);
ItemStack rod_Blizz = TF_Items.itemRodBlizz.copy();
FluidStack moltenRedstone = getFluidStack("molten.redstone", 250);
diff --git a/src/resources/assets/gregtech/textures/gui/basicmachines/BlastSmelter.png b/src/resources/assets/gregtech/textures/gui/basicmachines/BlastSmelter.png
new file mode 100644
index 0000000000..9495864a0f
--- /dev/null
+++ b/src/resources/assets/gregtech/textures/gui/basicmachines/BlastSmelter.png
Binary files differ