diff options
.png?id=915139115434ff5797df6f82a63578e938864016){kind=link}
24 files changed, 924 insertions, 88 deletions
diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java index eb28d31d87..45b73e5b83 100644 --- a/src/Java/miscutil/MiscUtils.java +++ b/src/Java/miscutil/MiscUtils.java @@ -57,7 +57,9 @@ implements ActionListener proxy.registerOreDict(); MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(new XEventHandler()); - MinecraftForge.EVENT_BUS.register(new DebugRenderManager()); + if (CORE.DEBUG){ + MinecraftForge.EVENT_BUS.register(new DebugRenderManager()); + } FMLCommonHandler.instance().bus().register(this); proxy.registerNetworkStuff(); } diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java index 9a288c0e79..32dc0c8c11 100644 --- a/src/Java/miscutil/core/common/CommonProxy.java +++ b/src/Java/miscutil/core/common/CommonProxy.java @@ -5,7 +5,9 @@ import static miscutil.core.lib.LoadedMods.Gregtech; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.block.ModBlocks; import miscutil.core.gui.ModGUI; +import miscutil.core.handler.registration.RECIPES_Machines; import miscutil.core.item.ModItems; +import miscutil.core.item.tool.Loader_TOOLS; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; import miscutil.core.tileentities.ModTileEntities; @@ -65,12 +67,15 @@ public class CommonProxy { public void init(FMLInitializationEvent e) { - + Loader_TOOLS.run(); + RECIPES_Machines.RECIPES_LOAD(); } public void postInit(FMLPostInitializationEvent e) { + + } public void registerNetworkStuff(){ @@ -95,7 +100,13 @@ public class CommonProxy { Utils.LOG_INFO("Registering Ingots & Plates with OreDict."); //In-house + + //tools + GT_OreDictUnificator.registerOre("craftingToolSandHammer", new ItemStack(ModItems.itemSandstoneHammer)); + //Ingots + + //OreDictionary.registerOre("ingotBloodSteel", new ItemStack(ModItems.itemIngotBloodSteel)); GT_OreDictUnificator.registerOre("ingotBloodSteel", new ItemStack(ModItems.itemIngotBloodSteel)); //OreDictionary.registerOre("ingotStaballoy", new ItemStack(ModItems.itemIngotStaballoy)); @@ -108,6 +119,11 @@ public class CommonProxy { //Blocks GT_OreDictUnificator.registerOre("blockStaballoy", new ItemStack(Item.getItemFromBlock(ModBlocks.blockStaballoy))); OreDictionary.registerOre("blockBloodSteel", new ItemStack(ModBlocks.blockBloodSteel)); + + + for(int i=1; i<=10; i++){ + GT_OreDictUnificator.registerOre("bufferCore_"+CORE.VOLTAGES[i-1], new ItemStack(Utils.getItem("miscutils:item.itemBufferCore"+i))); + } //InterMod diff --git a/src/Java/miscutil/core/handler/XEventHandler.java b/src/Java/miscutil/core/handler/XEventHandler.java index db6a03e3e6..b52547149d 100644 --- a/src/Java/miscutil/core/handler/XEventHandler.java +++ b/src/Java/miscutil/core/handler/XEventHandler.java @@ -9,6 +9,7 @@ import miscutil.gregtech.metatileentity.implementations.base.GregtechMetaSafeBlo import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent.BreakEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -52,19 +53,13 @@ public class XEventHandler { catch (NullPointerException e) { System.out.print("Caught a NullPointerException involving Safe Blocks. Cause: "+e.getCause()); } - - - - - - - - - - - - - - } + + + @SubscribeEvent + public void onPlayerInteraction(PlayerInteractEvent aEvent) { + if (aEvent.entityPlayer != null && aEvent.entityPlayer.worldObj != null && aEvent.action != null && aEvent.world.provider != null && !aEvent.entityPlayer.worldObj.isRemote && aEvent.action != null && aEvent.action != PlayerInteractEvent.Action.RIGHT_CLICK_AIR) { + Utils.LOG_ERROR("Test"); + } + } } diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java new file mode 100644 index 0000000000..2c6f6505c9 --- /dev/null +++ b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java @@ -0,0 +1,288 @@ +package miscutil.core.handler.registration; + +import gregtech.api.enums.ItemList; +import miscutil.core.util.ItemUtils; +import miscutil.core.util.Utils; +import miscutil.gregtech.enums.GregtechItemList; +import net.minecraft.item.ItemStack; + +public class RECIPES_Machines { + + //Outputs + //static ItemStack RECIPE_BufferCore_ULV = new ItemStack(GregtechEnergyBuffer.itemBufferCore); + static ItemStack RECIPE_SteamCondenser = GregtechItemList.Condensor_MAX.get(1); + static ItemStack RECIPE_Buffer_ULV = GregtechItemList.Energy_Buffer_1by1_ULV.get(1); + static ItemStack RECIPE_Buffer_LV = GregtechItemList.Energy_Buffer_1by1_LV.get(1); + static ItemStack RECIPE_Buffer_MV = GregtechItemList.Energy_Buffer_1by1_MV.get(1); + static ItemStack RECIPE_Buffer_HV = GregtechItemList.Energy_Buffer_1by1_HV.get(1); + static ItemStack RECIPE_Buffer_EV = GregtechItemList.Energy_Buffer_1by1_EV.get(1); + static ItemStack RECIPE_Buffer_IV = GregtechItemList.Energy_Buffer_1by1_IV.get(1); + static ItemStack RECIPE_Buffer_LuV = GregtechItemList.Energy_Buffer_1by1_LuV.get(1); + static ItemStack RECIPE_Buffer_ZPM = GregtechItemList.Energy_Buffer_1by1_ZPM.get(1); + static ItemStack RECIPE_Buffer_UV = GregtechItemList.Energy_Buffer_1by1_UV.get(1); + static ItemStack RECIPE_Buffer_MAX = GregtechItemList.Energy_Buffer_1by1_MAX.get(1); + + //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); + + + //Wire + static String wireTier1 = "wireGt08Lead"; + static String wireTier2 = "wireGt08Tin"; + static String wireTier3 = "wireGt08Copper"; + static String wireTier4 = "wireGt08Gold"; + static String wireTier5 = "wireGt08Aluminium"; + static String wireTier6 = "wireGt08Tungsten"; + static String wireTier7 = "wireGt08Osmium"; + static String wireTier8 = "wireGt08Naquadah"; + static String wireTier9 = "wireGt08Superconductor"; + static String wireTier10 = "wireGt16Superconductor"; + + //Wire + static String cableTier1 = "cableGt04Lead"; + static String cableTier2 = "cableGt04Tin"; + static String cableTier3 = "cableGt04Copper"; + static String cableTier4 = "cableGt04Gold"; + static String cableTier5 = "cableGt04Aluminium"; + static String cableTier6 = "cableGt04Tungsten"; + static String cableTier7 = "cableGt04Osmium"; + static String cableTier8 = "cableGt04Naquadah"; + static String cableTier9 = "cableGt04NiobiumTitanium"; + static String cableTier10 = "cableGt08NiobiumTitanium"; + + + //Plates + static String plateTier1 = "plateLead"; + static String plateTier2 = "plateTin"; + static String plateTier3 = "plateCopper"; + static String plateTier4 = "plateGold"; + static String plateTier5 = "plateAluminium"; + static String plateTier6 = "plateThorium"; + static String plateTier7 = "plateTungsten"; + static String plateTier8 = "plateTungstenSteel"; + static String plateTier9 = "plateOsmium"; + static String plateTier10 = "plateNaquadah"; + static String plateTier11 = "plateNeutronium"; + + + //Machine Casings + static ItemStack machineCasing_ULV = ItemList.Casing_ULV.get(1); + static ItemStack machineCasing_LV = ItemList.Casing_LV.get(1); + static ItemStack machineCasing_MV = ItemList.Casing_MV.get(1); + static ItemStack machineCasing_HV = ItemList.Casing_HV.get(1); + static ItemStack machineCasing_EV = ItemList.Casing_EV.get(1); + static ItemStack machineCasing_IV = ItemList.Casing_IV.get(1); + static ItemStack machineCasing_LuV = ItemList.Casing_LuV.get(1); + static ItemStack machineCasing_ZPM = ItemList.Casing_ZPM.get(1); + static ItemStack machineCasing_UV = ItemList.Casing_UV.get(1); + static ItemStack machineCasing_MAX = ItemList.Casing_MAX.get(1); + + //Cables + static String cableGt02Electrum = "cableGt02Electrum"; + + + //Plates + static String plateElectricalSteel= "plateElectricalSteel"; + static String plateEnergeticAlloy= "plateEnergeticAlloy"; + + //Pipes + static String pipeLargeCopper="pipeLargeCopper"; + static String pipeHugeSteel="pipeHugeSteel"; + + //Pumps + //gregtech:gt.metaitem.01:32611 + static ItemStack pump_MV = ItemList.Electric_Pump_MV.get(1); + + //Batteries + static String batteryBasic = "batteryBasic"; + static String batteryAdvanced = "batteryAdvanced"; + static String batteryElite = "batteryElite"; + static String batteryMaster = "batteryMaster"; + static String batteryUltimate = "batteryUltimate"; + + //Circuits + static String circuitPrimitive = "circuitPrimitive"; + static String circuitBasic = "circuitBasic"; + static String circuitGood = "circuitGood"; + static String circuitAdvanced = "circuitAdvanced"; + static String circuitData = "circuitData"; + static String circuitElite = "circuitElite"; + static String circuitMaster = "circuitMaster"; + static String circuitUltimate = "circuitUltimate"; + + + public static final void RECIPES_LOAD(){ + run(); + Utils.LOG_INFO("Loading Recipes for the Various machine blocks."); + } + + private static void run(){ + //Buffer Core + ItemUtils.recipeBuilder( + plateTier1, cableTier1, plateTier1, + circuitPrimitive, batteryBasic, circuitPrimitive, + plateTier1, cableTier1, plateTier1, + RECIPE_BufferCore_ULV); + ItemUtils.recipeBuilder( + plateTier2, cableTier2, plateTier2, + circuitBasic, batteryBasic, circuitBasic, + plateTier2, cableTier2, plateTier2, + RECIPE_BufferCore_LV); + ItemUtils.recipeBuilder( + plateTier3, cableTier3, plateTier3, + circuitGood, batteryAdvanced, circuitGood, + plateTier3, cableTier3, plateTier3, + RECIPE_BufferCore_MV); + ItemUtils.recipeBuilder( + plateTier4, cableTier4, plateTier4, + circuitAdvanced, batteryAdvanced, circuitAdvanced, + plateTier4, cableTier4, plateTier4, + RECIPE_BufferCore_HV); + ItemUtils.recipeBuilder( + plateTier5, cableTier5, plateTier5, + circuitData, batteryElite, circuitData, + plateTier5, cableTier5, plateTier5, + RECIPE_BufferCore_EV); + + ItemUtils.recipeBuilder( + plateTier6, cableTier6, plateTier6, + circuitData, batteryElite, circuitElite, + plateTier6, cableTier6, plateTier6, + RECIPE_BufferCore_IV); + ItemUtils.recipeBuilder( + plateTier7, cableTier7, plateTier7, + circuitElite, batteryMaster, circuitElite, + plateTier7, cableTier7, plateTier7, + RECIPE_BufferCore_LuV); + ItemUtils.recipeBuilder( + plateTier8, cableTier8, plateTier8, + circuitMaster, batteryMaster, circuitMaster, + plateTier8, cableTier8, plateTier8, + RECIPE_BufferCore_ZPM); + ItemUtils.recipeBuilder( + plateTier9, cableTier9, plateTier9, + circuitMaster, batteryUltimate, circuitUltimate, + plateTier9, cableTier9, plateTier9, + RECIPE_BufferCore_UV); + ItemUtils.recipeBuilder( + plateTier10, cableTier10, plateTier10, + circuitUltimate, batteryUltimate, circuitUltimate, + plateTier10, cableTier10, plateTier10, + RECIPE_BufferCore_MAX); + + + + + + + + + + + + + //Battery Buffer #1 + ItemUtils.recipeBuilder( + wireTier1, RECIPE_BufferCore_ULV, wireTier1, + wireTier1, machineCasing_ULV, wireTier1, + circuitPrimitive, null, circuitPrimitive, + RECIPE_Buffer_ULV); + + //Battery Buffer + ItemUtils.recipeBuilder( + wireTier2, RECIPE_BufferCore_LV, wireTier2, + wireTier2, machineCasing_LV, wireTier2, + circuitPrimitive, circuitBasic, circuitPrimitive, + RECIPE_Buffer_LV); + //Battery Buffer + ItemUtils.recipeBuilder( + wireTier3, RECIPE_BufferCore_MV, wireTier3, + wireTier3, machineCasing_MV, wireTier3, + circuitBasic, circuitGood, circuitBasic, + RECIPE_Buffer_MV); + //Battery Buffer + ItemUtils.recipeBuilder( + wireTier4, RECIPE_BufferCore_HV, wireTier4, + wireTier4, machineCasing_HV, wireTier4, + circuitGood, circuitAdvanced, circuitGood, + RECIPE_Buffer_HV); + //Battery Buffer + ItemUtils.recipeBuilder( + wireTier5, RECIPE_BufferCore_EV, wireTier5, + wireTier5, machineCasing_EV, wireTier5, + circuitAdvanced, circuitElite, circuitAdvanced, + RECIPE_Buffer_EV); + //Battery Buffer + ItemUtils.recipeBuilder( + wireTier6, RECIPE_BufferCore_IV, wireTier6, + wireTier6, machineCasing_IV, wireTier6, + circuitElite, circuitMaster, circuitElite, + RECIPE_Buffer_IV); + //Battery Buffer + ItemUtils.recipeBuilder( + wireTier7, RECIPE_BufferCore_LuV, wireTier7, + wireTier7, machineCasing_LuV, wireTier7, + circuitMaster, circuitElite, circuitMaster, + RECIPE_Buffer_LuV); + //Battery Buffer + ItemUtils.recipeBuilder( + wireTier8, RECIPE_BufferCore_ZPM, wireTier8, + wireTier8, machineCasing_ZPM, wireTier8, + circuitMaster, circuitUltimate, circuitMaster, + RECIPE_Buffer_ZPM); + //Battery Buffer + ItemUtils.recipeBuilder( + wireTier9, RECIPE_BufferCore_UV, wireTier9, + wireTier9, machineCasing_UV, wireTier9, + circuitUltimate, circuitMaster, circuitUltimate, + RECIPE_Buffer_UV); + //Battery Buffer + ItemUtils.recipeBuilder( + wireTier10, RECIPE_BufferCore_MAX, wireTier10, + wireTier10, machineCasing_MAX, wireTier10, + circuitUltimate, plateTier11, circuitUltimate, + RECIPE_Buffer_MAX); + + + + ItemUtils.recipeBuilder( + pipeLargeCopper, pipeHugeSteel, pipeLargeCopper, + plateEnergeticAlloy, pump_MV, plateEnergeticAlloy, + plateEnergeticAlloy, pipeLargeCopper, plateEnergeticAlloy, + RECIPE_SteamCondenser); + + Utils.LOG_INFO("Done loading recipes for the Various machine blocks."); + + + + + + + + + + + + + + + + + + + + + + + + } +} diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index f876a38fbd..140ec76b95 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -4,6 +4,9 @@ import static miscutil.core.creativetabs.AddToCreativeTab.tabMisc; import static miscutil.core.lib.CORE.LOAD_ALL_CONTENT; import miscutil.core.creativetabs.AddToCreativeTab; import miscutil.core.item.effects.RarityUncommon; +import miscutil.core.item.general.BufferCore; +import miscutil.core.item.tool.misc.SandstoneHammer; +import miscutil.core.item.tool.staballoy.StaballoyAxe; import miscutil.core.item.tool.staballoy.StaballoyPickaxe; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; @@ -102,16 +105,22 @@ public final class ModItems { //rfTools public static Item itemPlateDimensionShard; - //Misc Items + //Blood Steel Items public static Item itemIngotBloodSteel; public static Item itemPlateBloodSteel; //Staballoy public static Item itemStaballoyPickaxe; + public static Item itemStaballoyAxe; public static Item itemPlateStaballoy; public static Item itemIngotStaballoy; + + //Tools + public static Item itemSandstoneHammer; + //Machine Related + public static Item itemBufferCore0; //@SuppressWarnings("unused") @@ -197,11 +206,11 @@ public final class ModItems { Utils.LOG_INFO("Thaumcraft Found - Loading Resources."); //Item Init try { - itemPlateVoidMetal = new Item().setUnlocalizedName("itemPlateVoidMetal").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateVoidMetal");; + itemPlateVoidMetal = new Item().setUnlocalizedName("itemPlateVoidMetal").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateVoidMetal");; } catch (NullPointerException e){ e.getClass(); } - + //Registry GameRegistry.registerItem(itemPlateVoidMetal, "itemPlateVoidMetal"); @@ -215,7 +224,7 @@ 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(); } @@ -279,6 +288,9 @@ public final class ModItems { //Pickaxe itemStaballoyPickaxe = new StaballoyPickaxe("itemStaballoyPickaxe", STABALLOY).setCreativeTab(AddToCreativeTab.tabTools); GameRegistry.registerItem(itemStaballoyPickaxe, itemStaballoyPickaxe.getUnlocalizedName()); + //Axe + itemStaballoyAxe = new StaballoyAxe("itemStaballoyAxe", STABALLOY).setCreativeTab(AddToCreativeTab.tabTools); + GameRegistry.registerItem(itemStaballoyAxe, itemStaballoyAxe.getUnlocalizedName()); //Staballoy Ingot/Plate itemIngotStaballoy = new Item().setUnlocalizedName("itemIngotStaballoy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemIngotStaballoy");; GameRegistry.registerItem(itemIngotStaballoy, "itemIngotStaballoy"); @@ -294,13 +306,29 @@ public final class ModItems { itemPlateBloodSteel = new Item().setUnlocalizedName("itemPlateBloodSteel").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemPlateBloodSteel");; GameRegistry.registerItem(itemPlateBloodSteel, "itemPlateBloodSteel"); - - //Try some New Tools from GT - //ItemStack x = null; - //GregTech_API.constructHardHammerItem("unlocalalizedName", "Full name", 500 /**Max Damage**/,500 /**Entity Damage**/); - //GregTech_API.registerHardHammer(x); + //Sandstone Hammer + itemSandstoneHammer = new SandstoneHammer("itemSandstoneHammer").setCreativeTab(AddToCreativeTab.tabTools); + GameRegistry.registerItem(itemSandstoneHammer, itemSandstoneHammer.getUnlocalizedName()); + + /*itemBufferCore0 = new BufferCore("itemBufferCore", 1).setCreativeTab(AddToCreativeTab.tabMisc); + GameRegistry.registerItem(itemBufferCore0, itemBufferCore0.getUnlocalizedName()+((BufferCore) itemBufferCore0).getCoreTier());*/ + + Item itemBufferCore; + for(int i=1; i<=10; i++){ + Utils.LOG_INFO(""+i); + itemBufferCore = new BufferCore("itemBufferCore", i).setCreativeTab(AddToCreativeTab.tabMisc); + GameRegistry.registerItem(itemBufferCore, itemBufferCore.getUnlocalizedName()+i); + System.out.println("Buffer Core registration count is: "+i); + } + + //Try some New Tools from GT + //GT_Tool_Item x = null; + //x = GregTech_API.constructHardHammerItem("rockBelter", "Sandstone Hammer", 5000 /**Max Damage**/,50 /**Entity Damage**/); + //GregTech_API.registerHardHammer(x); + + } } diff --git a/src/Java/miscutil/core/item/base/BaseItemWithDamageValue.java b/src/Java/miscutil/core/item/base/BaseItemWithDamageValue.java new file mode 100644 index 0000000000..fdd770139d --- /dev/null +++ b/src/Java/miscutil/core/item/base/BaseItemWithDamageValue.java @@ -0,0 +1,28 @@ +package miscutil.core.item.base; + +import java.util.List; + +import miscutil.core.lib.CORE; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +public class BaseItemWithDamageValue extends Item{ + public BaseItemWithDamageValue(String unlocalizedName) { + this.setUnlocalizedName(unlocalizedName); + this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setMaxStackSize(1); + this.setMaxDamage(100); + } + @Override + public void setDamage(ItemStack stack, int damage) { + super.setDamage(stack, damage); + } + @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 diff --git a/src/Java/miscutil/core/item/BaseMetaItemTool.java b/src/Java/miscutil/core/item/base/BaseMetaItemTool.java index c0b552f721..bbd792cce4 100644 --- a/src/Java/miscutil/core/item/BaseMetaItemTool.java +++ b/src/Java/miscutil/core/item/base/BaseMetaItemTool.java @@ -1,4 +1,4 @@ -package miscutil.core.item; +package miscutil.core.item.base; public class BaseMetaItemTool { diff --git a/src/Java/miscutil/core/item/general/BufferCore.java b/src/Java/miscutil/core/item/general/BufferCore.java new file mode 100644 index 0000000000..7d014155ba --- /dev/null +++ b/src/Java/miscutil/core/item/general/BufferCore.java @@ -0,0 +1,92 @@ +package miscutil.core.item.general; + +import java.util.List; + +import miscutil.core.item.base.BaseItemWithDamageValue; +import miscutil.core.lib.CORE; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BufferCore extends BaseItemWithDamageValue{ + + public int coreTier = 0; + + public BufferCore(String unlocalizedName, int i) { + super(unlocalizedName); + this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setMaxStackSize(2); + this.coreTier = i; + } + + @Override + public String getItemStackDisplayName(ItemStack stack) { + return super.getItemStackDisplayName(stack)+" ["+CORE.VOLTAGES[this.coreTier-1]+"]."; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean requiresMultipleRenderPasses() + { + return true; + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + list.add(EnumChatFormatting.GRAY+"A key crafting component for making energy buffers."); + super.addInformation(stack, aPlayer, list, bool); + } + + public final int getCoreTier() { + return coreTier; + } + + @Override + public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + //Figure Out Damage + String s = String.format("%X", HEX_OxFFFFFF); + //Utils.LOG_INFO(s); + //String rgb = Utils.hex2Rgb(s); + //Utils.LOG_INFO(rgb); + if (coreTier == 1){ + HEX_OxFFFFFF = 0x4d4d4d; + } + else if (coreTier == 2){ + HEX_OxFFFFFF = 0x666666; + } + else if (coreTier == 3){ + HEX_OxFFFFFF = 0x8c8c8c; + } + else if (coreTier == 4){ + HEX_OxFFFFFF = 0xa6a6a6; + } + else if (coreTier == 5){ + HEX_OxFFFFFF = 0xcccccc; + } + else if (coreTier == 6){ + HEX_OxFFFFFF = 0xe6e6e6; + } + else if (coreTier == 7){ + HEX_OxFFFFFF = 0xffffcc; + } + else if (coreTier == 8){ + HEX_OxFFFFFF = 0xace600; + } + else if (coreTier == 9){ + HEX_OxFFFFFF = 0xffff00; + } + else if (coreTier == 10){ + HEX_OxFFFFFF = 0xff0000; + } + else { + HEX_OxFFFFFF = 0xffffff; + } + + + return HEX_OxFFFFFF; + } + +} diff --git a/src/Java/miscutil/core/item/tool/Loader_TOOLS.java b/src/Java/miscutil/core/item/tool/Loader_TOOLS.java index c88c39cb35..bd917df75f 100644 --- a/src/Java/miscutil/core/item/tool/Loader_TOOLS.java +++ b/src/Java/miscutil/core/item/tool/Loader_TOOLS.java @@ -1,26 +1,177 @@ package miscutil.core.item.tool; import miscutil.core.item.ModItems; +import miscutil.core.util.ItemUtils; +import miscutil.core.util.Utils; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; public class Loader_TOOLS { - private static //Tools - Item RECIPE_StaballoyPickaxe = ModItems.itemStaballoyPickaxe; + //Outputs + static ItemStack RECIPE_StaballoyPickaxe = new ItemStack(ModItems.itemStaballoyPickaxe); + static ItemStack RECIPE_StaballoyAxe = new ItemStack(ModItems.itemStaballoyAxe); + static ItemStack RECIPE_SandstoneHammer = new ItemStack(ModItems.itemSandstoneHammer); + static ItemStack RECIPE_StaballoyIngot = new ItemStack(ModItems.itemIngotStaballoy); + static ItemStack RECIPE_SandStone = new ItemStack(Blocks.sandstone, 2); + static ItemStack RECIPE_Sand = new ItemStack(Blocks.sand, 4); - //Dirt - //ItemStack dirtStack = new ItemStack(Block.dirt); + static ItemStack RECIPE_DivisionSigil = new ItemStack(Utils.getItem("ExtraUtilities:divisionSigil")); - //Materials + //MC Items + static Item Apple = Items.apple; + //MC Blocks + static Block CobbleStone = Blocks.cobblestone; + static Block Dirt = Blocks.dirt; + static Block Sand = Blocks.sand; + static Block Gravel = Blocks.gravel; + static Block Sandstone = Blocks.sandstone; + //null + static String empty = " "; - public static final void run(){ + //Batteries + static String batteryBasic = "batteryBasic"; + static String batteryAdvanced = "batteryAdvanced"; + static String batteryElite = "batteryElite"; + static String batteryMaster = "batteryMaster"; + static String batteryUltimate = "batteryUltimate"; + + //Circuits + static String circuitPrimitive = "circuitPrimitive"; + static String circuitBasic = "circuitBasic"; + static String circuitGood = "circuitGood"; + static String circuitAdvanced = "circuitAdvanced"; + static String circuitElite = "circuitElite"; + static String circuitMaster = "circuitMaster"; + static String circuitUltimate = "circuitUltimate"; + + //Cables + static String cableGt01Electrum = "cableGt01Electrum"; + static String cableGt02Electrum = "cableGt02Electrum"; + static String cableGt01RedstoneAlloy = "cableGt01RedstoneAlloy"; + static String cableGt02RedstoneAlloy = "cableGt02RedstoneAlloy"; + static String cableGt01Copper = "cableGt01Copper"; + static String cableGt02Copper = "cableGt02Copper"; + static String cableGt01AnnealedCopper = "cableGt01AnnealedCopper"; + static String cableGt02AnnealedCopper = "cableGt02AnnealedCopper"; + + //Rods + static String stickStaballoy= "stickStaballoy"; + static String stickTitanium= "stickTitanium"; + static String stickIron= "stickIron"; + static String stickGold= "stickGold"; + static String stickSilver= "stickSilver"; + static String stickSteel= "stickSteel"; + static String stickBronze= "stickBronze"; + static String stickTungsten= "stickTungsten"; + static String stickRedAlloy= "stickRedAlloy"; + static String stickInvar= "stickInvar"; + static String stickElectrum= "stickElectrum"; + static String stickElectricalSteel= "stickElectricalSteel"; + + //Plates + static String plateStaballoy= "plateStaballoy"; + static String plateTitanium= "plateTitanium"; + static String plateIron= "plateIron"; + static String plateGold= "plateGold"; + static String plateSilver= "plateSilver"; + static String plateSteel= "plateSteel"; + static String plateBronze= "plateBronze"; + static String plateTungsten= "plateTungsten"; + static String plateRedAlloy= "plateRedAlloy"; + static String plateInvar= "plateInvar"; + static String plateElectrum= "plateElectrum"; + static String plateElectricalSteel= "plateElectricalSteel"; + + //Ingots + static String ingotStaballoy= "ingotStaballoy"; + static String ingotTitanium= "ingotTitanium"; + static String ingotIron= "ingotIron"; + static String ingotGold= "ingotGold"; + static String ingotSilver= "ingotSilver"; + static String ingotSteel= "ingotSteel"; + static String ingotBronze= "ingotBronze"; + static String ingotTungsten= "ingotTungsten"; + static String ingotRedAlloy= "ingotRedAlloy"; + static String ingotInvar= "ingotInvar"; + static String ingotElectrum= "ingotElectrum"; + static String ingotUranium= "ingotUranium"; + static String ingotElectricalSteel= "ingotElectricalSteel"; + + //Crafting Tools + static String craftingToolHardHammer = "craftingToolHardHammer"; + static String craftingToolSoftHammer = "craftingToolSoftHammer"; + static String craftingToolFile = "craftingToolFile"; + static String craftingToolSaw = "craftingToolSaw"; + static String craftingToolPickaxe = "craftingToolPickaxe"; + static String craftingToolWrench = "craftingToolWrench"; + static String craftingToolCrowbar = "craftingToolCrowbar"; + static String craftingToolKnife = "craftingToolKnife"; + static String craftingToolScrewdriver = "craftingToolScrewdriver"; + + static ItemStack sandHammer = new ItemStack (ModItems.itemSandstoneHammer, 1, OreDictionary.WILDCARD_VALUE); + static String craftingToolSandHammer = "craftingToolSandHammer"; + + public static final void run(){ + + //plateStaballoy = new ItemStack(ModItems.itemPlateStaballoy); + //ingotStaballoy = new ItemStack(ModItems.itemIngotStaballoy); + + //Pickaxes + registerPickaxes(); } private static void registerPickaxes(){ - //Utils.recipeBuilderItem("plateStaballoy", "plateStaballoy", "ingotStaballoy", null, "plateStaballoy", null, null, null, null, RECIPE_StaballoyPickaxe); + //Staballoy Pickaxe + ItemUtils.recipeBuilder( + plateStaballoy, plateStaballoy, ingotStaballoy, + craftingToolFile, stickTungsten, craftingToolHardHammer, + craftingToolWrench, stickTungsten, craftingToolHardHammer, + RECIPE_StaballoyPickaxe); + + //Staballoy Axe + ItemUtils.recipeBuilder( + plateStaballoy, ingotStaballoy, craftingToolHardHammer, + plateStaballoy, stickTungsten, craftingToolHardHammer, + craftingToolFile, stickTungsten, craftingToolWrench, + RECIPE_StaballoyAxe); + + //Cobble to Sand + ItemUtils.recipeBuilder( + CobbleStone, CobbleStone, CobbleStone, + CobbleStone, sandHammer, CobbleStone, + CobbleStone, CobbleStone, CobbleStone, + RECIPE_Sand); + + //Sand to Sandstone + ItemUtils.recipeBuilder( + Sand, Sand, Sand, + Sand, sandHammer, Sand, + Sand, Sand, Sand, + RECIPE_SandStone); + + //Sandstone Hammer + ItemUtils.recipeBuilder( + plateElectrum, ingotElectrum, plateElectrum, + craftingToolScrewdriver, stickBronze, craftingToolHardHammer, + null, stickSteel, null, + RECIPE_SandstoneHammer); + + //Division Sigil + ItemUtils.recipeBuilder( + "plateNetherStar", "gemIridium", "plateNetherStar", + "plateIridium", craftingToolHardHammer, "plateIridium", + "plateNetherStar", "gemIridium", "plateNetherStar", + RECIPE_DivisionSigil); + + } } diff --git a/src/Java/miscutil/core/item/tool/misc/SandstoneHammer.java b/src/Java/miscutil/core/item/tool/misc/SandstoneHammer.java new file mode 100644 index 0000000000..6f4f40aed5 --- /dev/null +++ b/src/Java/miscutil/core/item/tool/misc/SandstoneHammer.java @@ -0,0 +1,63 @@ +package miscutil.core.item.tool.misc; + +import java.util.List; + +import miscutil.core.item.base.BaseItemWithDamageValue; +import miscutil.core.lib.CORE; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +public class SandstoneHammer extends BaseItemWithDamageValue{ + + /* (non-Javadoc) + * @see net.minecraft.item.Item#getColorFromItemStack(net.minecraft.item.ItemStack, int) + */ + @Override + public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + //Figure Out Damage + + + return super.getColorFromItemStack(stack, HEX_OxFFFFFF); + } + + public SandstoneHammer(String unlocalizedName) { + super(unlocalizedName); + this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setMaxStackSize(1); + this.setMaxDamage(2500); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + list.add(EnumChatFormatting.GRAY+"Allows you to craft sand from cobble, or sandstone from sand."); + super.addInformation(stack, aPlayer, list, bool); + } + + @Override + public boolean doesContainerItemLeaveCraftingGrid(ItemStack itemStack) + { + return false; + } + + @Override + public boolean getShareTag() + { + return true; + } + + @Override + public boolean hasContainerItem(ItemStack itemStack) + { + return true; + } + @Override + public ItemStack getContainerItem(ItemStack itemStack) + { + itemStack.setItemDamage(itemStack.getItemDamage() + 8); + + return itemStack; + } + +} diff --git a/src/Java/miscutil/core/item/tool/staballoy/StaballoyAxe.java b/src/Java/miscutil/core/item/tool/staballoy/StaballoyAxe.java index 64ed49f80c..9637787e93 100644 --- a/src/Java/miscutil/core/item/tool/staballoy/StaballoyAxe.java +++ b/src/Java/miscutil/core/item/tool/staballoy/StaballoyAxe.java @@ -1,5 +1,7 @@ package miscutil.core.item.tool.staballoy; +import java.util.List; + import miscutil.core.lib.CORE; import net.minecraft.block.Block; import net.minecraft.block.BlockAir; @@ -17,24 +19,22 @@ import net.minecraft.block.BlockSnow; import net.minecraft.block.BlockSnowBlock; import net.minecraft.block.BlockTallGrass; import net.minecraft.block.BlockVine; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; public class StaballoyAxe extends ItemAxe{ public String mat; - public StaballoyAxe(ToolMaterial material, String materialName) { + public StaballoyAxe(String unlocalizedName, ToolMaterial material) { super(material); - mat=materialName; - setCreativeTab(CreativeTabs.tabTools); - setUnlocalizedName("lumberaxe"+mat); - setTextureName(CORE.MODID+":lumberaxe_"+mat); + this.setUnlocalizedName(unlocalizedName); + this.setTextureName(CORE.MODID + ":" + unlocalizedName); } // EXPLODE TREE @@ -51,6 +51,14 @@ public class StaballoyAxe extends ItemAxe{ return true; } + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + list.add(EnumChatFormatting.GOLD+"Fells entire trees in a single swipe!.."); + list.add(EnumChatFormatting.GRAY+"Ask Alkalus for new trees to be supported."); + super.addInformation(stack, aPlayer, list, bool); + } + public boolean canIgnore(Block bit){ if (bit instanceof BlockAir)return true; if (bit instanceof BlockGrass)return true; diff --git a/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java b/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java index 7e5db8691d..0eee4cd165 100644 --- a/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java +++ b/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java @@ -68,6 +68,7 @@ public class StaballoyPickaxe extends ItemPickaxe{ return super.onBlockDestroyed(stack, world, block, X, Y, Z, entity); } + @SuppressWarnings("static-method") private float calculateDurabilityLoss(World world, int X, int Y, int Z){ float bDurabilityLoss = 0; Boolean correctTool = false; @@ -173,7 +174,6 @@ public class StaballoyPickaxe extends ItemPickaxe{ } //Should clear up blocks quicker if I chain it. - @SuppressWarnings("static-method") private void removeBlockAndDropAsItem(World world, int X, int Y, int Z, ItemStack heldItem){ localWorld = world; try { @@ -273,16 +273,8 @@ public class StaballoyPickaxe extends ItemPickaxe{ @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - String facing; - thisPickaxe = stack; - - if (FACING_HORIZONTAL){ - facing = "Horizontal"; - } - else { - facing = "Vertical"; - } - list.add(EnumChatFormatting.GOLD+"Mines a 3x3 area on an axis. Currently Facing:"+facing); + thisPickaxe = stack; + list.add(EnumChatFormatting.GOLD+"Mines a 3x3 area in the direction you are facing."); super.addInformation(stack, aPlayer, list, bool); } diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java index d7b8ce9919..9edad2fc12 100644 --- a/src/Java/miscutil/core/lib/CORE.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -9,10 +9,12 @@ public class CORE { public static final String name = "Misc. Utils"; public static final String MODID = "miscutils"; public static final String VERSION = "0.9.8"; - public static final boolean DEBUG = true; + public static final boolean DEBUG = false; public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; public static Map PlayerCache; + public static final String[] VOLTAGES = {"ULV","LV","MV","HV","EV","IV","LuV","ZPM","UV","MAX"}; + public static final Class<AddToCreativeTab> TAB = AddToCreativeTab.class; diff --git a/src/Java/miscutil/core/util/ItemUtils.java b/src/Java/miscutil/core/util/ItemUtils.java new file mode 100644 index 0000000000..e2c07aa104 --- /dev/null +++ b/src/Java/miscutil/core/util/ItemUtils.java @@ -0,0 +1,156 @@ +package miscutil.core.util; + +import java.util.ArrayList; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; +import cpw.mods.fml.common.registry.GameRegistry; + +public class ItemUtils { + + public static ItemStack getItemStackOfItem(Boolean modToCheck, String mod_itemname_meta){ + if (modToCheck){ + try{ + Item em = null; + + Item em1 = Utils.getItem(mod_itemname_meta); + Utils.LOG_WARNING("Found: "+em1.toString()); + if (!em1.equals(null)){ + em = em1; + } + else { + em = null; + return null; + } + if (!em.equals(null)){ + ItemStack returnStack = new ItemStack(em,1,16); + return returnStack; + } + Utils.LOG_WARNING(mod_itemname_meta+" not found."); + return null; + } catch (NullPointerException e) { + Utils.LOG_ERROR(mod_itemname_meta+" not found. [NULL]"); + return null; + } + } + return null; + } + + public static void 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){ + + ArrayList<Object> validSlots = new ArrayList<Object>(); + + //, String lineFirst, String lineSecond, String lineThird + Utils.LOG_INFO("Trying to add a recipe for "+resultItem.toString()); + String a,b,c,d,e,f,g,h,i; + //ItemStack empty = new ItemStack(Blocks.air); + if (slot_1 == null){ a = " ";} else { a = "1";validSlots.add('1');validSlots.add(slot_1);} + Utils.LOG_WARNING(a); + if (slot_2 == null){ b = " ";} else { b = "2";validSlots.add('2');validSlots.add(slot_2);} + Utils.LOG_WARNING(b); + if (slot_3 == null){ c = " ";} else { c = "3";validSlots.add('3');validSlots.add(slot_3);} + Utils.LOG_WARNING(c); + if (slot_4 == null){ d = " ";} else { d = "4";validSlots.add('4');validSlots.add(slot_4);} + Utils.LOG_WARNING(d); + if (slot_5 == null){ e = " ";} else { e = "5";validSlots.add('5');validSlots.add(slot_5);} + Utils.LOG_WARNING(e); + if (slot_6 == null){ f = " ";} else { f = "6";validSlots.add('6');validSlots.add(slot_6);} + Utils.LOG_WARNING(f); + if (slot_7 == null){ g = " ";} else { g = "7";validSlots.add('7');validSlots.add(slot_7);} + Utils.LOG_WARNING(g); + if (slot_8 == null){ h = " ";} else { h = "8";validSlots.add('8');validSlots.add(slot_8);} + Utils.LOG_WARNING(h); + if (slot_9 == null){ i = " ";} else { i = "9";validSlots.add('9');validSlots.add(slot_9);} + Utils.LOG_WARNING(i); + + + Utils.LOG_ERROR("_______"); + String lineOne = a+b+c; + Utils.LOG_ERROR("|"+a+"|"+b+"|"+c+"|"); + Utils.LOG_ERROR("_______"); + String lineTwo = d+e+f; + Utils.LOG_ERROR("|"+d+"|"+e+"|"+f+"|"); + Utils.LOG_ERROR("_______"); + String lineThree = g+h+i; + Utils.LOG_ERROR("|"+g+"|"+h+"|"+i+"|"); + Utils.LOG_ERROR("_______"); + + validSlots.add(0, lineOne); + validSlots.add(1, lineTwo); + validSlots.add(2, lineThree); + Boolean AadvancedLog = true; + if (AadvancedLog){ + int j = 0; + int l = validSlots.size(); + Utils.LOG_WARNING("l:"+l); + while (j <= l) { + Utils.LOG_WARNING("j:"+j); + if (j <= 2){ + Utils.LOG_WARNING("ArrayList Values: "+validSlots.get(j)); + Utils.LOG_WARNING("Adding 1."); + j++; + } + else if (j >= 3){ + Utils.LOG_WARNING("ArrayList Values: '"+validSlots.get(j)+"' "+validSlots.get(j+1)); + if (j < (l-2)){ + Utils.LOG_WARNING("Adding 2."); + j=j+2; + } + else { + Utils.LOG_WARNING("Done iteration."); + break; + } + } + else if (j == l){ + Utils.LOG_WARNING("Done iteration."); + break; + } + if (validSlots.get(j) instanceof String || validSlots.get(j) instanceof ItemStack){ + //Utils.LOG_WARNING("Is Valid: "+validSlots.get(j)); + } + } + } + + try { + Utils.LOG_WARNING("validSlots to array: "+validSlots.toArray()); + Object[] validSlotsArray = (Object[]) validSlots.toArray(); + + for(int j = 0; j < validSlotsArray.length; j++) + { + Utils.LOG_ERROR(""+validSlotsArray[j]); + } + try { + try { + try { + GameRegistry.addRecipe(new ShapedOreRecipe(resultItem.copy(), (Object[]) validSlots.toArray())); + Utils.LOG_INFO("Success! Added a recipe for "+resultItem.toString()); + } + catch (ClassCastException r){ + Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+resultItem.getUnlocalizedName()); + r.printStackTrace(); + System.exit(1); + } + } + catch (NullPointerException o){ + + Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+resultItem.getUnlocalizedName()); + o.printStackTrace(); + System.exit(1); + } + } + catch (ClassCastException r){ + Utils.LOG_WARNING("@@@: Casting to ObjectArray Failed :("); + } + } + catch(NullPointerException k){ + k.getMessage(); + k.getClass(); + k.printStackTrace(); + k.getLocalizedMessage(); + Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+resultItem.getUnlocalizedName()); + System.exit(1); + } + } + +} diff --git a/src/Java/miscutil/core/util/Utils.java b/src/Java/miscutil/core/util/Utils.java index 10375f3f8e..a4b75d87d7 100644 --- a/src/Java/miscutil/core/util/Utils.java +++ b/src/Java/miscutil/core/util/Utils.java @@ -2,6 +2,7 @@ package miscutil.core.util; import static gregtech.api.enums.GT_Values.F; +import java.awt.Color; import java.awt.Graphics; import java.util.Random; @@ -138,6 +139,12 @@ public class Utils { 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; @@ -146,28 +153,21 @@ public class Utils { }catch(NullPointerException e){return null;} if (heldItem != null){ - return heldItem; - } + 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), - slot_1, slot_2, slot_3, - slot_4, slot_5, slot_6, - slot_7, slot_8, slot_9); } - - public static void recipeBuilderItem(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, Item resultItem){ - GameRegistry.addRecipe( - new ItemStack(resultItem), - slot_1, slot_2, slot_3, - slot_4, slot_5, slot_6, - slot_7, slot_8, slot_9); - } - + + /*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), + new Object[] {"ABC", "DEF", "GHI", + 'A',slot_1,'B',slot_2,'C',slot_3, + 'D',slot_4,'E',slot_5,'F',slot_6, + 'G',slot_7,'H',slot_8,'I',slot_9 + }); + }*/ + public static String checkCorrectMiningToolForBlock(Block currentBlock, World currentWorld){ String correctTool = ""; if (!currentWorld.isRemote){ @@ -182,4 +182,26 @@ public class Utils { return correctTool; } + + /** + * + * @param colorStr e.g. "#FFFFFF" + * @return String - formatted "rgb(0,0,0)" + */ + public static String hex2Rgb(String hexString) { + Color c = new Color( + Integer.valueOf(hexString.substring(1, 3), 16), + Integer.valueOf(hexString.substring(3, 5), 16), + Integer.valueOf(hexString.substring(5, 7), 16)); + + StringBuffer sb = new StringBuffer(); + sb.append("rgb("); + sb.append(c.getRed()); + sb.append(","); + sb.append(c.getGreen()); + sb.append(","); + sb.append(c.getBlue()); + sb.append(")"); + return sb.toString(); + } } diff --git a/src/Java/miscutil/gregtech/enums/AddExtraOreDict.java b/src/Java/miscutil/gregtech/enums/AddExtraOreDict.java index 4b3e352292..171bdda533 100644 --- a/src/Java/miscutil/gregtech/enums/AddExtraOreDict.java +++ b/src/Java/miscutil/gregtech/enums/AddExtraOreDict.java @@ -1,16 +1,13 @@ package miscutil.gregtech.enums; -import gregtech.api.util.GT_OreDictUnificator; import gregtech.loaders.preload.GT_Loader_OreDictionary; -import miscutil.gregtech.init.machines.GregtechEnergyBuffer; -import net.minecraft.item.ItemStack; public class AddExtraOreDict extends GT_Loader_OreDictionary { @Override public void run() { - GT_OreDictUnificator.registerOre(ExtraOreDictNames.buffer_core, new ItemStack(GregtechEnergyBuffer.itemBufferCore)); + //GT_OreDictUnificator.registerOre(ExtraOreDictNames.buffer_core, new ItemStack(GregtechEnergyBuffer.itemBufferCore)); } } diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java b/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java index 7267c005d5..ab96340365 100644 --- a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java +++ b/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java @@ -4,23 +4,17 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; -import miscutil.core.creativetabs.AddToCreativeTab; -import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.gregtech.enums.ExtraOreDictNames; import miscutil.gregtech.enums.GregtechItemList; import miscutil.gregtech.metatileentity.implementations.GregtechMetaCreativeEnergyBuffer; import miscutil.gregtech.metatileentity.implementations.GregtechMetaEnergyBuffer; -import net.minecraft.item.Item; -import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; public class GregtechEnergyBuffer { //Misc Items - public static Item itemBufferCore; + //public static Item itemBufferCore; public static void run() { @@ -35,12 +29,12 @@ public class GregtechEnergyBuffer private static void run1() { - itemBufferCore = new Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemBufferCore");; + //itemBufferCore = new Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemBufferCore"); //Registry - GameRegistry.registerItem(itemBufferCore, "itemBufferCore"); - LanguageRegistry.addName(itemBufferCore, "Buffer Core"); - OreDictionary.registerOre("itemBufferCore", itemBufferCore); + //GameRegistry.registerItem(itemBufferCore, "itemBufferCore"); + //LanguageRegistry.addName(itemBufferCore, "Buffer Core"); + //OreDictionary.registerOre("itemBufferCore", itemBufferCore); //Energy Buffers diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCondensor.java b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCondensor.java index 82f1ad98be..95e12a5ed9 100644 --- a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCondensor.java +++ b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCondensor.java @@ -41,8 +41,8 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase{ rTextures[0][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa))}; rTextures[1][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; rTextures[2][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; - rTextures[3][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER) }; - rTextures[4][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER_ACTIVE) }; + rTextures[3][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER) }; + rTextures[4][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE) }; } return rTextures; } diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang index bf9e663cbd..e101a47451 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -46,7 +46,9 @@ tile.ArcaneInfuser.name=Arcane Infuser tile.blockToolBuilder.name=GregTech Tool Constructor item.itemBufferCore.name=Buffer Core -item.itemStaballoyPickaxe.name=Pick of the Ages +item.itemStaballoyPickaxe.name=Tunnel Digger +item.itemStaballoyAxe.name=Tree Feller +item.itemSandstoneHammer.name=Cobblestone Breaker item.itemIngotStaballoy.name=Staballoy Ingot item.itemPlateStaballoy.name=Staballoy Plate diff --git a/src/resources/assets/miscutils/textures/items/itemBufferCore.png b/src/resources/assets/miscutils/textures/items/itemBufferCore.png Binary files differindex fc6c4163a6..6dd01c09d9 100644 --- a/src/resources/assets/miscutils/textures/items/itemBufferCore.png +++ b/src/resources/assets/miscutils/textures/items/itemBufferCore.png diff --git a/src/resources/assets/miscutils/textures/items/itemBufferCore_OLD (2).png b/src/resources/assets/miscutils/textures/items/itemBufferCore_OLD (2).png Binary files differnew file mode 100644 index 0000000000..fe24141968 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/itemBufferCore_OLD (2).png diff --git a/src/resources/assets/miscutils/textures/items/itemBufferCore_OLD.png b/src/resources/assets/miscutils/textures/items/itemBufferCore_OLD.png Binary files differnew file mode 100644 index 0000000000..fc6c4163a6 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/itemBufferCore_OLD.png diff --git a/src/resources/assets/miscutils/textures/items/itemSandstoneHammer.png b/src/resources/assets/miscutils/textures/items/itemSandstoneHammer.png Binary files differnew file mode 100644 index 0000000000..77c67f0814 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/itemSandstoneHammer.png diff --git a/src/resources/assets/miscutils/textures/items/itemStaballoyAxe.png b/src/resources/assets/miscutils/textures/items/itemStaballoyAxe.png Binary files differnew file mode 100644 index 0000000000..0fe6015831 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/itemStaballoyAxe.png |
.png?id=915139115434ff5797df6f82a63578e938864016){kind=link}
