aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Java/miscutil/core/common/CommonProxy.java3
-rw-r--r--src/Java/miscutil/core/handler/registration/RECIPES_Machines.java22
-rw-r--r--src/Java/miscutil/core/handler/registration/RECIPES_Tools.java3
-rw-r--r--src/Java/miscutil/core/util/Utils.java29
-rw-r--r--src/Java/miscutil/core/util/UtilsItems.java31
5 files changed, 44 insertions, 44 deletions
diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java
index 0b1ebe0bfa..e0af693445 100644
--- a/src/Java/miscutil/core/common/CommonProxy.java
+++ b/src/Java/miscutil/core/common/CommonProxy.java
@@ -19,6 +19,7 @@ import miscutil.core.lib.CORE;
import miscutil.core.lib.LoadedMods;
import miscutil.core.tileentities.ModTileEntities;
import miscutil.core.util.Utils;
+import miscutil.core.util.UtilsItems;
import miscutil.gregtech.api.init.InitGregtech;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -123,7 +124,7 @@ public class CommonProxy {
for(int i=1; i<=10; i++){
- GT_OreDictUnificator.registerOre("bufferCore_"+CORE.VOLTAGES[i-1], new ItemStack(Utils.getItem("miscutils:item.itemBufferCore"+i)));
+ GT_OreDictUnificator.registerOre("bufferCore_"+CORE.VOLTAGES[i-1], new ItemStack(UtilsItems.getItem("miscutils:item.itemBufferCore"+i)));
}
diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
index d219cb8259..173892ce68 100644
--- a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
+++ b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
@@ -29,16 +29,16 @@ public class RECIPES_Machines {
//Buffer Cores
- static ItemStack RECIPE_BufferCore_ULV = Utils.getItemStack("miscutils:item.itemBufferCore1", 1);
- static ItemStack RECIPE_BufferCore_LV = Utils.getItemStack("miscutils:item.itemBufferCore2", 1);
- static ItemStack RECIPE_BufferCore_MV = Utils.getItemStack("miscutils:item.itemBufferCore3", 1);
- static ItemStack RECIPE_BufferCore_HV = Utils.getItemStack("miscutils:item.itemBufferCore4", 1);
- static ItemStack RECIPE_BufferCore_EV = Utils.getItemStack("miscutils:item.itemBufferCore5", 1);
- static ItemStack RECIPE_BufferCore_IV = Utils.getItemStack("miscutils:item.itemBufferCore6", 1);
- static ItemStack RECIPE_BufferCore_LuV = Utils.getItemStack("miscutils:item.itemBufferCore7", 1);
- static ItemStack RECIPE_BufferCore_ZPM = Utils.getItemStack("miscutils:item.itemBufferCore8", 1);
- static ItemStack RECIPE_BufferCore_UV = Utils.getItemStack("miscutils:item.itemBufferCore9", 1);
- static ItemStack RECIPE_BufferCore_MAX = Utils.getItemStack("miscutils:item.itemBufferCore10", 1);
+ 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);
//Wire
@@ -108,7 +108,7 @@ public class RECIPES_Machines {
//Lava Boiler
static ItemStack boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1);
- static ItemStack blockBricks = Utils.getItemStack("minecraft:brick_block", 1);
+ static ItemStack blockBricks = UtilsItems.getItemStack("minecraft:brick_block", 1);
//Batteries
static String batteryBasic = "batteryBasic";
diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Tools.java b/src/Java/miscutil/core/handler/registration/RECIPES_Tools.java
index 62479b23bd..3e9d36c0ab 100644
--- a/src/Java/miscutil/core/handler/registration/RECIPES_Tools.java
+++ b/src/Java/miscutil/core/handler/registration/RECIPES_Tools.java
@@ -2,7 +2,6 @@ package miscutil.core.handler.registration;
import miscutil.core.item.ModItems;
import miscutil.core.util.UtilsItems;
-import miscutil.core.util.Utils;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -20,7 +19,7 @@ public class RECIPES_Tools {
static ItemStack RECIPE_SandStone = new ItemStack(Blocks.sandstone, 2);
static ItemStack RECIPE_Sand = new ItemStack(Blocks.sand, 4);
- static ItemStack RECIPE_DivisionSigil = new ItemStack(Utils.getItem("ExtraUtilities:divisionSigil"));
+ static ItemStack RECIPE_DivisionSigil = new ItemStack(UtilsItems.getItem("ExtraUtilities:divisionSigil"));
//MC Items
static Item Apple = Items.apple;
diff --git a/src/Java/miscutil/core/util/Utils.java b/src/Java/miscutil/core/util/Utils.java
index a4b75d87d7..c79a69b791 100644
--- a/src/Java/miscutil/core/util/Utils.java
+++ b/src/Java/miscutil/core/util/Utils.java
@@ -8,15 +8,12 @@ import java.util.Random;
import miscutil.core.lib.CORE;
import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.registry.GameRegistry;
public class Utils {
@@ -133,31 +130,7 @@ public class Utils {
return FluidRegistry.getFluidStack("ic2steam", (int)aAmount);
}
- public static Item getItem(String fqrn) // fqrn = fully qualified resource name
- {
- String[] fqrnSplit = fqrn.split(":");
- return GameRegistry.findItem(fqrnSplit[0], fqrnSplit[1]);
- }
-
- public static ItemStack getItemStack(String fqrn, int Size) // fqrn = fully qualified resource name
- {
- String[] fqrnSplit = fqrn.split(":");
- return GameRegistry.findItemStack(fqrnSplit[0], fqrnSplit[1], Size);
- }
-
- public static Item getItemInPlayersHand(){
- Minecraft mc = Minecraft.getMinecraft();
- Item heldItem = null;
-
- try{heldItem = mc.thePlayer.getHeldItem().getItem();
- }catch(NullPointerException e){return null;}
-
- if (heldItem != null){
- return heldItem;
- }
-
- return null;
- }
+
/*public static void recipeBuilderBlock(ItemStack slot_1, ItemStack slot_2, ItemStack slot_3, ItemStack slot_4, ItemStack slot_5, ItemStack slot_6, ItemStack slot_7, ItemStack slot_8, ItemStack slot_9, Block resultBlock){
GameRegistry.addRecipe(new ItemStack(resultBlock),
diff --git a/src/Java/miscutil/core/util/UtilsItems.java b/src/Java/miscutil/core/util/UtilsItems.java
index 8d848fc914..48e1629ee3 100644
--- a/src/Java/miscutil/core/util/UtilsItems.java
+++ b/src/Java/miscutil/core/util/UtilsItems.java
@@ -5,6 +5,7 @@ import gregtech.api.util.GT_OreDictUnificator;
import java.util.ArrayList;
import miscutil.core.handler.registration.RegistrationHandler;
+import net.minecraft.client.Minecraft;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.ShapedOreRecipe;
@@ -17,7 +18,7 @@ public class UtilsItems {
try{
Item em = null;
- Item em1 = Utils.getItem(mod_itemname_meta);
+ Item em1 = UtilsItems.getItem(mod_itemname_meta);
Utils.LOG_WARNING("Found: "+em1.toString());
if (!em1.equals(null)){
em = em1;
@@ -43,7 +44,7 @@ public class UtilsItems {
public static void getItemForOreDict(String FQRN, String oreDictName, String itemName, int meta){
try {
Item em = null;
- Item em1 = Utils.getItem(FQRN);
+ Item em1 = UtilsItems.getItem(FQRN);
Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta);
if (em1 != null){
em = em1;
@@ -183,4 +184,30 @@ public class UtilsItems {
}
}
+ public static Item getItem(String fqrn) // fqrn = fully qualified resource name
+ {
+ String[] fqrnSplit = fqrn.split(":");
+ return GameRegistry.findItem(fqrnSplit[0], fqrnSplit[1]);
+ }
+
+ public static ItemStack getItemStack(String fqrn, int Size) // fqrn = fully qualified resource name
+ {
+ String[] fqrnSplit = fqrn.split(":");
+ return GameRegistry.findItemStack(fqrnSplit[0], fqrnSplit[1], Size);
+ }
+
+ public static Item getItemInPlayersHand(){
+ Minecraft mc = Minecraft.getMinecraft();
+ Item heldItem = null;
+
+ try{heldItem = mc.thePlayer.getHeldItem().getItem();
+ }catch(NullPointerException e){return null;}
+
+ if (heldItem != null){
+ return heldItem;
+ }
+
+ return null;
+ }
+
}
generated by cgit (git 2.46.0) at 2025-03-09 17:05:24 +0000