diff options
Diffstat (limited to 'src/Java/miscutil/core')
| -rw-r--r-- | src/Java/miscutil/core/CommonProxy.java | 70 | ||||
| -rw-r--r-- | src/Java/miscutil/core/block/BasicBlock.java | 4 | ||||
| -rw-r--r-- | src/Java/miscutil/core/block/ModBlocks.java | 6 | ||||
| -rw-r--r-- | src/Java/miscutil/core/commands/CommandMath.java | 8 | ||||
| -rw-r--r-- | src/Java/miscutil/core/creativetabs/AddToCreativeTab.java (renamed from src/Java/miscutil/core/creativetabs/TMCreativeTabs.java) | 2 | ||||
| -rw-r--r-- | src/Java/miscutil/core/item/ModItems.java | 58 | ||||
| -rw-r--r-- | src/Java/miscutil/core/item/materials/MaterialHandler.java | 1 | ||||
| -rw-r--r-- | src/Java/miscutil/core/lib/Strings.java | 5 | ||||
| -rw-r--r-- | src/Java/miscutil/core/proxy/ClientProxy.java | 2 | ||||
| -rw-r--r-- | src/Java/miscutil/core/proxy/ServerProxy.java | 2 |
10 files changed, 51 insertions, 107 deletions
diff --git a/src/Java/miscutil/core/CommonProxy.java b/src/Java/miscutil/core/CommonProxy.java deleted file mode 100644 index 8b0f6c8b2a..0000000000 --- a/src/Java/miscutil/core/CommonProxy.java +++ /dev/null @@ -1,70 +0,0 @@ -package miscutil.core; - -import miscutil.core.block.ModBlocks; -import miscutil.core.gui.ModGUI; -import miscutil.core.item.ModItems; -import miscutil.core.lib.Strings; -import miscutil.core.tileentities.ModTileEntities; -import miscutil.core.util.Utils; -import miscutil.gregtech.init.InitGregtech; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; - -public class CommonProxy { - - public void preInit(FMLPreInitializationEvent e) { - ModItems.init(); - ModBlocks.init(); - - - //Register Gregtech related items - if (Loader.isModLoaded("gregtech") == true) { - Utils.LOG_INFO("Gregtech Found - Loading Resources."); - Strings.GREGTECH = true; - Utils.LOG_INFO("Begining registration & initialization of Gregtech related content."); - // Init Gregtech - InitGregtech.run(); - - } - else { - Utils.LOG_WARNING("Gregtech not Found - Skipping Resources."); - Strings.GREGTECH = false; - } - - } - - public void init(FMLInitializationEvent e) { - - - - } - - public void postInit(FMLPostInitializationEvent e) { - - } - - public void registerNetworkStuff(){ - ModGUI.init(); - //NetworkRegistry.INSTANCE.registerGuiHandler(MiscUtils.instance, new BloodSteelFurnaceGuiHandler()); - - } - - public void registerTileEntities(){ - ModTileEntities.init(); - //GameRegistry.registerTileEntity(TileEntityBloodSteelChest.class, "tileEntityBloodSteelChest"); - //GameRegistry.registerTileEntity(TileEntityBloodSteelFurnace.class, "tileEntityBloodSteelFurnace"); - //GameRegistry.registerTileEntity(TileEntityBloodSteelChest.class, Strings.MODID); - //GameRegistry.registerTileEntity(TileEntityArcaneInfuser.class, "TileEntityArcaneInfuser"); - } - - public void registerRenderThings() { - - } - - public int addArmor(String armor) { - return 0; - } - -} diff --git a/src/Java/miscutil/core/block/BasicBlock.java b/src/Java/miscutil/core/block/BasicBlock.java index 63c1044b03..25009e77ba 100644 --- a/src/Java/miscutil/core/block/BasicBlock.java +++ b/src/Java/miscutil/core/block/BasicBlock.java @@ -1,6 +1,6 @@ package miscutil.core.block; -import miscutil.core.creativetabs.TMCreativeTabs; +import miscutil.core.creativetabs.AddToCreativeTab; import miscutil.core.lib.Strings; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -11,7 +11,7 @@ public class BasicBlock extends Block { super(material); this.setBlockName(unlocalizedName); this.setBlockTextureName(Strings.MODID + ":" + unlocalizedName); - this.setCreativeTab(TMCreativeTabs.tabBlock); + this.setCreativeTab(AddToCreativeTab.tabBlock); this.setHardness(2.0F); this.setResistance(6.0F); this.setLightLevel(0.0F); diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java index 7f1df843be..86f36a6b9e 100644 --- a/src/Java/miscutil/core/block/ModBlocks.java +++ b/src/Java/miscutil/core/block/ModBlocks.java @@ -1,5 +1,6 @@ package miscutil.core.block; +import static miscutil.core.creativetabs.AddToCreativeTab.tabBlock; import miscutil.core.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -11,6 +12,7 @@ public final class ModBlocks { public static Block blockBloodSteel; public static Block blockStaballoy; public static Block blockToolBuilder; + public static Block blockGriefSaver; //public static Block blockBloodSteelChest; //BloodSteelorial Furnace @@ -85,6 +87,10 @@ public final class ModBlocks { //Block Storage //GameRegistry.registerBlock(emxBlockStorage, emxBlockStorage.getUnlocalizedName()); + + //blockGriefSaver Block + GameRegistry.registerBlock(blockGriefSaver = new AdvancedBlock("blockGriefSaver", Material.circuits, tabBlock, 2.0F, 10.0F, 0, "axe", 2, Block.soundTypeMetal), "blockGriefSaver"); + } }
\ No newline at end of file diff --git a/src/Java/miscutil/core/commands/CommandMath.java b/src/Java/miscutil/core/commands/CommandMath.java index 933684d277..bf5e52ad94 100644 --- a/src/Java/miscutil/core/commands/CommandMath.java +++ b/src/Java/miscutil/core/commands/CommandMath.java @@ -15,14 +15,14 @@ import net.minecraft.world.World; public class CommandMath implements ICommand { - private final List aliases; + private final List<String> aliases; protected String fullEntityName; protected Entity conjuredEntity; public CommandMath() { - aliases = new ArrayList(); + aliases = new ArrayList<String>(); aliases.add("hometele"); @@ -52,7 +52,7 @@ public class CommandMath implements ICommand } @Override - public List getCommandAliases() + public List<String> getCommandAliases() { return this.aliases; @@ -167,7 +167,7 @@ public class CommandMath implements ICommand } @Override - public List addTabCompletionOptions(ICommandSender var1, String[] var2) + public List<?> addTabCompletionOptions(ICommandSender var1, String[] var2) { // TODO Auto-generated method stub diff --git a/src/Java/miscutil/core/creativetabs/TMCreativeTabs.java b/src/Java/miscutil/core/creativetabs/AddToCreativeTab.java index 05d170d6e1..2cde6be1ad 100644 --- a/src/Java/miscutil/core/creativetabs/TMCreativeTabs.java +++ b/src/Java/miscutil/core/creativetabs/AddToCreativeTab.java @@ -2,7 +2,7 @@ package miscutil.core.creativetabs; import net.minecraft.creativetab.CreativeTabs; -public class TMCreativeTabs { +public class AddToCreativeTab { public static CreativeTabs tabBlock; public static CreativeTabs tabMisc; diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index 7b84f3c589..5ccc7be942 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -1,6 +1,7 @@ package miscutil.core.item; -import miscutil.core.creativetabs.TMCreativeTabs; +import static miscutil.core.creativetabs.AddToCreativeTab.tabMisc; +import miscutil.core.creativetabs.AddToCreativeTab; import miscutil.core.item.effects.RarityUncommon; import miscutil.core.item.tool.staballoy.StaballoyPickaxe; import miscutil.core.lib.Strings; @@ -13,7 +14,7 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; public final class ModItems { -/* A name for the material. This should be the same as the name of the variable we use to store the material (in this case "TUTORIAL"). + /* A name for the material. This should be the same as the name of the variable we use to store the material (in this case "TUTORIAL"). A harvest level for pickaxes. This is a value between 0 and 3 and defines which blocks can be mined with this tool. Its also possible to create blocks which need a higher harvest level than 3, but then you are not able to mine them with vanilla tools. Common values for the harvest level are: Wood/Gold Tool: 0 @@ -103,17 +104,16 @@ public final class ModItems { //Misc Items public static Item itemIngotBloodSteel; public static Item itemPlateBloodSteel; - + //Staballoy public static Item itemStaballoyPickaxe; public static Item itemPlateStaballoy; public static Item itemIngotStaballoy; - + //@SuppressWarnings("unused") - @SuppressWarnings("unused") public static final void init(){ /* @@ -170,14 +170,14 @@ public final class ModItems { if (Loader.isModLoaded("EnderIO") == true || Strings.LOAD_ALL_CONTENT){ Utils.LOG_INFO("EnderIO Found - Loading Resources."); //Item Init - itemPlateSoularium = new Item().setUnlocalizedName("itemPlateSoularium").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateSoularium");; - itemPlateRedstoneAlloy = new Item().setUnlocalizedName("itemPlateRedstoneAlloy").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateRedstoneAlloy");; - itemPlateElectricalSteel = new Item().setUnlocalizedName("itemPlateElectricalSteel").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateElectricalSteel");; - itemPlatePulsatingIron = new Item().setUnlocalizedName("itemPlatePulsatingIron").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlatePulsatingIron");; - itemPlateEnergeticAlloy = new Item().setUnlocalizedName("itemPlateEnergeticAlloy").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateEnergeticAlloy");; - itemPlateVibrantAlloy = new Item().setUnlocalizedName("itemPlateVibrantAlloy").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateVibrantAlloy");; - itemPlateConductiveIron = new Item().setUnlocalizedName("itemPlateConductiveIron").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateConductiveIron");; - itemPlateDarkSteel = new Item().setUnlocalizedName("itemPlateDarkSteel").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateDarkSteel");; + 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");; //Registry @@ -198,9 +198,9 @@ public final class ModItems { if (Loader.isModLoaded("BigReactors") == true || Strings.LOAD_ALL_CONTENT){ Utils.LOG_INFO("BigReactors Found - Loading Resources."); //Item Init - itemPlateBlutonium = new Item().setUnlocalizedName("itemPlateBlutonium").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateBlutonium");; - itemPlateCyanite = new Item().setUnlocalizedName("itemPlateCyanite").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateCyanite");; - itemPlateLudicrite = new Item().setUnlocalizedName("itemPlateLudicrite").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateLudicrite");; + 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");; //Registry GameRegistry.registerItem(itemPlateBlutonium, "itemPlateBlutonium"); @@ -216,7 +216,7 @@ public final class ModItems { if (Loader.isModLoaded("Thaumcraft") == true || Strings.LOAD_ALL_CONTENT){ Utils.LOG_INFO("Thaumcraft Found - Loading Resources."); //Item Init - itemPlateVoidMetal = new Item().setUnlocalizedName("itemPlateVoidMetal").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateVoidMetal");; + itemPlateVoidMetal = new Item().setUnlocalizedName("itemPlateVoidMetal").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateVoidMetal");; //Registry GameRegistry.registerItem(itemPlateVoidMetal, "itemPlateVoidMetal"); @@ -230,7 +230,7 @@ public final class ModItems { if (Loader.isModLoaded("ExtraUtilities") == true || Strings.LOAD_ALL_CONTENT){ Utils.LOG_INFO("ExtraUtilities Found - Loading Resources."); //Item Init - itemPlateBedrockium = new Item().setUnlocalizedName("itemPlateBedrockium").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateBedrockium");; + itemPlateBedrockium = new Item().setUnlocalizedName("itemPlateBedrockium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateBedrockium");; //Registry GameRegistry.registerItem(itemPlateBedrockium, "itemPlateBedrockium"); @@ -244,7 +244,7 @@ public final class ModItems { if (Loader.isModLoaded("PneumaticCraft") == true || Strings.LOAD_ALL_CONTENT){ Utils.LOG_INFO("PneumaticCraft Found - Loading Resources."); //Item Init - itemPlateCompressedIron = new Item().setUnlocalizedName("itemPlateCompressedIron").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateCompressedIron");; + itemPlateCompressedIron = new Item().setUnlocalizedName("itemPlateCompressedIron").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateCompressedIron");; //Registry GameRegistry.registerItem(itemPlateCompressedIron, "itemPlateCompressedIron"); @@ -258,7 +258,7 @@ public final class ModItems { if (Loader.isModLoaded("simplyjetpacks") == true || Strings.LOAD_ALL_CONTENT){ Utils.LOG_INFO("SimplyJetpacks Found - Loading Resources."); //Item Init - itemPlateEnrichedSoularium = new RarityUncommon().setUnlocalizedName("itemPlateEnrichedSoularium").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateSoularium");; + itemPlateEnrichedSoularium = new RarityUncommon().setUnlocalizedName("itemPlateEnrichedSoularium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateSoularium");; //Registry GameRegistry.registerItem(itemPlateEnrichedSoularium, "itemPlateEnrichedSoularium"); @@ -273,7 +273,7 @@ public final class ModItems { if (Loader.isModLoaded("rftools") == true || Strings.LOAD_ALL_CONTENT){ Utils.LOG_INFO("rfTools Found - Loading Resources."); //Item Init - itemPlateDimensionShard = new Item().setUnlocalizedName("itemPlateDimensionShard").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateDimensionShard");; + itemPlateDimensionShard = new Item().setUnlocalizedName("itemPlateDimensionShard").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemPlateDimensionShard");; //Registry GameRegistry.registerItem(itemPlateDimensionShard, "itemPlateDimensionShard"); @@ -290,20 +290,22 @@ public final class ModItems { //Staballoy Equipment Utils.LOG_INFO("Interest in Stablloy Found - Loading Resources."); //Pickaxe - itemStaballoyPickaxe = new StaballoyPickaxe("itemStaballoyPickaxe", STABALLOY).setCreativeTab(TMCreativeTabs.tabTools); + itemStaballoyPickaxe = new StaballoyPickaxe("itemStaballoyPickaxe", STABALLOY).setCreativeTab(AddToCreativeTab.tabTools); GameRegistry.registerItem(itemStaballoyPickaxe, itemStaballoyPickaxe.getUnlocalizedName()); //Staballoy Ingot/Plate - itemIngotStaballoy = new Item().setUnlocalizedName("itemIngotStaballoy").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemIngotStaballoy");; + itemIngotStaballoy = new Item().setUnlocalizedName("itemIngotStaballoy").setCreativeTab(tabMisc).setTextureName(Strings.MODID + ":itemIngotStaballoy");; GameRegistry.registerItem(itemIngotStaballoy, "itemIngotStaballoy"); - itemPlateStaballoy = new Item().setUnlocalizedName("itemPlateStaballoy").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemPlateStaballoy");; + itemPlateStaballoy = new Item().setUnlocalizedName("itemPlateStaballoy").setCreativeTab(tabMisc).setTextureName(Strings.MODID + ":itemPlateStaballoy");; GameRegistry.registerItem(itemPlateStaballoy, "itemPlateStaballoy"); //GregTech_API.sRecipeAdder.addAlloySmelterRecipe(, aInput2, aOutput1, aDuration, aEUt) - - - + + //Blood Steel Ingot - itemIngotBloodSteel = new Item().setUnlocalizedName("itemIngotBloodSteel").setCreativeTab(TMCreativeTabs.tabMisc).setTextureName(Strings.MODID + ":itemIngotBloodSteel");; + itemIngotBloodSteel = new Item().setUnlocalizedName("itemIngotBloodSteel").setCreativeTab(tabMisc).setTextureName(Strings.MODID + ":itemIngotBloodSteel");; GameRegistry.registerItem(itemIngotBloodSteel, "itemIngotBloodSteel"); + //Blood Steel Plate + itemPlateBloodSteel = new Item().setUnlocalizedName("itemPlateBloodSteel").setCreativeTab(tabMisc).setTextureName(Strings.MODID + ":itemPlateBloodSteel");; + GameRegistry.registerItem(itemPlateBloodSteel, "itemPlateBloodSteel"); } diff --git a/src/Java/miscutil/core/item/materials/MaterialHandler.java b/src/Java/miscutil/core/item/materials/MaterialHandler.java index 3c57d21f90..7a4f8aba05 100644 --- a/src/Java/miscutil/core/item/materials/MaterialHandler.java +++ b/src/Java/miscutil/core/item/materials/MaterialHandler.java @@ -2,6 +2,7 @@ package miscutil.core.item.materials; public class MaterialHandler { + @SuppressWarnings("unused") private String Staballoy; diff --git a/src/Java/miscutil/core/lib/Strings.java b/src/Java/miscutil/core/lib/Strings.java index 1213dc56ef..032d169c46 100644 --- a/src/Java/miscutil/core/lib/Strings.java +++ b/src/Java/miscutil/core/lib/Strings.java @@ -1,5 +1,7 @@ package miscutil.core.lib; +import miscutil.core.creativetabs.AddToCreativeTab; + public class Strings { public static final String name = "Misc. Utils"; @@ -10,6 +12,9 @@ public class Strings { public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; + + public static final Class<AddToCreativeTab> TAB = AddToCreativeTab.class; + //GUIS public enum GUI_ENUM { diff --git a/src/Java/miscutil/core/proxy/ClientProxy.java b/src/Java/miscutil/core/proxy/ClientProxy.java index f0f21549e8..2e754b9bf0 100644 --- a/src/Java/miscutil/core/proxy/ClientProxy.java +++ b/src/Java/miscutil/core/proxy/ClientProxy.java @@ -1,6 +1,6 @@ package miscutil.core.proxy; -import miscutil.core.CommonProxy; +import miscutil.core.common.CommonProxy; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; diff --git a/src/Java/miscutil/core/proxy/ServerProxy.java b/src/Java/miscutil/core/proxy/ServerProxy.java index 59e625eaed..358436084d 100644 --- a/src/Java/miscutil/core/proxy/ServerProxy.java +++ b/src/Java/miscutil/core/proxy/ServerProxy.java @@ -1,6 +1,6 @@ package miscutil.core.proxy; -import miscutil.core.CommonProxy; +import miscutil.core.common.CommonProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; |