aboutsummaryrefslogtreecommitdiff
path: root/src/Java/miscutil/core/item
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/miscutil/core/item')
-rw-r--r--src/Java/miscutil/core/item/ModItems.java15
-rw-r--r--src/Java/miscutil/core/item/base/BaseItemGeneric.java19
2 files changed, 27 insertions, 7 deletions
diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java
index 49abc71cbc..e704ac0365 100644
--- a/src/Java/miscutil/core/item/ModItems.java
+++ b/src/Java/miscutil/core/item/ModItems.java
@@ -10,6 +10,7 @@ import miscutil.core.item.tool.staballoy.StaballoyPickaxe;
import miscutil.core.lib.CORE;
import miscutil.core.lib.LoadedMods;
import miscutil.core.util.Utils;
+import miscutil.core.util.debug.DEBUG_INIT;
import net.minecraft.item.Item;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraftforge.common.util.EnumHelper;
@@ -54,6 +55,8 @@ Gold Tool: 22*/
//public static ToolMaterial TUTORIAL = EnumHelper.addToolMaterial("TUTORIAL", harvestLevel, durability, miningSpeed, damageVsEntities, enchantability);
public static ToolMaterial STABALLOY = EnumHelper.addToolMaterial("Staballoy", 3, 2500, 7, 1.0F, 18);
+ public static Item itemDebugShapeSpawner;
+
//EnderIO
public static Item itemPlateSoularium;
public static Item itemPlateRedstoneAlloy;
@@ -97,6 +100,11 @@ Gold Tool: 22*/
public static Item item_PLEASE_FACTOR_ME_4;
//@SuppressWarnings("unused")
public static final void init(){
+
+ //Debug Loading
+ if (CORE.DEBUG){
+ DEBUG_INIT.registerItems();
+ }
//EnderIO Resources
if (LoadedMods.EnderIO || LOAD_ALL_CONTENT){
@@ -231,16 +239,17 @@ Gold Tool: 22*/
System.out.println("Buffer Core registration count is: "+i);
}
//Dev Items
- itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault");
+ itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemStickyRubber");
GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber");
//Battery Alloy For cheap Niggers
- itemIngotBatteryAlloy = new Item().setUnlocalizedName("itemIngotBatteryAlloy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault");
+ itemIngotBatteryAlloy = new Item().setUnlocalizedName("itemIngotBatteryAlloy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemIngotBatteryAlloy");
GameRegistry.registerItem(itemIngotBatteryAlloy, "itemIngotBatteryAlloy");
- itemPlateBatteryAlloy = new Item().setUnlocalizedName("itemPlateBatteryAlloy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault");
+ itemPlateBatteryAlloy = new Item().setUnlocalizedName("itemPlateBatteryAlloy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemPlateBatteryAlloy");
GameRegistry.registerItem(itemPlateBatteryAlloy, "itemPlateBatteryAlloy");
itemHeliumBlob = new Item().setUnlocalizedName("itemHeliumBlob").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob");
GameRegistry.registerItem(itemHeliumBlob, "itemHeliumBlob");
+
/*
item_PLEASE_FACTOR_ME_4 = new Item().setUnlocalizedName("unlocalName4").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault");
GameRegistry.registerItem(item_PLEASE_FACTOR_ME_4, "localName4");*/
diff --git a/src/Java/miscutil/core/item/base/BaseItemGeneric.java b/src/Java/miscutil/core/item/base/BaseItemGeneric.java
index 55d98528ce..56b9c9d7fe 100644
--- a/src/Java/miscutil/core/item/base/BaseItemGeneric.java
+++ b/src/Java/miscutil/core/item/base/BaseItemGeneric.java
@@ -1,18 +1,29 @@
package miscutil.core.item.base;
+import java.util.List;
+
import miscutil.core.lib.CORE;
import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
-@Deprecated
public class BaseItemGeneric extends Item
{
- public BaseItemGeneric(String s, CreativeTabs c, int stackSize, int maxDmg)
+ public BaseItemGeneric(String unlocalizedName, CreativeTabs c, int stackSize, int maxDmg)
{
- setUnlocalizedName(CORE.MODID + "_" + s);
- setTextureName(CORE.MODID + ":" + s);
+ setUnlocalizedName(CORE.MODID + "_" + unlocalizedName);
+ setTextureName(CORE.MODID + ":" + unlocalizedName);
setCreativeTab(c);
setMaxStackSize(stackSize);
setMaxDamage(maxDmg);
}
+
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ @Override
+ public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
+ list.add(EnumChatFormatting.GOLD+"");
+ super.addInformation(stack, aPlayer, list, bool);
+ }
} \ No newline at end of file