From aa0d2de7609c957944dc859fb1b93eb4ca1377e5 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 13 Mar 2016 18:05:51 +1000 Subject: 0.9.4_Public release build files. --- src/Java/miscutil/core/block/AdvancedBlock.java | 4 +- src/Java/miscutil/core/block/BasicBlock.java | 4 +- src/Java/miscutil/core/block/ModBlocks.java | 6 +-- .../miscutil/core/block/antigrief/TowerDevice.java | 4 +- src/Java/miscutil/core/common/CommonProxy.java | 15 +++--- .../core/creativetabs/AddToCreativeTab.java | 5 +- src/Java/miscutil/core/gui/GUI_Bat_Buf.java | 8 +-- src/Java/miscutil/core/item/ModItems.java | 62 +++++++++++----------- .../core/item/tool/bloodsteel/BloodSteelArmor.java | 6 +-- .../core/item/tool/staballoy/StaballoyPickaxe.java | 4 +- src/Java/miscutil/core/lib/CORE.java | 25 +++++++++ src/Java/miscutil/core/lib/Strings.java | 25 --------- src/Java/miscutil/core/util/Utils.java | 8 +-- 13 files changed, 89 insertions(+), 87 deletions(-) create mode 100644 src/Java/miscutil/core/lib/CORE.java delete mode 100644 src/Java/miscutil/core/lib/Strings.java (limited to 'src/Java/miscutil/core') diff --git a/src/Java/miscutil/core/block/AdvancedBlock.java b/src/Java/miscutil/core/block/AdvancedBlock.java index 2a81341838..3ad2454be4 100644 --- a/src/Java/miscutil/core/block/AdvancedBlock.java +++ b/src/Java/miscutil/core/block/AdvancedBlock.java @@ -1,6 +1,6 @@ package miscutil.core.block; -import miscutil.core.lib.Strings; +import miscutil.core.lib.CORE; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -13,7 +13,7 @@ public class AdvancedBlock extends Block { String blockHarvestTool, int blockHarvestLevel, SoundType BlockSound) { super(material); this.setBlockName(unlocalizedName); - this.setBlockTextureName(Strings.MODID + ":" + unlocalizedName); + this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); this.setCreativeTab(x); this.setHardness(blockHardness); //block Hardness this.setResistance(blockResistance); diff --git a/src/Java/miscutil/core/block/BasicBlock.java b/src/Java/miscutil/core/block/BasicBlock.java index 25009e77ba..31a92d47a5 100644 --- a/src/Java/miscutil/core/block/BasicBlock.java +++ b/src/Java/miscutil/core/block/BasicBlock.java @@ -1,7 +1,7 @@ package miscutil.core.block; import miscutil.core.creativetabs.AddToCreativeTab; -import miscutil.core.lib.Strings; +import miscutil.core.lib.CORE; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -10,7 +10,7 @@ public class BasicBlock extends Block { protected BasicBlock(String unlocalizedName, Material material) { super(material); this.setBlockName(unlocalizedName); - this.setBlockTextureName(Strings.MODID + ":" + unlocalizedName); + this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); this.setCreativeTab(AddToCreativeTab.tabBlock); this.setHardness(2.0F); this.setResistance(6.0F); diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java index 16475b2c68..991b35ad14 100644 --- a/src/Java/miscutil/core/block/ModBlocks.java +++ b/src/Java/miscutil/core/block/ModBlocks.java @@ -37,19 +37,19 @@ public final class ModBlocks { blockGriefSaver = new TowerDevice().setBlockName("blockGriefSaver").setCreativeTab(AddToCreativeTab.tabBlock).setBlockTextureName("blockDefault"); //BloodSteelorial Furnace - Must Init blocks first as they're not static. - /** if (Strings.DEBUG){ + /** if (CORE.DEBUG){ FMLLog.info("Loading Furnace.");} tutFurnace= new BloodSteelFurnace(false).setBlockName("BloodSteelFurnace").setCreativeTab(TMCreativeTabs.tabBlock); tutFurnaceActive= new BloodSteelFurnace(true).setBlockName("BloodSteelFurnaceActive"); //Arcane Infuser - Must Init blocks first as they're not static. - if (Strings.DEBUG){ + if (CORE.DEBUG){ FMLLog.info("Loading Arcane Infuser.");} arcaneInfuser = new ArcaneInfuser(false).setBlockName("ArcaneInfuser").setCreativeTab(TMCreativeTabs.tabBlock); arcaneInfuserActive = new ArcaneInfuser(true).setBlockName("ArcaneInfuserActive"); //Blood Steel Chest - if (Strings.DEBUG){ + if (CORE.DEBUG){ FMLLog.info("Loading Blood Steel Chest.");} tutChest = new BloodSteelChest(0).setBlockName("BloodSteelChest").setCreativeTab(TMCreativeTabs.tabBlock); diff --git a/src/Java/miscutil/core/block/antigrief/TowerDevice.java b/src/Java/miscutil/core/block/antigrief/TowerDevice.java index aea1d40921..5299875355 100644 --- a/src/Java/miscutil/core/block/antigrief/TowerDevice.java +++ b/src/Java/miscutil/core/block/antigrief/TowerDevice.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Random; import miscutil.core.creativetabs.AddToCreativeTab; -import miscutil.core.lib.Strings; +import miscutil.core.lib.CORE; import miscutil.core.tileentities.TileEntityReverter; import miscutil.core.util.Utils; import net.minecraft.block.Block; @@ -50,7 +50,7 @@ public class TowerDevice extends Block { @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister par1IconRegister) { - TEX_ANTIBUILDER = par1IconRegister.registerIcon(Strings.MODID + ":" + "blockAntiGrief"); + TEX_ANTIBUILDER = par1IconRegister.registerIcon(CORE.MODID + ":" + "blockAntiGrief"); } public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java index a7eb0bbcfd..7471425283 100644 --- a/src/Java/miscutil/core/common/CommonProxy.java +++ b/src/Java/miscutil/core/common/CommonProxy.java @@ -1,16 +1,15 @@ package miscutil.core.common; +import static miscutil.core.lib.CORE.DEBUG; import static miscutil.core.lib.LoadedMods.Gregtech; -import static miscutil.core.lib.Strings.DEBUG; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.block.ModBlocks; import miscutil.core.gui.ModGUI; import miscutil.core.item.ModItems; +import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; -import miscutil.core.lib.Strings; import miscutil.core.tileentities.ModTileEntities; import miscutil.core.util.Utils; -import miscutil.enderio.init.InitEnderIO; import miscutil.gregtech.init.InitGregtech; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -23,7 +22,7 @@ public class CommonProxy { public void preInit(FMLPreInitializationEvent e) { /* * - * Strings.DEBUG Parameters area + * CORE.DEBUG Parameters area * */ //Logs @@ -37,7 +36,7 @@ public class CommonProxy { Utils.LOG_WARNING("Development mode not set."); } /* - * End Strings.DEBUG + * End CORE.DEBUG */ ModItems.init(); ModBlocks.init(); @@ -45,8 +44,8 @@ public class CommonProxy { /** * Enable Dev mode related content */ - if (Strings.DEBUG){ - InitEnderIO.run(); + if (CORE.DEBUG){ + //InitEnderIO.run(); } //Register Gregtech related items @@ -83,7 +82,7 @@ public class CommonProxy { ModTileEntities.init(); //GameRegistry.registerTileEntity(TileEntityBloodSteelChest.class, "tileEntityBloodSteelChest"); //GameRegistry.registerTileEntity(TileEntityBloodSteelFurnace.class, "tileEntityBloodSteelFurnace"); - //GameRegistry.registerTileEntity(TileEntityBloodSteelChest.class, Strings.MODID); + //GameRegistry.registerTileEntity(TileEntityBloodSteelChest.class, CORE.MODID); //GameRegistry.registerTileEntity(TileEntityArcaneInfuser.class, "TileEntityArcaneInfuser"); } diff --git a/src/Java/miscutil/core/creativetabs/AddToCreativeTab.java b/src/Java/miscutil/core/creativetabs/AddToCreativeTab.java index 90f61b2560..57ab17168d 100644 --- a/src/Java/miscutil/core/creativetabs/AddToCreativeTab.java +++ b/src/Java/miscutil/core/creativetabs/AddToCreativeTab.java @@ -1,5 +1,6 @@ package miscutil.core.creativetabs; +import miscutil.core.lib.CORE; import net.minecraft.creativetab.CreativeTabs; public class AddToCreativeTab { @@ -13,8 +14,10 @@ public class AddToCreativeTab { public static void initialiseTabs(){ tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab"); tabMisc = new MiscUtilCreativeTabMisc("MiscUtilMiscTab"); - tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); //tabCombat = new MiscUtilCreativeTabCombat("MiscUtilCombatTab"); tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab"); + if (CORE.DEBUG){ + tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); + } } } diff --git a/src/Java/miscutil/core/gui/GUI_Bat_Buf.java b/src/Java/miscutil/core/gui/GUI_Bat_Buf.java index efe42c7257..db37520885 100644 --- a/src/Java/miscutil/core/gui/GUI_Bat_Buf.java +++ b/src/Java/miscutil/core/gui/GUI_Bat_Buf.java @@ -1,6 +1,6 @@ package miscutil.core.gui; -import miscutil.core.lib.Strings; +import miscutil.core.lib.CORE; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -34,15 +34,15 @@ public class GUI_Bat_Buf extends GuiScreen bookPageTextures[0] = new ResourceLocation( - Strings.MODID+":textures/gui/book_cover.png"); + CORE.MODID+":textures/gui/book_cover.png"); bookPageTextures[1] = new ResourceLocation( - Strings.MODID+":textures/gui/book.png"); + CORE.MODID+":textures/gui/book.png"); bookPageTextures[2] = new ResourceLocation( - Strings.MODID+":textures/gui/book.png"); + CORE.MODID+":textures/gui/book.png"); stringPageText[0] = ""; diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index 06fba3d35a..814f0a10d6 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -1,12 +1,12 @@ package miscutil.core.item; import static miscutil.core.creativetabs.AddToCreativeTab.tabMisc; -import static miscutil.core.lib.Strings.LOAD_ALL_CONTENT; +import static miscutil.core.lib.CORE.LOAD_ALL_CONTENT; import miscutil.core.creativetabs.AddToCreativeTab; import miscutil.core.item.effects.RarityUncommon; import miscutil.core.item.tool.staballoy.StaballoyPickaxe; import miscutil.core.lib.LoadedMods; -import miscutil.core.lib.Strings; +import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; @@ -120,15 +120,15 @@ public final class ModItems { /* //Blood Steel Equipment //Item Init - tutPickaxe = new BloodSteelPickaxe(tutMaterial).setUnlocalizedName("BloodSteelPickaxe").setCreativeTab(TMCreativeTabs.tabTools).setTextureName(Strings.MODID + ":BloodSteelPickaxe"); - tutAxe = new BloodSteelAxe(tutMaterial).setUnlocalizedName("BloodSteelAxe").setCreativeTab(TMCreativeTabs.tabTools).setTextureName(Strings.MODID + ":BloodSteelAxe"); - tutSword = new BloodSteelSword(tutMaterial).setUnlocalizedName("BloodSteelSword").setCreativeTab(TMCreativeTabs.tabCombat).setTextureName(Strings.MODID + ":BloodSteelSword"); - tutHoe = new BloodSteelHoe(tutMaterial).setUnlocalizedName("BloodSteelHoe").setCreativeTab(TMCreativeTabs.tabTools).setTextureName(Strings.MODID + ":BloodSteelHoe"); - tutSpade = new BloodSteelSpade(tutMaterial).setUnlocalizedName("BloodSteelSpade").setCreativeTab(TMCreativeTabs.tabTools).setTextureName(Strings.MODID + ":BloodSteelSpade"); - tutHelmet = new BloodSteelArmor(tutArmorMaterial, MiscUtils.proxy.addArmor("BloodSteelArmor"), 0).setUnlocalizedName("BloodSteelHelmet").setCreativeTab(TMCreativeTabs.tabCombat).setTextureName(Strings.MODID + ":BloodSteelHelmet"); - tutPlate = new BloodSteelArmor(tutArmorMaterial, MiscUtils.proxy.addArmor("BloodSteelArmor"), 1).setUnlocalizedName("BloodSteelPlate").setCreativeTab(TMCreativeTabs.tabCombat).setTextureName(Strings.MODID + ":BloodSteelPlate"); - tutPants = new BloodSteelArmor(tutArmorMaterial, MiscUtils.proxy.addArmor("BloodSteelArmor"), 2).setUnlocalizedName("BloodSteelPants").setCreativeTab(TMCreativeTabs.tabCombat).setTextureName(Strings.MODID + ":BloodSteelPants"); - tutBoots = new BloodSteelArmor(tutArmorMaterial, MiscUtils.proxy.addArmor("BloodSteelArmor"), 3).setUnlocalizedName("BloodSteelBoots").setCreativeTab(TMCreativeTabs.tabCombat).setTextureName(Strings.MODID + ":BloodSteelBoots"); + tutPickaxe = new BloodSteelPickaxe(tutMaterial).setUnlocalizedName("BloodSteelPickaxe").setCreativeTab(TMCreativeTabs.tabTools).setTextureName(CORE.MODID + ":BloodSteelPickaxe"); + tutAxe = new BloodSteelAxe(tutMaterial).setUnlocalizedName("BloodSteelAxe").setCreativeTab(TMCreativeTabs.tabTools).setTextureName(CORE.MODID + ":BloodSteelAxe"); + tutSword = new BloodSteelSword(tutMaterial).setUnlocalizedName("BloodSteelSword").setCreativeTab(TMCreativeTabs.tabCombat).setTextureName(CORE.MODID + ":BloodSteelSword"); + tutHoe = new BloodSteelHoe(tutMaterial).setUnlocalizedName("BloodSteelHoe").setCreativeTab(TMCreativeTabs.tabTools).setTextureName(CORE.MODID + ":BloodSteelHoe"); + tutSpade = new BloodSteelSpade(tutMaterial).setUnlocalizedName("BloodSteelSpade").setCreativeTab(TMCreativeTabs.tabTools).setTextureName(CORE.MODID + ":BloodSteelSpade"); + tutHelmet = new BloodSteelArmor(tutArmorMaterial, MiscUtils.proxy.addArmor("BloodSteelArmor"), 0).setUnlocalizedName("BloodSteelHelmet").setCreativeTab(TMCreativeTabs.tabCombat).setTextureName(CORE.MODID + ":BloodSteelHelmet"); + tutPlate = new BloodSteelArmor(tutArmorMaterial, MiscUtils.proxy.addArmor("BloodSteelArmor"), 1).setUnlocalizedName("BloodSteelPlate").setCreativeTab(TMCreativeTabs.tabCombat).setTextureName(CORE.MODID + ":BloodSteelPlate"); + tutPants = new BloodSteelArmor(tutArmorMaterial, MiscUtils.proxy.addArmor("BloodSteelArmor"), 2).setUnlocalizedName("BloodSteelPants").setCreativeTab(TMCreativeTabs.tabCombat).setTextureName(CORE.MODID + ":BloodSteelPants"); + tutBoots = new BloodSteelArmor(tutArmorMaterial, MiscUtils.proxy.addArmor("BloodSteelArmor"), 3).setUnlocalizedName("BloodSteelBoots").setCreativeTab(TMCreativeTabs.tabCombat).setTextureName(CORE.MODID + ":BloodSteelBoots"); //Registry GameRegistry.registerItem(tutPickaxe, tutPickaxe.getUnlocalizedName()); @@ -150,14 +150,14 @@ public final class ModItems { if (LoadedMods.EnderIO || LOAD_ALL_CONTENT){ Utils.LOG_INFO("EnderIO Found - Loading Resources."); //Item Init - itemPlateSoularium = new Item().setUnlocalizedName("itemPlateSoularium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateSoularium");; - itemPlateRedstoneAlloy = new Item().setUnlocalizedName("itemPlateRedstoneAlloy").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateRedstoneAlloy");; - itemPlateElectricalSteel = new Item().setUnlocalizedName("itemPlateElectricalSteel").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateElectricalSteel");; - itemPlatePulsatingIron = new Item().setUnlocalizedName("itemPlatePulsatingIron").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlatePulsatingIron");; - itemPlateEnergeticAlloy = new Item().setUnlocalizedName("itemPlateEnergeticAlloy").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateEnergeticAlloy");; - itemPlateVibrantAlloy = new Item().setUnlocalizedName("itemPlateVibrantAlloy").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateVibrantAlloy");; - itemPlateConductiveIron = new Item().setUnlocalizedName("itemPlateConductiveIron").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateConductiveIron");; - itemPlateDarkSteel = new Item().setUnlocalizedName("itemPlateDarkSteel").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateDarkSteel");; + itemPlateSoularium = new Item().setUnlocalizedName("itemPlateSoularium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateSoularium");; + itemPlateRedstoneAlloy = new Item().setUnlocalizedName("itemPlateRedstoneAlloy").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateRedstoneAlloy");; + itemPlateElectricalSteel = new Item().setUnlocalizedName("itemPlateElectricalSteel").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateElectricalSteel");; + itemPlatePulsatingIron = new Item().setUnlocalizedName("itemPlatePulsatingIron").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlatePulsatingIron");; + itemPlateEnergeticAlloy = new Item().setUnlocalizedName("itemPlateEnergeticAlloy").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateEnergeticAlloy");; + itemPlateVibrantAlloy = new Item().setUnlocalizedName("itemPlateVibrantAlloy").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateVibrantAlloy");; + itemPlateConductiveIron = new Item().setUnlocalizedName("itemPlateConductiveIron").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateConductiveIron");; + itemPlateDarkSteel = new Item().setUnlocalizedName("itemPlateDarkSteel").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateDarkSteel");; //Registry @@ -178,9 +178,9 @@ public final class ModItems { if (LoadedMods.Big_Reactors|| LOAD_ALL_CONTENT){ Utils.LOG_INFO("BigReactors Found - Loading Resources."); //Item Init - itemPlateBlutonium = new Item().setUnlocalizedName("itemPlateBlutonium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateBlutonium");; - itemPlateCyanite = new Item().setUnlocalizedName("itemPlateCyanite").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateCyanite");; - itemPlateLudicrite = new Item().setUnlocalizedName("itemPlateLudicrite").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateLudicrite");; + itemPlateBlutonium = new Item().setUnlocalizedName("itemPlateBlutonium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateBlutonium");; + itemPlateCyanite = new Item().setUnlocalizedName("itemPlateCyanite").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateCyanite");; + itemPlateLudicrite = new Item().setUnlocalizedName("itemPlateLudicrite").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateLudicrite");; //Registry GameRegistry.registerItem(itemPlateBlutonium, "itemPlateBlutonium"); @@ -196,7 +196,7 @@ public final class ModItems { if (LoadedMods.Thaumcraft|| LOAD_ALL_CONTENT){ Utils.LOG_INFO("Thaumcraft Found - Loading Resources."); //Item Init - itemPlateVoidMetal = new Item().setUnlocalizedName("itemPlateVoidMetal").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateVoidMetal");; + itemPlateVoidMetal = new Item().setUnlocalizedName("itemPlateVoidMetal").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateVoidMetal");; //Registry GameRegistry.registerItem(itemPlateVoidMetal, "itemPlateVoidMetal"); @@ -210,7 +210,7 @@ public final class ModItems { if (LoadedMods.Extra_Utils|| LOAD_ALL_CONTENT){ Utils.LOG_INFO("ExtraUtilities Found - Loading Resources."); //Item Init - itemPlateBedrockium = new Item().setUnlocalizedName("itemPlateBedrockium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateBedrockium");; + itemPlateBedrockium = new Item().setUnlocalizedName("itemPlateBedrockium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateBedrockium");; //Registry GameRegistry.registerItem(itemPlateBedrockium, "itemPlateBedrockium"); @@ -224,7 +224,7 @@ public final class ModItems { if (LoadedMods.PneumaticCraft|| LOAD_ALL_CONTENT){ Utils.LOG_INFO("PneumaticCraft Found - Loading Resources."); //Item Init - itemPlateCompressedIron = new Item().setUnlocalizedName("itemPlateCompressedIron").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateCompressedIron");; + itemPlateCompressedIron = new Item().setUnlocalizedName("itemPlateCompressedIron").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateCompressedIron");; //Registry GameRegistry.registerItem(itemPlateCompressedIron, "itemPlateCompressedIron"); @@ -238,7 +238,7 @@ public final class ModItems { if (LoadedMods.Simply_Jetpacks|| LOAD_ALL_CONTENT){ Utils.LOG_INFO("SimplyJetpacks Found - Loading Resources."); //Item Init - itemPlateEnrichedSoularium = new RarityUncommon().setUnlocalizedName("itemPlateEnrichedSoularium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateSoularium");; + itemPlateEnrichedSoularium = new RarityUncommon().setUnlocalizedName("itemPlateEnrichedSoularium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateSoularium");; //Registry GameRegistry.registerItem(itemPlateEnrichedSoularium, "itemPlateEnrichedSoularium"); @@ -253,7 +253,7 @@ public final class ModItems { if (LoadedMods.RFTools|| LOAD_ALL_CONTENT){ Utils.LOG_INFO("rfTools Found - Loading Resources."); //Item Init - itemPlateDimensionShard = new Item().setUnlocalizedName("itemPlateDimensionShard").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateDimensionShard");; + itemPlateDimensionShard = new Item().setUnlocalizedName("itemPlateDimensionShard").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateDimensionShard");; //Registry GameRegistry.registerItem(itemPlateDimensionShard, "itemPlateDimensionShard"); @@ -273,18 +273,18 @@ public final class ModItems { itemStaballoyPickaxe = new StaballoyPickaxe("itemStaballoyPickaxe", STABALLOY).setCreativeTab(AddToCreativeTab.tabTools); GameRegistry.registerItem(itemStaballoyPickaxe, itemStaballoyPickaxe.getUnlocalizedName()); //Staballoy Ingot/Plate - itemIngotStaballoy = new Item().setUnlocalizedName("itemIngotStaballoy").setCreativeTab(tabMisc).setTextureName(Strings.MODID + ":itemIngotStaballoy");; + itemIngotStaballoy = new Item().setUnlocalizedName("itemIngotStaballoy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemIngotStaballoy");; GameRegistry.registerItem(itemIngotStaballoy, "itemIngotStaballoy"); - itemPlateStaballoy = new Item().setUnlocalizedName("itemPlateStaballoy").setCreativeTab(tabMisc).setTextureName(Strings.MODID + ":itemPlateStaballoy");; + itemPlateStaballoy = new Item().setUnlocalizedName("itemPlateStaballoy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemPlateStaballoy");; GameRegistry.registerItem(itemPlateStaballoy, "itemPlateStaballoy"); //GregTech_API.sRecipeAdder.addAlloySmelterRecipe(, aInput2, aOutput1, aDuration, aEUt) //Blood Steel Ingot - itemIngotBloodSteel = new Item().setUnlocalizedName("itemIngotBloodSteel").setCreativeTab(tabMisc).setTextureName(Strings.MODID + ":itemIngotBloodSteel");; + itemIngotBloodSteel = new Item().setUnlocalizedName("itemIngotBloodSteel").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemIngotBloodSteel");; GameRegistry.registerItem(itemIngotBloodSteel, "itemIngotBloodSteel"); //Blood Steel Plate - itemPlateBloodSteel = new Item().setUnlocalizedName("itemPlateBloodSteel").setCreativeTab(tabMisc).setTextureName(Strings.MODID + ":itemPlateBloodSteel");; + itemPlateBloodSteel = new Item().setUnlocalizedName("itemPlateBloodSteel").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemPlateBloodSteel");; GameRegistry.registerItem(itemPlateBloodSteel, "itemPlateBloodSteel"); diff --git a/src/Java/miscutil/core/item/tool/bloodsteel/BloodSteelArmor.java b/src/Java/miscutil/core/item/tool/bloodsteel/BloodSteelArmor.java index 11bc400587..3f282506b1 100644 --- a/src/Java/miscutil/core/item/tool/bloodsteel/BloodSteelArmor.java +++ b/src/Java/miscutil/core/item/tool/bloodsteel/BloodSteelArmor.java @@ -1,7 +1,7 @@ package miscutil.core.item.tool.bloodsteel; import miscutil.core.item.ModItems; -import miscutil.core.lib.Strings; +import miscutil.core.lib.CORE; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; @@ -19,9 +19,9 @@ public class BloodSteelArmor extends ItemArmor { public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { if (stack.getItem() == ModItems.tutHelmet || stack.getItem() == ModItems.tutPlate || stack.getItem() == ModItems.tutBoots) { - return Strings.MODID + ":textures/armor/BloodSteelArmor1.png"; + return CORE.MODID + ":textures/armor/BloodSteelArmor1.png"; } else if (stack.getItem() == ModItems.tutPants) { - return Strings.MODID + ":textures/armor/BloodSteelArmor2.png"; + return CORE.MODID + ":textures/armor/BloodSteelArmor2.png"; } else { return null; } diff --git a/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java b/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java index 2453f9f6e2..150279118f 100644 --- a/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java +++ b/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java @@ -1,6 +1,6 @@ package miscutil.core.item.tool.staballoy; -import miscutil.core.lib.Strings; +import miscutil.core.lib.CORE; import net.minecraft.item.ItemPickaxe; public class StaballoyPickaxe extends ItemPickaxe{ @@ -8,7 +8,7 @@ public class StaballoyPickaxe extends ItemPickaxe{ public StaballoyPickaxe(String unlocalizedName, ToolMaterial material) { super(material); this.setUnlocalizedName(unlocalizedName); - this.setTextureName(Strings.MODID + ":" + unlocalizedName); + this.setTextureName(CORE.MODID + ":" + unlocalizedName); } } diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java new file mode 100644 index 0000000000..956f3f0898 --- /dev/null +++ b/src/Java/miscutil/core/lib/CORE.java @@ -0,0 +1,25 @@ +package miscutil.core.lib; + +import miscutil.core.creativetabs.AddToCreativeTab; + +public class CORE { + + public static final String name = "Misc. Utils"; + public static final String MODID = "miscutils"; + public static final String VERSION = "0.9.4_public_gregtech5u"; + public static final boolean DEBUG = false; + public static final boolean LOAD_ALL_CONTENT = false; + public static final int GREG_FIRST_ID = 760; + + + public static final Class TAB = AddToCreativeTab.class; + + //GUIS + public enum GUI_ENUM + { + ENERGYBUFFER, TOOLBUILDER, NULL, NULL1, NULL2 + } + + //public static final Materials2[] MiscGeneratedMaterials = new Materials2[1000]; + +} diff --git a/src/Java/miscutil/core/lib/Strings.java b/src/Java/miscutil/core/lib/Strings.java deleted file mode 100644 index a26d697065..0000000000 --- a/src/Java/miscutil/core/lib/Strings.java +++ /dev/null @@ -1,25 +0,0 @@ -package miscutil.core.lib; - -import miscutil.core.creativetabs.AddToCreativeTab; - -public class Strings { - - public static final String name = "Misc. Utils"; - public static final String MODID = "miscutils"; - public static final String VERSION = "0.9.2-gtu"; - public static final boolean DEBUG = false; - public static final boolean LOAD_ALL_CONTENT = false; - public static final int GREG_FIRST_ID = 760; - - - public static final Class TAB = AddToCreativeTab.class; - - //GUIS - public enum GUI_ENUM - { - ENERGYBUFFER, TOOLBUILDER, NULL, NULL1, NULL2 - } - - //public static final Materials2[] MiscGeneratedMaterials = new Materials2[1000]; - -} diff --git a/src/Java/miscutil/core/util/Utils.java b/src/Java/miscutil/core/util/Utils.java index 2ae494d96e..57c4399708 100644 --- a/src/Java/miscutil/core/util/Utils.java +++ b/src/Java/miscutil/core/util/Utils.java @@ -5,7 +5,7 @@ import static gregtech.api.enums.GT_Values.F; import java.awt.Graphics; import java.util.Random; -import miscutil.core.lib.Strings; +import miscutil.core.lib.CORE; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; @@ -85,21 +85,21 @@ public class Utils { //Non-Dev Comments public static void LOG_INFO(String s){ - //if (Strings.DEBUG){ + //if (CORE.DEBUG){ FMLLog.info("MiscUtils: "+s); //} } //Developer Comments public static void LOG_WARNING(String s){ - if (Strings.DEBUG){ + if (CORE.DEBUG){ FMLLog.warning("MiscUtils: "+s); } } //Errors public static void LOG_ERROR(String s){ - if (Strings.DEBUG){ + if (CORE.DEBUG){ FMLLog.severe("MiscUtils: "+s); } } -- cgit