aboutsummaryrefslogtreecommitdiff
path: root/src/Java/miscutil/core/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/miscutil/core/util')
-rw-r--r--src/Java/miscutil/core/util/Utils.java29
-rw-r--r--src/Java/miscutil/core/util/UtilsItems.java31
2 files changed, 30 insertions, 30 deletions
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;
+ }
+
}