diff options
Diffstat (limited to 'src')
21 files changed, 75 insertions, 793 deletions
diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java index c1e6a14913..1495db158c 100644 --- a/src/Java/miscutil/MiscUtils.java +++ b/src/Java/miscutil/MiscUtils.java @@ -7,7 +7,7 @@ import miscutil.core.commands.CommandMath; import miscutil.core.common.CommonProxy; import miscutil.core.creativetabs.AddToCreativeTab; import miscutil.core.lib.LoadedMods; -import miscutil.core.lib.Strings; +import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.FMLCommonHandler; @@ -21,12 +21,12 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; -@Mod(modid=Strings.MODID, name="Misc. Utils", version=Strings.VERSION, dependencies="required-after:gregtech") +@Mod(modid=CORE.MODID, name="Misc. Utils", version=CORE.VERSION, dependencies="required-after:gregtech") public class MiscUtils implements ActionListener { - @Mod.Instance(Strings.MODID) + @Mod.Instance(CORE.MODID) public static MiscUtils instance; @SidedProxy(clientSide="miscutil.core.proxy.ClientProxy", serverSide="miscutil.core.proxy.ServerProxy") 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/Strings.java b/src/Java/miscutil/core/lib/CORE.java index a26d697065..956f3f0898 100644 --- a/src/Java/miscutil/core/lib/Strings.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -2,11 +2,11 @@ package miscutil.core.lib; import miscutil.core.creativetabs.AddToCreativeTab; -public class Strings { +public class CORE { 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 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; 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); } } diff --git a/src/Java/miscutil/enderio/conduit/ConduitGTHandler.java b/src/Java/miscutil/enderio/conduit/ConduitGTHandler.java deleted file mode 100644 index 1f73134a80..0000000000 --- a/src/Java/miscutil/enderio/conduit/ConduitGTHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package miscutil.enderio.conduit; - -import gregtech.api.interfaces.tileentity.IEnergyConnected; -import gregtech.api.metatileentity.BaseMetaTileEntity; - -public class ConduitGTHandler extends BaseMetaTileEntity implements IEnergyConnected{ - - - -} diff --git a/src/Java/miscutil/enderio/conduit/Conduit_Base.java b/src/Java/miscutil/enderio/conduit/Conduit_Base.java deleted file mode 100644 index 7a4b6ac1cf..0000000000 --- a/src/Java/miscutil/enderio/conduit/Conduit_Base.java +++ /dev/null @@ -1,415 +0,0 @@ -package miscutil.enderio.conduit; - -import gregtech.api.interfaces.tileentity.IEnergyConnected; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.fluids.IFluidHandler; - -public class Conduit_Base implements IEnergyConnected{ - - @Override - public byte getColorization() { - - return 0; - } - - @Override - public byte setColorization(byte aColor) { - - return 0; - } - - @Override - public World getWorld() { - - return null; - } - - @Override - public int getXCoord() { - - return 0; - } - - @Override - public short getYCoord() { - - return 0; - } - - @Override - public int getZCoord() { - - return 0; - } - - @Override - public boolean isServerSide() { - - return false; - } - - @Override - public boolean isClientSide() { - - return false; - } - - @Override - public int getRandomNumber(int aRange) { - - return 0; - } - - @Override - public TileEntity getTileEntity(int aX, int aY, int aZ) { - - return null; - } - - @Override - public TileEntity getTileEntityOffset(int aX, int aY, int aZ) { - - return null; - } - - @Override - public TileEntity getTileEntityAtSide(byte aSide) { - - return null; - } - - @Override - public TileEntity getTileEntityAtSideAndDistance(byte aSide, int aDistance) { - - return null; - } - - @Override - public IInventory getIInventory(int aX, int aY, int aZ) { - - return null; - } - - @Override - public IInventory getIInventoryOffset(int aX, int aY, int aZ) { - - return null; - } - - @Override - public IInventory getIInventoryAtSide(byte aSide) { - - return null; - } - - @Override - public IInventory getIInventoryAtSideAndDistance(byte aSide, int aDistance) { - - return null; - } - - @Override - public IFluidHandler getITankContainer(int aX, int aY, int aZ) { - - return null; - } - - @Override - public IFluidHandler getITankContainerOffset(int aX, int aY, int aZ) { - - return null; - } - - @Override - public IFluidHandler getITankContainerAtSide(byte aSide) { - - return null; - } - - @Override - public IFluidHandler getITankContainerAtSideAndDistance(byte aSide, - int aDistance) { - - return null; - } - - @Override - public IGregTechTileEntity getIGregTechTileEntity(int aX, int aY, int aZ) { - - return null; - } - - @Override - public IGregTechTileEntity getIGregTechTileEntityOffset(int aX, int aY, - int aZ) { - - return null; - } - - @Override - public IGregTechTileEntity getIGregTechTileEntityAtSide(byte aSide) { - - return null; - } - - @Override - public IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance( - byte aSide, int aDistance) { - - return null; - } - - @Override - public Block getBlock(int aX, int aY, int aZ) { - - return null; - } - - @Override - public Block getBlockOffset(int aX, int aY, int aZ) { - - return null; - } - - @Override - public Block getBlockAtSide(byte aSide) { - - return null; - } - - @Override - public Block getBlockAtSideAndDistance(byte aSide, int aDistance) { - - return null; - } - - @Override - public byte getMetaID(int aX, int aY, int aZ) { - - return 0; - } - - @Override - public byte getMetaIDOffset(int aX, int aY, int aZ) { - - return 0; - } - - @Override - public byte getMetaIDAtSide(byte aSide) { - - return 0; - } - - @Override - public byte getMetaIDAtSideAndDistance(byte aSide, int aDistance) { - - return 0; - } - - @Override - public byte getLightLevel(int aX, int aY, int aZ) { - - return 0; - } - - @Override - public byte getLightLevelOffset(int aX, int aY, int aZ) { - - return 0; - } - - @Override - public byte getLightLevelAtSide(byte aSide) { - - return 0; - } - - @Override - public byte getLightLevelAtSideAndDistance(byte aSide, int aDistance) { - - return 0; - } - - @Override - public boolean getOpacity(int aX, int aY, int aZ) { - - return false; - } - - @Override - public boolean getOpacityOffset(int aX, int aY, int aZ) { - - return false; - } - - @Override - public boolean getOpacityAtSide(byte aSide) { - - return false; - } - - @Override - public boolean getOpacityAtSideAndDistance(byte aSide, int aDistance) { - - return false; - } - - @Override - public boolean getSky(int aX, int aY, int aZ) { - - return false; - } - - @Override - public boolean getSkyOffset(int aX, int aY, int aZ) { - - return false; - } - - @Override - public boolean getSkyAtSide(byte aSide) { - - return false; - } - - @Override - public boolean getSkyAtSideAndDistance(byte aSide, int aDistance) { - - return false; - } - - @Override - public boolean getAir(int aX, int aY, int aZ) { - - return false; - } - - @Override - public boolean getAirOffset(int aX, int aY, int aZ) { - - return false; - } - - @Override - public boolean getAirAtSide(byte aSide) { - - return false; - } - - @Override - public boolean getAirAtSideAndDistance(byte aSide, int aDistance) { - - return false; - } - - @Override - public BiomeGenBase getBiome() { - - return null; - } - - @Override - public BiomeGenBase getBiome(int aX, int aZ) { - - return null; - } - - @Override - public int getOffsetX(byte aSide, int aMultiplier) { - - return 0; - } - - @Override - public short getOffsetY(byte aSide, int aMultiplier) { - - return 0; - } - - @Override - public int getOffsetZ(byte aSide, int aMultiplier) { - - return 0; - } - - @Override - public boolean isDead() { - - return false; - } - - @Override - public void sendBlockEvent(byte aID, byte aValue) { - - - } - - @Override - public long getTimer() { - - return 0; - } - - @Override - public void setLightValue(byte aLightValue) { - - - } - - @Override - public void writeToNBT(NBTTagCompound aNBT) { - - - } - - @Override - public void readFromNBT(NBTTagCompound aNBT) { - - - } - - @Override - public boolean isInvalidTileEntity() { - - return false; - } - - @Override - public boolean openGUI(EntityPlayer aPlayer, int aID) { - - return false; - } - - @Override - public boolean openGUI(EntityPlayer aPlayer) { - - return false; - } - - @Override - public long injectEnergyUnits(byte aSide, long aVoltage, long aAmperage) { - - return 0; - } - - @Override - public boolean inputEnergyFrom(byte aSide) { - - return false; - } - - @Override - public boolean outputsEnergyTo(byte aSide) { - - return false; - } - -} diff --git a/src/Java/miscutil/enderio/conduit/MetaConduitBase.java b/src/Java/miscutil/enderio/conduit/MetaConduitBase.java deleted file mode 100644 index 32560a470d..0000000000 --- a/src/Java/miscutil/enderio/conduit/MetaConduitBase.java +++ /dev/null @@ -1,245 +0,0 @@ -package miscutil.enderio.conduit; - -import static gregtech.api.enums.GT_Values.V; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; -import ic2.api.item.IElectricItem; -import miscutil.core.handler.GuiHandler; -import miscutil.core.util.Utils; -import miscutil.gregtech.metatileentity.implementations.base.GregtechMetaTileEntity; -import miscutil.gregtech.util.IMessage; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - -/** - * NEVER INCLUDE THIS FILE IN YOUR MOD!!! - * - * This is the main construct for my Basic Machines such as the Automatic Extractor - * Extend this class to make a simple Machine - */ -public class MetaConduitBase extends GregtechMetaTileEntity { - - /* - * public GregtechMetaEnergyBuffer() { super.this - * setCreativeTab(GregTech_API.TAB_GREGTECH); } - */ - - public int mAmpage = 1; - public boolean mCharge = false, mDecharge = false; - public int mBatteryCount = 1, mChargeableCount = 1; - - public MetaConduitBase(int aID, String aName, String aNameRegional, int aTier, String aDescription, int aSlotCount) { - super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription); - } - - public MetaConduitBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) { - super(aName, aTier, aSlotCount, aDescription, aTextures); - } - - @Override - public String[] getDescription() { - return new String[] {mDescription, mInventory.length + " Slots"}; - } - - /* - * MACHINE_STEEL_SIDE - */ - @Override - public ITexture[][][] getTextureSet(ITexture[] aTextures) { - ITexture[][][] rTextures = new ITexture[2][17][]; - for (byte i = -1; i < 16; i++) { - rTextures[0][i + 1] = new ITexture[] { new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_HEATPROOFCASING) }; - rTextures[1][i + 1] = new ITexture[] { - new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_HEATPROOFCASING), - mInventory.length > 4 ? Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] - : Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] }; - } - return rTextures; - } - - @Override - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return mTextures[aSide == aFacing ? 1 : 0][aColorIndex+1]; - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new MetaConduitBase(mName, mTier, mDescription, mTextures, mInventory.length); - } - - @Override public boolean isSimpleMachine() {return false;} - @Override public boolean isElectric() {return true;} - @Override public boolean isValidSlot(int aIndex) {return true;} - @Override public boolean isFacingValid(byte aFacing) {return true;} - @Override public boolean isEnetInput() {return true;} - @Override public boolean isEnetOutput() {return true;} - @Override public boolean isInputFacing(byte aSide) {return aSide!=getBaseMetaTileEntity().getFrontFacing();} - @Override public boolean isOutputFacing(byte aSide) {return aSide==getBaseMetaTileEntity().getFrontFacing();} - @Override public boolean isTeleporterCompatible() {return false;} - @Override public long getMinimumStoredEU() {return V[mTier]*4*mInventory.length;} - @Override public long maxEUStore() {return V[mTier]*250;} - - @Override - public long maxEUInput() { - return V[mTier]; - } - - @Override - public long maxEUOutput() { - return V[mTier]; - } - - @Override - public long maxAmperesIn() { - return mChargeableCount * mAmpage; - } - - @Override - public long maxAmperesOut() { - return mChargeableCount * mAmpage; - } - @Override public int rechargerSlotStartIndex() {return 0;} - @Override public int dechargerSlotStartIndex() {return 0;} - @Override public int rechargerSlotCount() {return mCharge?mInventory.length:0;} - @Override public int dechargerSlotCount() {return mDecharge?mInventory.length:0;} - @Override public int getProgresstime() {return (int)getBaseMetaTileEntity().getUniversalEnergyStored();} - @Override public int maxProgresstime() {return (int)getBaseMetaTileEntity().getUniversalEnergyCapacity();} - @Override public boolean isAccessAllowed(EntityPlayer aPlayer) {return true;} - - @Override - public void saveNBTData(NBTTagCompound aNBT) { - // - } - - @Override - public void loadNBTData(NBTTagCompound aNBT) { - // - } - - @Override - public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - Utils.LOG_WARNING("Right Click on MTE by Player"); - if (aBaseMetaTileEntity.isClientSide()) return true; - //aBaseMetaTileEntity.openGUI(aPlayer); - - Utils.LOG_WARNING("MTE is Client-side"); - showEnergy(aPlayer.getEntityWorld(), aPlayer); - return true; - } - - private void showEnergy(World worldIn, EntityPlayer playerIn){ - Utils.LOG_WARNING("Begin Show Energy"); - final double c = ((double) getProgresstime() / maxProgresstime()) * 100; - Utils.LOG_WARNING(""+c); - final double roundOff = Math.round(c * 100.0) / 100.0; - IMessage.messageThePlayer("Energy: " + getProgresstime() + " EU at "+V[mTier]+"v ("+roundOff+"%)"); - Utils.LOG_WARNING("Making new instance of Guihandler"); - GuiHandler block = new GuiHandler(); - Utils.LOG_WARNING("Guihandler.toString(): "+block.toString()); - block.getClientGuiElement(1, playerIn, worldIn, (int) playerIn.posX, (int) playerIn.posY, (int) playerIn.posZ); - - } - - @Override - public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if (aBaseMetaTileEntity.isServerSide()) { - mCharge = aBaseMetaTileEntity.getStoredEU() / 2 > aBaseMetaTileEntity - .getEUCapacity() / 3; - mDecharge = aBaseMetaTileEntity.getStoredEU() < aBaseMetaTileEntity.getEUCapacity() / 3; - mBatteryCount = 1; - mChargeableCount = 1; - for (ItemStack tStack : mInventory) if (GT_ModHandler.isElectricItem(tStack, mTier)) { - if (GT_ModHandler.isChargerItem(tStack)) mBatteryCount++; - mChargeableCount++; - } - } - } - - @Override - public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - if(GT_ModHandler.isElectricItem(aStack)&&aStack.getUnlocalizedName().startsWith("gt.metaitem.01.")){ - String name = aStack.getUnlocalizedName(); - if(name.equals("gt.metaitem.01.32510")|| - name.equals("gt.metaitem.01.32511")|| - name.equals("gt.metaitem.01.32520")|| - name.equals("gt.metaitem.01.32521")|| - name.equals("gt.metaitem.01.32530")|| - name.equals("gt.metaitem.01.32531")){ - return true; - } - } - return false; - } - - @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - if(!GT_Utility.isStackValid(aStack)){ - return false; - } - if(GT_ModHandler.isElectricItem(aStack, this.mTier)){ - return true; - } - return false; - } - - public long[] getStoredEnergy(){ - long tScale = getBaseMetaTileEntity().getEUCapacity(); - long tStored = getBaseMetaTileEntity().getStoredEU(); - if (mInventory != null) { - for (ItemStack aStack : mInventory) { - if (GT_ModHandler.isElectricItem(aStack)) { - - if (aStack.getItem() instanceof GT_MetaBase_Item) { - Long[] stats = ((GT_MetaBase_Item) aStack.getItem()) - .getElectricStats(aStack); - if (stats != null) { - tScale = tScale + stats[0]; - tStored = tStored - + ((GT_MetaBase_Item) aStack.getItem()) - .getRealCharge(aStack); - } - } else if (aStack.getItem() instanceof IElectricItem) { - tStored = tStored - + (long) ic2.api.item.ElectricItem.manager - .getCharge(aStack); - tScale = tScale - + (long) ((IElectricItem) aStack.getItem()) - .getMaxCharge(aStack); - } - } - } - - } - return new long[] { tStored, tScale }; - } - - private long count=0; - private long mStored=0; - private long mMax=0; - - @Override - public String[] getInfoData() { - count++; - if(mMax==0||count%20==0){ - long[] tmp = getStoredEnergy(); - mStored=tmp[0]; - mMax=tmp[1]; - } - - return new String[] { - getLocalName(), - "Internal Storage:", - GT_Utility.formatNumbers(mStored)+" EU /", - GT_Utility.formatNumbers(mMax)+" EU"}; - } -}
\ No newline at end of file diff --git a/src/Java/miscutil/enderio/conduit/ModConduits.java b/src/Java/miscutil/enderio/conduit/ModConduits.java deleted file mode 100644 index 04cb120ec7..0000000000 --- a/src/Java/miscutil/enderio/conduit/ModConduits.java +++ /dev/null @@ -1,6 +0,0 @@ -package miscutil.enderio.conduit; - - -public class ModConduits { - -} diff --git a/src/Java/miscutil/gregtech/enums/MaterialsNew.java b/src/Java/miscutil/gregtech/enums/MaterialsNew.java deleted file mode 100644 index ae3ed019cd..0000000000 --- a/src/Java/miscutil/gregtech/enums/MaterialsNew.java +++ /dev/null @@ -1,44 +0,0 @@ -package miscutil.gregtech.enums; - -import miscutil.core.util.reflection.EnumBuster; - - -public class MaterialsNew { - - EnumBuster EB = new EnumBuster(null, null); -/* - public static void getGregMaterials() throws IllegalArgumentException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, SecurityException{ - Utils.LOG_WARNING("Stepping through the process of Greg's materials."); - - Constructor<?> con = Materials.class.getDeclaredConstructors()[0]; - Utils.LOG_WARNING("Logging Value for Variable "+"Constructor"+":"+con.getName()); - java.lang.reflect.Method[] methods = con.getClass().getDeclaredMethods(); - Utils.LOG_WARNING("Logging Value for Variable "+"methods"+":"+methods.toString()); - for (java.lang.reflect.Method m1 : methods) { - Utils.LOG_WARNING("Logging Value for Variable "+"m1"+":"+m1.getName()+"| Accessible? "+m1.isAccessible()); - if (m1.getName().equals("acquireConstructorAccessor")) { - Utils.LOG_WARNING("Logging Value for Variable "+"m1"+":"+m1.getName()+"| Accessible? "+m1.isAccessible()); - m1.setAccessible(true); - Utils.LOG_WARNING("Logging Value for Variable "+"m1"+":"+m1.toGenericString()); - m1.invoke(con, new Object[0]);} - } - Field[] fields = con.getClass().getDeclaredFields(); - Utils.LOG_WARNING("Logging Value for Variable "+"fields"+":"+fields.toString()+"|"+fields.getClass()); - Object ca = null; - for (Field f : fields) { - Utils.LOG_WARNING("Logging Value for Variable "+"f"+":"+f.getName()+"|"+f.getModifiers()+"|"+f.isAccessible()); - if (f.getName().equals("constructorAccessor")) { - Utils.LOG_WARNING("Logging Value for Variable "+"f"+":"+f.isAccessible()); - f.setAccessible(true); - ca = f.get(con); - Utils.LOG_WARNING("Logging Value for Variable "+"ca"+":"+ca.toString()+"|"+ca.getClass()); - } - } - Method m = ca.getClass().getMethod( "newInstance", new Class[] { Object[].class }); - Utils.LOG_WARNING("Logging Value for Variable "+"m"+":"+m.getModifiers()+"|"+m.getName()+"|"+m.toGenericString()+"|"+m.isAccessible()); - m.setAccessible(true); - Materials v = (Materials) m.invoke(ca, new Object[] { new Object[] { "NEWMATERIAL", Integer.MAX_VALUE } }); - System.out.println(v.getClass() + ":" + v.name() + ":" + v.ordinal()); - -}*/ -} diff --git a/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java b/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java index f758e5c693..3825acd239 100644 --- a/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java +++ b/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java @@ -2,7 +2,7 @@ package miscutil.gregtech.gui; import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import miscutil.core.lib.Strings; +import miscutil.core.lib.CORE; import net.minecraft.entity.player.InventoryPlayer; public class GUI_SteamCondenser extends GT_GUIContainerMetaTile_Machine @@ -11,13 +11,13 @@ public class GUI_SteamCondenser extends GT_GUIContainerMetaTile_Machine public GUI_SteamCondenser(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aTextureName, int aSteamCapacity) { - super(new CONTAINER_SteamCondenser(aInventoryPlayer, aTileEntity, aSteamCapacity), Strings.MODID + ":" + "textures/gui/" + aTextureName); + super(new CONTAINER_SteamCondenser(aInventoryPlayer, aTileEntity, aSteamCapacity), CORE.MODID + ":" + "textures/gui/" + aTextureName); } protected void drawGuiContainerForegroundLayer(int par1, int par2) { this.fontRendererObj.drawString("Condenser", 8, 4, 4210752); - if (!Strings.DEBUG){ + if (!CORE.DEBUG){ tickTime = ((CONTAINER_SteamCondenser)this.mContainer).mTickingTime; this.fontRendererObj.drawString("Tick Time: "+tickTime, 8, 12, 4210752); } diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java b/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java index 6142a2dc0c..7267c005d5 100644 --- a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java +++ b/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java @@ -5,7 +5,7 @@ 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.Strings; +import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.gregtech.enums.ExtraOreDictNames; import miscutil.gregtech.enums.GregtechItemList; @@ -35,7 +35,7 @@ public class GregtechEnergyBuffer private static void run1() { - itemBufferCore = new Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemBufferCore");; + itemBufferCore = new Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemBufferCore");; //Registry GameRegistry.registerItem(itemBufferCore, "itemBufferCore"); diff --git a/src/Java/miscutil/mcmod.info b/src/Java/miscutil/mcmod.info index 85720427ff..ae0af1f862 100644 --- a/src/Java/miscutil/mcmod.info +++ b/src/Java/miscutil/mcmod.info @@ -6,7 +6,7 @@ [ { "modid" : "miscutils" , "name" : "miscutils" , "description" : "Adds a few various things. Supported mods include GregTech, EnderIO, Big Reactors, Thaumcraft, ExtraUtils, Pnuematicraft & Simply Jetpacks." - , "version" : "0.9.2-gtu" + , "version" : "0.9.4_public_gregtech5u" , "mcversion" : "1.7.10" , "url" : "" , "updateUrl" : "" |