diff options
Diffstat (limited to 'src/Java/miscutil')
20 files changed, 738 insertions, 27 deletions
diff --git a/src/Java/miscutil/core/block/base/BlockBaseModular.java b/src/Java/miscutil/core/block/base/BlockBaseModular.java index 19f40c4ef0..613320b801 100644 --- a/src/Java/miscutil/core/block/base/BlockBaseModular.java +++ b/src/Java/miscutil/core/block/base/BlockBaseModular.java @@ -1,9 +1,12 @@ package miscutil.core.block.base; +import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; +import miscutil.core.util.item.UtilsItems; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.Item; import net.minecraft.world.IBlockAccess; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; @@ -24,6 +27,8 @@ public class BlockBaseModular extends BasicBlock{ this.thisBlockMaterial = blockMaterial; this.setBlockName(getLocalizedName()); LanguageRegistry.addName(this, getLocalizedName()); + setOreDict(unlocalizedName, blockType); + } /** @@ -39,6 +44,12 @@ public class BlockBaseModular extends BasicBlock{ return 0; } + private void setOreDict(String unlocalizedName, BlockTypes blockType){ + if (blockType == BlockTypes.FRAME){ + GT_OreDictUnificator.registerOre(unlocalizedName.replace("BlockGtFrame", "frameGt"),UtilsItems.getSimpleStack(Item.getItemFromBlock(this))); + } + } + @Override public String getLocalizedName() { String tempIngot = getUnlocalizedName().replace("tile.blockGtFrame", ""); diff --git a/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabMisc.java b/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabMisc.java index 2327eaac7a..af2fe4ae6b 100644 --- a/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabMisc.java +++ b/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabMisc.java @@ -12,7 +12,7 @@ public class MiscUtilCreativeTabMisc extends CreativeTabs { @Override public Item getTabIconItem() { - return ModItems.itemIngotStaballoy; + return ModItems.itemFoodCurriedSausages; } } diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index f466786055..3b24a3cad2 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -5,18 +5,21 @@ import static miscutil.core.lib.CORE.LOAD_ALL_CONTENT; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.creative.AddToCreativeTab; import miscutil.core.item.base.CoreItem; +import miscutil.core.item.base.bolts.BaseItemBolt; import miscutil.core.item.base.foods.BaseItemFood; import miscutil.core.item.base.foods.BaseItemHotFood; +import miscutil.core.item.base.gears.BaseItemGear; import miscutil.core.item.base.ingots.BaseItemIngot; import miscutil.core.item.base.ingots.BaseItemIngotHot; import miscutil.core.item.base.plates.BaseItemPlate; +import miscutil.core.item.base.rings.BaseItemRing; +import miscutil.core.item.base.rods.BaseItemRod; +import miscutil.core.item.base.rotors.BaseItemRotor; +import miscutil.core.item.base.screws.BaseItemScrew; import miscutil.core.item.effects.RarityUncommon; import miscutil.core.item.general.BufferCore; import miscutil.core.item.general.fuelrods.FuelRod_Base; -import miscutil.core.item.init.ItemsDusts; import miscutil.core.item.init.ItemsFoods; -import miscutil.core.item.init.ItemsIngots; -import miscutil.core.item.init.ItemsPlates; import miscutil.core.item.tool.misc.SandstoneHammer; import miscutil.core.item.tool.staballoy.StaballoyAxe; import miscutil.core.item.tool.staballoy.StaballoyPickaxe; @@ -28,7 +31,6 @@ import miscutil.core.util.debug.DEBUG_INIT; import miscutil.core.util.item.UtilsItems; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemFood; import net.minecraftforge.common.util.EnumHelper; import cpw.mods.fml.common.registry.GameRegistry; @@ -128,13 +130,41 @@ public final class ModItems { public static Item itemDustSmallTantalloy61; public static Item itemDustTinyTantalloy61; - public static ItemBlock ItemBlockGtFrameBox; + public static BaseItemGear itemGearStaballoy; + public static BaseItemGear itemGearBloodSteel; + public static BaseItemGear itemGearTantalloy60; + public static BaseItemGear itemGearTantalloy61; + + public static BaseItemRotor itemRotorStaballoy; + public static BaseItemRotor itemRotorBloodSteel; + public static BaseItemRotor itemRotorTantalloy60; + public static BaseItemRotor itemRotorTantalloy61; + + public static BaseItemRod itemRodStaballoy; + public static BaseItemRod itemRodBloodSteel; + public static BaseItemRod itemRodTantalloy60; + public static BaseItemRod itemRodTantalloy61; + + public static BaseItemScrew itemScrewStaballoy; + public static BaseItemScrew itemScrewBloodSteel; + public static BaseItemScrew itemScrewTantalloy60; + public static BaseItemScrew itemScrewTantalloy61; + + public static BaseItemRing itemRingStaballoy; + public static BaseItemRing itemRingBloodSteel; + public static BaseItemRing itemRingTantalloy60; + public static BaseItemRing itemRingTantalloy61; + + public static BaseItemBolt itemBoltStaballoy; + public static BaseItemBolt itemBoltBloodSteel; + public static BaseItemBolt itemBoltTantalloy60; + public static BaseItemBolt itemBoltTantalloy61; //@SuppressWarnings("unused") public static final void init(){ - AAA_Broken = new BaseItemIngot("AAA_Broken", "Errors - Tell Alkalus", Utils.rgbtoHexValue(128, 128, 0)); + AAA_Broken = new BaseItemIngot("AAA_Broken", "Errors - Tell Alkalus", Utils.rgbtoHexValue(128, 128, 128)); //Debug Loading if (CORE.DEBUG){ @@ -142,11 +172,28 @@ public final class ModItems { } - ItemsIngots.load(); + /*ItemsIngots.load(); ItemsPlates.load(); ItemsDusts.load(); + ItemsRods.load(); + ItemsGears.load(); + ItemsRotors.load(); + ItemsRings.load(); + ItemsBolts.load(); + ItemsScrews.load();*/ + + + //Start meta Item Generation ItemsFoods.load(); + UtilsItems.generateItemsFromMaterial("EnergyCrystal", "Energy Crystal", Utils.rgbtoHexValue(228, 175, 0), true); + UtilsItems.generateItemsFromMaterial("BloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0), false); + UtilsItems.generateItemsFromMaterial("Staballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66), true); + UtilsItems.generateItemsFromMaterial("Tantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166), true); + UtilsItems.generateItemsFromMaterial("Tantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196), true); + UtilsItems.generateItemsFromMaterial("Bedrockium", "Bedrockium", Utils.rgbtoHexValue(32, 32, 32), false); + UtilsItems.generateItemsFromMaterial("Quantum", "Quantum", Utils.rgbtoHexValue(128, 128, 128), true); + //EnderIO Resources if (LoadedMods.EnderIO || LOAD_ALL_CONTENT){ Utils.LOG_INFO("EnderIO Found - Loading Resources."); @@ -207,12 +254,12 @@ public final class ModItems { Utils.LOG_INFO("ExtraUtilities Found - Loading Resources."); //Item Init try { - itemPlateBedrockium = new Item().setUnlocalizedName("itemPlateBedrockium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateBedrockium"); + //itemPlateBedrockium = new Item().setUnlocalizedName("itemPlateBedrockium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateBedrockium"); } catch (NullPointerException e){ e.getClass(); } //Registry - GameRegistry.registerItem(itemPlateBedrockium, "itemPlateBedrockium"); + //GameRegistry.registerItem(itemPlateBedrockium, "itemPlateBedrockium"); } else { Utils.LOG_WARNING("ExtraUtilities not Found - Skipping Resources."); diff --git a/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java b/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java new file mode 100644 index 0000000000..bff3b1f3c3 --- /dev/null +++ b/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java @@ -0,0 +1,75 @@ +package miscutil.core.item.base.bolts; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.util.GT_OreDictUnificator; + +import java.util.List; + +import miscutil.core.creative.AddToCreativeTab; +import miscutil.core.lib.CORE; +import miscutil.core.util.Utils; +import miscutil.core.util.item.UtilsItems; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import cpw.mods.fml.common.registry.GameRegistry; + +public class BaseItemBolt extends Item{ + + protected int colour; + protected String materialName; + protected String unlocalName; + + public BaseItemBolt(String unlocalizedName, String materialName, int colour) { + setUnlocalizedName(unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabMisc); + this.setUnlocalizedName(unlocalizedName); + this.unlocalName = unlocalizedName; + this.setMaxStackSize(64); + this.setTextureName(CORE.MODID + ":" + "itemBolt"); + this.colour = colour; + this.materialName = materialName; + GameRegistry.registerItem(this, unlocalizedName); + GT_OreDictUnificator.registerOre(unlocalName.replace("itemB", "b"), UtilsItems.getSimpleStack(this)); + addExtruderRecipe(); + } + + @Override + public String getItemStackDisplayName(ItemStack p_77653_1_) { + + return (materialName+ " Bolt"); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + if (materialName != null && materialName != "" && !materialName.equals("")){ + list.add(EnumChatFormatting.GRAY+"A small Bolt, constructed from " + materialName + "."); + } + super.addInformation(stack, aPlayer, list, bool); + } + + public final String getMaterialName() { + return materialName; + } + + @Override + public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + if (colour == 0){ + return Utils.generateSingularRandomHexValue(); + } + return colour; + + } + + private void addExtruderRecipe(){ + Utils.LOG_INFO("Adding recipe for "+materialName+" Bolts"); + String tempIngot = unlocalName.replace("itemBolt", "ingot"); + ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); + if (null != tempOutputStack){ + GT_Values.RA.addExtruderRecipe(tempOutputStack, ItemList.Shape_Extruder_Bolt.get(1), UtilsItems.getSimpleStack(this, 8), 10*20, 24); + } + } + +} diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java index bd9853d715..993ed9636b 100644 --- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java @@ -38,25 +38,25 @@ public class BaseItemDust extends Item{ GameRegistry.registerItem(this, unlocalizedName); String temp = ""; - Utils.LOG_INFO("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); + Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); if (getUnlocalizedName().contains("item.")){ temp = getUnlocalizedName().replace("item.", ""); - Utils.LOG_INFO("Generating OreDict Name: "+temp); + Utils.LOG_WARNING("Generating OreDict Name: "+temp); } else { temp = getUnlocalizedName(); } if (temp.contains("DustTiny")){ temp = temp.replace("itemD", "d"); - Utils.LOG_INFO("Generating OreDict Name: "+temp); + Utils.LOG_WARNING("Generating OreDict Name: "+temp); } else if (temp.contains("DustSmall")){ temp = temp.replace("itemD", "d"); - Utils.LOG_INFO("Generating OreDict Name: "+temp); + Utils.LOG_WARNING("Generating OreDict Name: "+temp); } else { temp = temp.replace("itemD", "d"); - Utils.LOG_INFO("Generating OreDict Name: "+temp); + Utils.LOG_WARNING("Generating OreDict Name: "+temp); } if (temp != null && temp != ""){ GT_OreDictUnificator.registerOre(temp, UtilsItems.getSimpleStack(this)); @@ -109,25 +109,25 @@ public class BaseItemDust extends Item{ ItemStack tempStack = UtilsItems.getSimpleStack(this); ItemStack tempOutput = null; String temp = ""; - Utils.LOG_INFO("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); + Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); if (getUnlocalizedName().contains("item.")){ temp = getUnlocalizedName().replace("item.", ""); - Utils.LOG_INFO("Generating OreDict Name: "+temp); + Utils.LOG_WARNING("Generating OreDict Name: "+temp); } else { temp = getUnlocalizedName(); } if (temp.contains("DustTiny")){ temp = temp.replace("itemDustTiny", "dust"); - Utils.LOG_INFO("Generating OreDict Name: "+temp); + Utils.LOG_WARNING("Generating OreDict Name: "+temp); } else if (temp.contains("DustSmall")){ temp = temp.replace("itemDustSmall", "dust"); - Utils.LOG_INFO("Generating OreDict Name: "+temp); + Utils.LOG_WARNING("Generating OreDict Name: "+temp); } else { temp = temp.replace("itemD", "d"); - Utils.LOG_INFO("Generating OreDict Name: "+temp); + Utils.LOG_WARNING("Generating OreDict Name: "+temp); } if (temp != null && temp != ""){ tempOutput = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1); @@ -135,21 +135,21 @@ public class BaseItemDust extends Item{ if (tempOutput != null){ if (getUnlocalizedName().contains("DustTiny")){ - Utils.LOG_INFO("Generating a 9 Tiny dust to 1 Dust recipe for "+materialName); + Utils.LOG_WARNING("Generating a 9 Tiny dust to 1 Dust recipe for "+materialName); UtilsRecipe.addShapelessGregtechRecipe(tempOutput, tempStack, tempStack, tempStack, tempStack, tempStack, tempStack, tempStack, tempStack, tempStack); } else if (getUnlocalizedName().contains("DustSmall")){ - Utils.LOG_INFO("Generating a 4 Small dust to 1 Dust recipe for "+materialName); + Utils.LOG_WARNING("Generating a 4 Small dust to 1 Dust recipe for "+materialName); UtilsRecipe.addShapelessGregtechRecipe(tempOutput, tempStack, tempStack, null, tempStack, tempStack, null, null, null, null); } else { - Utils.LOG_INFO("Generating a shapeless Dust recipe for "+materialName); + Utils.LOG_WARNING("Generating a shapeless Dust recipe for "+materialName); UtilsRecipe.addShapelessGregtechRecipe(tempOutput, "dustTungsten", "dustTantalum", "dustTantalum", "dustTantalum", "dustTantalum", "dustTantalum", @@ -160,6 +160,7 @@ public class BaseItemDust extends Item{ } private void addMacerationRecipe(){ + Utils.LOG_INFO("Adding recipe for "+materialName+" Dusts"); String tempIngot = getUnlocalizedName().replace("item.itemDust", "ingot"); String tempDust = getUnlocalizedName().replace("item.itemDust", "dust"); @@ -170,17 +171,17 @@ public class BaseItemDust extends Item{ return; } - Utils.LOG_INFO("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); + Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); if (getUnlocalizedName().contains("item.")){ tempIngot = getUnlocalizedName().replace("item.", ""); - Utils.LOG_INFO("Generating OreDict Name: "+tempIngot); + Utils.LOG_WARNING("Generating OreDict Name: "+tempIngot); } else { tempIngot = getUnlocalizedName(); } tempIngot = tempIngot.replace("itemDust", "ingot"); - Utils.LOG_INFO("Generating OreDict Name: "+tempIngot); + Utils.LOG_WARNING("Generating OreDict Name: "+tempIngot); if (tempIngot != null && tempIngot != ""){ tempInputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); diff --git a/src/Java/miscutil/core/item/base/gears/BaseItemGear.java b/src/Java/miscutil/core/item/base/gears/BaseItemGear.java new file mode 100644 index 0000000000..b91a17ddd3 --- /dev/null +++ b/src/Java/miscutil/core/item/base/gears/BaseItemGear.java @@ -0,0 +1,75 @@ +package miscutil.core.item.base.gears; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.util.GT_OreDictUnificator; + +import java.util.List; + +import miscutil.core.creative.AddToCreativeTab; +import miscutil.core.lib.CORE; +import miscutil.core.util.Utils; +import miscutil.core.util.item.UtilsItems; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import cpw.mods.fml.common.registry.GameRegistry; + +public class BaseItemGear extends Item{ + + protected int colour; + protected String materialName; + protected String unlocalName; + + public BaseItemGear(String unlocalizedName, String materialName, int colour) { + setUnlocalizedName(unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabMisc); + this.setUnlocalizedName(unlocalizedName); + this.unlocalName = unlocalizedName; + this.setMaxStackSize(64); + this.setTextureName(CORE.MODID + ":" + "itemGear"); + this.colour = colour; + this.materialName = materialName; + GameRegistry.registerItem(this, unlocalizedName); + GT_OreDictUnificator.registerOre(unlocalName.replace("itemG", "g"), UtilsItems.getSimpleStack(this)); + addExtruderRecipe(); + } + + @Override + public String getItemStackDisplayName(ItemStack p_77653_1_) { + + return (materialName+ " Gear"); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + if (materialName != null && materialName != "" && !materialName.equals("")){ + list.add(EnumChatFormatting.GRAY+"A large Gear, constructed from " + materialName + "."); + } + super.addInformation(stack, aPlayer, list, bool); + } + + public final String getMaterialName() { + return materialName; + } + + @Override + public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + if (colour == 0){ + return Utils.generateSingularRandomHexValue(); + } + return colour; + + } + + private void addExtruderRecipe(){ + Utils.LOG_INFO("Adding recipe for "+materialName+" Gears"); + String tempIngot = unlocalName.replace("itemGear", "ingot"); + ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 8); + if (null != tempOutputStack){ + GT_Values.RA.addExtruderRecipe(tempOutputStack, ItemList.Shape_Extruder_Gear.get(1), UtilsItems.getSimpleStack(this), 15*20, 24); + } + } + +} diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java index 46d9d83dc7..bcf4aa935c 100644 --- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java @@ -47,6 +47,7 @@ public class BaseItemIngotHot extends BaseItemIngot{ } private void generateRecipe(){ + Utils.LOG_INFO("Adding recipe for a Hot Ingot of "+materialName+"."); GT_Values.RA.addVacuumFreezerRecipe(UtilsItems.getSimpleStack(this), outputIngot.copy(), 500); } diff --git a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java index 982c5a4b91..80dc8864cf 100644 --- a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java +++ b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java @@ -1,5 +1,7 @@ package miscutil.core.item.base.itemblock; +import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.util.item.UtilsItems; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; @@ -10,7 +12,7 @@ public class ItemBlockGtFrameBox extends ItemBlock{ public ItemBlockGtFrameBox(Block block) { super(block); this.blockColour = block.getBlockColor(); - // this.setCreativeTab(AddToCreativeTab.tabBlock); + GT_OreDictUnificator.registerOre(block.getUnlocalizedName().replace("BlockGtFrame", "frameGt"), UtilsItems.getSimpleStack(this)); } public int getRenderColor(int aMeta) { diff --git a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java index e38771ee75..0e9bb37f38 100644 --- a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java +++ b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java @@ -64,6 +64,7 @@ public class BaseItemPlate extends Item{ } private void addBendingRecipe(){ + Utils.LOG_INFO("Adding recipe for "+materialName+" Plates"); String tempIngot = unlocalName.replace("itemPlate", "ingot"); ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); if (null != tempOutputStack){ diff --git a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java new file mode 100644 index 0000000000..d60abf2524 --- /dev/null +++ b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java @@ -0,0 +1,75 @@ +package miscutil.core.item.base.rings; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.util.GT_OreDictUnificator; + +import java.util.List; + +import miscutil.core.creative.AddToCreativeTab; +import miscutil.core.lib.CORE; +import miscutil.core.util.Utils; +import miscutil.core.util.item.UtilsItems; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import cpw.mods.fml.common.registry.GameRegistry; + +public class BaseItemRing extends Item{ + + protected int colour; + protected String materialName; + protected String unlocalName; + + public BaseItemRing(String unlocalizedName, String materialName, int colour) { + setUnlocalizedName(unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabMisc); + this.setUnlocalizedName(unlocalizedName); + this.unlocalName = unlocalizedName; + this.setMaxStackSize(64); + this.setTextureName(CORE.MODID + ":" + "itemRing"); + this.colour = colour; + this.materialName = materialName; + GameRegistry.registerItem(this, unlocalizedName); + GT_OreDictUnificator.registerOre(unlocalName.replace("itemR", "r"), UtilsItems.getSimpleStack(this)); + addExtruderRecipe(); + } + + @Override + public String getItemStackDisplayName(ItemStack p_77653_1_) { + + return (materialName+ " Ring"); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + if (materialName != null && materialName != "" && !materialName.equals("")){ + list.add(EnumChatFormatting.GRAY+"A " + materialName + " Ring."); + } + super.addInformation(stack, aPlayer, list, bool); + } + + public final String getMaterialName() { + return materialName; + } + + @Override + public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + if (colour == 0){ + return Utils.generateSingularRandomHexValue(); + } + return colour; + + } + + private void addExtruderRecipe(){ + Utils.LOG_INFO("Adding recipe for "+materialName+" Rings"); + String tempIngot = unlocalName.replace("itemRing", "ingot"); + ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); + if (null != tempOutputStack){ + GT_Values.RA.addExtruderRecipe(tempOutputStack, ItemList.Shape_Extruder_Ring.get(1), UtilsItems.getSimpleStack(this, 4), 1600, 96); + } + } + +} diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java new file mode 100644 index 0000000000..d292733538 --- /dev/null +++ b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java @@ -0,0 +1,82 @@ +package miscutil.core.item.base.rods; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.util.GT_OreDictUnificator; + +import java.util.List; + +import miscutil.core.creative.AddToCreativeTab; +import miscutil.core.lib.CORE; +import miscutil.core.util.Utils; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import cpw.mods.fml.common.registry.GameRegistry; + +public class BaseItemRod extends Item{ + + protected int colour; + protected String materialName; + protected String unlocalName; + + public BaseItemRod(String unlocalizedName, String materialName, int colour) { + setUnlocalizedName(unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabMisc); + this.setUnlocalizedName(unlocalizedName); + this.unlocalName = unlocalizedName; + this.setTextureName(CORE.MODID + ":" + "itemRod"); + this.setMaxStackSize(64); + this.colour = colour; + this.materialName = materialName; + GameRegistry.registerItem(this, unlocalizedName); + GT_OreDictUnificator.registerOre(unlocalName.replace("itemR", "r"), UtilsItems.getSimpleStack(this)); + addExtruderRecipe(); + } + + @Override + public String getItemStackDisplayName(ItemStack p_77653_1_) { + + return (materialName+ " Rod"); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + if (materialName != null && materialName != "" && !materialName.equals("")){ + list.add(EnumChatFormatting.GRAY+"A 40cm Rod of " + materialName + "."); + } + super.addInformation(stack, aPlayer, list, bool); + } + + public final String getMaterialName() { + return materialName; + } + + @Override + public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + if (colour == 0){ + return Utils.generateSingularRandomHexValue(); + } + return colour; + + } + + private void addExtruderRecipe(){ + Utils.LOG_INFO("Adding recipe for "+materialName+" Rods"); + String tempIngot = unlocalName.replace("itemRod", "ingot"); + ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); + if (null != tempOutputStack){ + GT_Values.RA.addExtruderRecipe(tempOutputStack, ItemList.Shape_Extruder_Rod.get(1), UtilsItems.getSimpleStack(this, 2), 1200, 24); + } + ItemStack rods = UtilsItems.getSimpleStack(this, 1); + UtilsRecipe.addShapedGregtechRecipe( + rods, rods, rods, + rods, "craftingToolWrench", rods, + rods, rods, rods, + UtilsItems.getItemStackOfAmountFromOreDict(unlocalName.replace("itemR", "frameGt"), 1)); + } + +} diff --git a/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java b/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java new file mode 100644 index 0000000000..cc8504339f --- /dev/null +++ b/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java @@ -0,0 +1,92 @@ +package miscutil.core.item.base.rotors; + +import gregtech.api.util.GT_OreDictUnificator; + +import java.util.List; + +import miscutil.core.creative.AddToCreativeTab; +import miscutil.core.lib.CORE; +import miscutil.core.util.Utils; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import cpw.mods.fml.common.registry.GameRegistry; + +public class BaseItemRotor extends Item{ + + protected int colour; + protected String materialName; + protected String unlocalName; + + public BaseItemRotor(String unlocalizedName, String materialName, int colour) { + setUnlocalizedName(unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabMisc); + this.setUnlocalizedName(unlocalizedName); + this.unlocalName = unlocalizedName; + this.setMaxStackSize(64); + this.setTextureName(CORE.MODID + ":" + "itemRotor"); + this.colour = colour; + this.materialName = materialName; + GameRegistry.registerItem(this, unlocalizedName); + GT_OreDictUnificator.registerOre(unlocalName.replace("itemR", "r"), UtilsItems.getSimpleStack(this)); + generateRecipe(); + } + + @Override + public String getItemStackDisplayName(ItemStack p_77653_1_) { + + return (materialName+ " Rotor"); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + if (materialName != null && materialName != "" && !materialName.equals("")){ + list.add(EnumChatFormatting.GRAY+"A spindley Rotor made out of " + materialName + ". "); + } + super.addInformation(stack, aPlayer, list, bool); + } + + public final String getMaterialName() { + return materialName; + } + + @Override + public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + if (colour == 0){ + return Utils.generateSingularRandomHexValue(); + } + return colour; + + } + + public static boolean getValidItemStack(ItemStack validStack){ + if (validStack != null){ + return true; + } + return false; + } + + public void generateRecipe(){ + + Utils.LOG_INFO("Adding recipe for "+materialName+" Rotors"); + String tempIngot = unlocalName.replace("itemRotor", "plate"); + ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); + Utils.LOG_WARNING("Found for recipe:"+tempIngot+ "isValidStack()="+getValidItemStack(tempOutputStack)); + String screw = unlocalName.replace("itemRotor", "screw"); + ItemStack screwStack = UtilsItems.getItemStackOfAmountFromOreDict(screw, 1); + Utils.LOG_WARNING("Found for recipe:"+screw+ "isValidStack()="+getValidItemStack(screwStack)); + String ring = unlocalName.replace("itemRotor", "ring"); + ItemStack ringStack = UtilsItems.getItemStackOfAmountFromOreDict(ring, 1); + Utils.LOG_WARNING("Found for recipe:"+ring+ "isValidStack()="+getValidItemStack(ringStack)); + + UtilsRecipe.addShapedGregtechRecipe( + tempOutputStack, "craftingToolHardHammer", tempOutputStack, + screwStack, ringStack, "craftingToolFile", + tempOutputStack, "craftingToolScrewdriver", tempOutputStack, + UtilsItems.getSimpleStack(this)); + } + +} diff --git a/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java b/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java new file mode 100644 index 0000000000..c34530d672 --- /dev/null +++ b/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java @@ -0,0 +1,82 @@ +package miscutil.core.item.base.screws; + +import gregtech.api.enums.GT_Values; +import gregtech.api.util.GT_OreDictUnificator; + +import java.util.List; + +import miscutil.core.creative.AddToCreativeTab; +import miscutil.core.lib.CORE; +import miscutil.core.util.Utils; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import cpw.mods.fml.common.registry.GameRegistry; + +public class BaseItemScrew extends Item{ + + protected int colour; + protected String materialName; + protected String unlocalName; + + public BaseItemScrew(String unlocalizedName, String materialName, int colour) { + setUnlocalizedName(unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabMisc); + this.setUnlocalizedName(unlocalizedName); + this.unlocalName = unlocalizedName; + this.setMaxStackSize(64); + this.setTextureName(CORE.MODID + ":" + "itemScrew"); + this.setMaxStackSize(64); + this.colour = colour; + this.materialName = materialName; + GameRegistry.registerItem(this, unlocalizedName); + GT_OreDictUnificator.registerOre(unlocalName.replace("itemS", "s"), UtilsItems.getSimpleStack(this)); + addLatheRecipe(); + } + + @Override + public String getItemStackDisplayName(ItemStack p_77653_1_) { + + return (materialName+ " Screw"); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + if (materialName != null && materialName != "" && !materialName.equals("")){ + list.add(EnumChatFormatting.GRAY+"A 8mm Screw, fabricated out of some " + materialName + "."); + } + super.addInformation(stack, aPlayer, list, bool); + } + + public final String getMaterialName() { + return materialName; + } + + @Override + public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + if (colour == 0){ + return Utils.generateSingularRandomHexValue(); + } + return colour; + + } + + private void addLatheRecipe(){ + Utils.LOG_INFO("Adding recipe for "+materialName+" Screws"); + ItemStack boltStack = UtilsItems.getItemStackOfAmountFromOreDict(unlocalName.replace("itemScrew", "bolt"), 1); + if (null != boltStack){ + GT_Values.RA.addLatheRecipe(boltStack, + UtilsItems.getSimpleStack(this), null, + 60, 16); + UtilsRecipe.addShapedGregtechRecipe( + "craftingToolFile", boltStack, null, + boltStack, null, null, + null, null, null, + UtilsItems.getSimpleStack(this)); + } + } + +} diff --git a/src/Java/miscutil/core/item/init/ItemsBolts.java b/src/Java/miscutil/core/item/init/ItemsBolts.java new file mode 100644 index 0000000000..57bfa8a8d9 --- /dev/null +++ b/src/Java/miscutil/core/item/init/ItemsBolts.java @@ -0,0 +1,23 @@ +package miscutil.core.item.init; + +import miscutil.core.item.ModItems; +import miscutil.core.item.base.bolts.BaseItemBolt; +import miscutil.core.util.Utils; + +public class ItemsBolts { + + public static void load(){ + run(); + } + + private static void run(){ + + ModItems.itemBoltStaballoy = new BaseItemBolt("itemBoltStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66)); + ModItems.itemBoltBloodSteel = new BaseItemBolt("itemBoltBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0)); + ModItems.itemBoltTantalloy60 = new BaseItemBolt("itemBoltTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); + ModItems.itemBoltTantalloy61 = new BaseItemBolt("itemBoltTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196)); + + + } + +} diff --git a/src/Java/miscutil/core/item/init/ItemsGears.java b/src/Java/miscutil/core/item/init/ItemsGears.java new file mode 100644 index 0000000000..d6520c7ba3 --- /dev/null +++ b/src/Java/miscutil/core/item/init/ItemsGears.java @@ -0,0 +1,23 @@ +package miscutil.core.item.init; + +import miscutil.core.item.ModItems; +import miscutil.core.item.base.gears.BaseItemGear; +import miscutil.core.util.Utils; + +public class ItemsGears { + + public static void load(){ + run(); + } + + private static void run(){ + + ModItems.itemGearStaballoy = new BaseItemGear("itemGearStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66)); + ModItems.itemGearBloodSteel = new BaseItemGear("itemGearBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0)); + ModItems.itemGearTantalloy60 = new BaseItemGear("itemGearTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); + ModItems.itemGearTantalloy61 = new BaseItemGear("itemGearTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196)); + + + } + +} diff --git a/src/Java/miscutil/core/item/init/ItemsRings.java b/src/Java/miscutil/core/item/init/ItemsRings.java new file mode 100644 index 0000000000..a01765f109 --- /dev/null +++ b/src/Java/miscutil/core/item/init/ItemsRings.java @@ -0,0 +1,23 @@ +package miscutil.core.item.init; + +import miscutil.core.item.ModItems; +import miscutil.core.item.base.rings.BaseItemRing; +import miscutil.core.util.Utils; + +public class ItemsRings { + + public static void load(){ + run(); + } + + private static void run(){ + + ModItems.itemRingStaballoy = new BaseItemRing("itemRingStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66)); + ModItems.itemRingBloodSteel = new BaseItemRing("itemRingBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0)); + ModItems.itemRingTantalloy60 = new BaseItemRing("itemRingTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); + ModItems.itemRingTantalloy61 = new BaseItemRing("itemRingTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196)); + + + } + +} diff --git a/src/Java/miscutil/core/item/init/ItemsRods.java b/src/Java/miscutil/core/item/init/ItemsRods.java new file mode 100644 index 0000000000..ff36d7f757 --- /dev/null +++ b/src/Java/miscutil/core/item/init/ItemsRods.java @@ -0,0 +1,23 @@ +package miscutil.core.item.init; + +import miscutil.core.item.ModItems; +import miscutil.core.item.base.rods.BaseItemRod; +import miscutil.core.util.Utils; + +public class ItemsRods { + + public static void load(){ + run(); + } + + private static void run(){ + + ModItems.itemRodStaballoy = new BaseItemRod("itemRodStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66)); + ModItems.itemRodBloodSteel = new BaseItemRod("itemRodBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0)); + ModItems.itemRodTantalloy60 = new BaseItemRod("itemRodTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); + ModItems.itemRodTantalloy61 = new BaseItemRod("itemRodTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196)); + + + } + +} diff --git a/src/Java/miscutil/core/item/init/ItemsRotors.java b/src/Java/miscutil/core/item/init/ItemsRotors.java new file mode 100644 index 0000000000..d12a48baa9 --- /dev/null +++ b/src/Java/miscutil/core/item/init/ItemsRotors.java @@ -0,0 +1,23 @@ +package miscutil.core.item.init; + +import miscutil.core.item.ModItems; +import miscutil.core.item.base.rotors.BaseItemRotor; +import miscutil.core.util.Utils; + +public class ItemsRotors { + + public static void load(){ + run(); + } + + private static void run(){ + + ModItems.itemRotorStaballoy = new BaseItemRotor("itemRotorStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66)); + ModItems.itemRotorBloodSteel = new BaseItemRotor("itemRotorBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0)); + ModItems.itemRotorTantalloy60 = new BaseItemRotor("itemRotorTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); + ModItems.itemRotorTantalloy61 = new BaseItemRotor("itemRotorTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196)); + + + } + +} diff --git a/src/Java/miscutil/core/item/init/ItemsScrews.java b/src/Java/miscutil/core/item/init/ItemsScrews.java new file mode 100644 index 0000000000..8cb08f2ce2 --- /dev/null +++ b/src/Java/miscutil/core/item/init/ItemsScrews.java @@ -0,0 +1,23 @@ +package miscutil.core.item.init; + +import miscutil.core.item.ModItems; +import miscutil.core.item.base.screws.BaseItemScrew; +import miscutil.core.util.Utils; + +public class ItemsScrews { + + public static void load(){ + run(); + } + + private static void run(){ + + ModItems.itemScrewStaballoy = new BaseItemScrew("itemScrewStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66)); + ModItems.itemScrewBloodSteel = new BaseItemScrew("itemScrewBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0)); + ModItems.itemScrewTantalloy60 = new BaseItemScrew("itemScrewTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); + ModItems.itemScrewTantalloy61 = new BaseItemScrew("itemScrewTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196)); + + + } + +} diff --git a/src/Java/miscutil/core/util/item/UtilsItems.java b/src/Java/miscutil/core/util/item/UtilsItems.java index bda8849768..114a877e1e 100644 --- a/src/Java/miscutil/core/util/item/UtilsItems.java +++ b/src/Java/miscutil/core/util/item/UtilsItems.java @@ -6,6 +6,16 @@ import java.util.ArrayList; import miscutil.core.item.ModItems; import miscutil.core.item.base.BasicSpawnEgg; +import miscutil.core.item.base.bolts.BaseItemBolt; +import miscutil.core.item.base.dusts.BaseItemDust; +import miscutil.core.item.base.gears.BaseItemGear; +import miscutil.core.item.base.ingots.BaseItemIngot; +import miscutil.core.item.base.ingots.BaseItemIngotHot; +import miscutil.core.item.base.plates.BaseItemPlate; +import miscutil.core.item.base.rings.BaseItemRing; +import miscutil.core.item.base.rods.BaseItemRod; +import miscutil.core.item.base.rotors.BaseItemRotor; +import miscutil.core.item.base.screws.BaseItemScrew; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; @@ -223,5 +233,24 @@ public class UtilsItems { } return getSimpleStack(ModItems.AAA_Broken, amount); } + + public static void generateItemsFromMaterial(String unlocalizedName, String materialName, int Colour, boolean hotIngot){ + Item temp; + temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, Colour, "Dust"); + temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, Colour, "Tiny"); + temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, Colour, "Small"); + temp = new BaseItemIngot("itemIngot"+unlocalizedName, materialName, Colour); + if (hotIngot){ + Item tempIngot = temp; + temp = new BaseItemIngotHot("itemHotIngot"+unlocalizedName, materialName, UtilsItems.getSimpleStack(tempIngot, 1)); + } + temp = new BaseItemPlate("itemPlate"+unlocalizedName, materialName, Colour); + temp = new BaseItemRod("itemRod"+unlocalizedName, materialName, Colour); + temp = new BaseItemRing("itemRing"+unlocalizedName, materialName, Colour); + temp = new BaseItemScrew("itemScrew"+unlocalizedName, materialName, Colour); + temp = new BaseItemBolt("itemBolt"+unlocalizedName, materialName, Colour); + temp = new BaseItemRotor("itemRotor"+unlocalizedName, materialName, Colour); + temp = new BaseItemGear("itemGear"+unlocalizedName, materialName, Colour); + } } |