diff --git a/src/main/java/com/rebelkeithy/deeppockets/DeepPocketsMod.java b/src/main/java/com/rebelkeithy/deeppockets/DeepPocketsMod.java index e5e1f09..3c28ef0 100644 --- a/src/main/java/com/rebelkeithy/deeppockets/DeepPocketsMod.java +++ b/src/main/java/com/rebelkeithy/deeppockets/DeepPocketsMod.java @@ -1,6 +1,5 @@ package com.rebelkeithy.deeppockets; -import com.rebelkeithy.deeppockets.Items.DeepPocketsItems; import com.rebelkeithy.deeppockets.event.ItemPickupEvent; import com.rebelkeithy.deeppockets.proxy.CommonProxy; import com.rebelkeithy.deeppockets.proxy.compatability.Compatability; @@ -26,23 +25,19 @@ public class DeepPocketsMod public static CommonProxy proxy; @EventHandler - public void preinit(FMLPreInitializationEvent event) - { - Compatability.init(); - - Configuration config = new Configuration(event.getSuggestedConfigurationFile()); - DeepPocketsConfig.init(config); - - DeepPocketsItems.init(); - DeepPocketsItems.registerItems(); - DeepPocketsItems.registeryRenderers(); + public void preinit(FMLPreInitializationEvent e){ + proxy.preinit(e); + + Compatability.init(); + Configuration config = new Configuration(e.getSuggestedConfigurationFile()); + DeepPocketsConfig.init(config); + } @EventHandler - public void init(FMLInitializationEvent event) - { - Recipies.registerRecipies(); - + public void init(FMLInitializationEvent e){ + proxy.init(e); + Recipies.registerRecipies(); MinecraftForge.EVENT_BUS.register(new ItemPickupEvent()); - } + } } diff --git a/src/main/java/com/rebelkeithy/deeppockets/Items/DeepPocketsItems.java b/src/main/java/com/rebelkeithy/deeppockets/Items/DeepPocketsItems.java index a547381..e43e224 100644 --- a/src/main/java/com/rebelkeithy/deeppockets/Items/DeepPocketsItems.java +++ b/src/main/java/com/rebelkeithy/deeppockets/Items/DeepPocketsItems.java @@ -3,43 +3,52 @@ import java.util.ArrayList; import java.util.List; +import com.rebelkeithy.deeppockets.DeepPocketsMod; import com.rebelkeithy.deeppockets.PackModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class DeepPocketsItems { - public static ItemMiningPack miningPack; - public static ItemMiningPack advancedMiningPack; + public static Item miningPack; + public static Item advancedMiningPack; - public static void init() - { - miningPack = (ItemMiningPack) new ItemMiningPack(5).setUnlocalizedName("miningpack").setRegistryName("miningpack").setCreativeTab(CreativeTabs.TOOLS); - advancedMiningPack = (ItemMiningPack) new ItemMiningPack(10).setUnlocalizedName("advancedminingpack").setRegistryName("advancedminingpack").setCreativeTab(CreativeTabs.TOOLS); + public static final List items = new ArrayList(); + + public static final void commonPreInit(){ + miningPack = registerItem(new ItemMiningPack(5), "mining_pack").setCreativeTab(CreativeTabs.TOOLS); + advancedMiningPack = registerItem(new ItemMiningPack(10), "advanced_mining_pack").setCreativeTab(CreativeTabs.TOOLS); } - public static void registerItems() - { - GameRegistry.register(miningPack); - GameRegistry.register(advancedMiningPack); + public static final void clientpreInit(){ + for(Item item:items){ + registerRender(item); + } } - public static void registeryRenderers() - { - List packModels = new ArrayList(); - List advancedPackModels = new ArrayList(); + private static final Item registerItem(Item item,String name){ + GameRegistry.register(item, new ResourceLocation(DeepPocketsMod.MODID, name)); + item.setUnlocalizedName(name); + items.add(item); + return item; + } + @SideOnly(value = Side.CLIENT) + private static final void registerRender(Item item){ + List packModels = new ArrayList(); for(int i = 1; i <= 4; i++) { - packModels.add(new ModelResourceLocation("miningpack:miningpack" + i, "inventory")); - advancedPackModels.add(new ModelResourceLocation("miningpack:advancedminingpack" + i, "inventory")); + packModels.add(new ModelResourceLocation(item.getRegistryName()+""+ i, "inventory")); } - ModelLoader.registerItemVariants(miningPack, packModels.toArray(new ModelResourceLocation[packModels.size()])); - ModelLoader.registerItemVariants(advancedMiningPack, advancedPackModels.toArray(new ModelResourceLocation[advancedPackModels.size()])); - ModelLoader.setCustomMeshDefinition(miningPack, new PackModel()); - ModelLoader.setCustomMeshDefinition(advancedMiningPack, new PackModel()); + ModelLoader.registerItemVariants(item, packModels.toArray(new ModelResourceLocation[packModels.size()])); + ModelLoader.setCustomMeshDefinition(item, new PackModel()); } + } diff --git a/src/main/java/com/rebelkeithy/deeppockets/Items/ItemMiningPack.java b/src/main/java/com/rebelkeithy/deeppockets/Items/ItemMiningPack.java index 4c7cd58..2f3907e 100644 --- a/src/main/java/com/rebelkeithy/deeppockets/Items/ItemMiningPack.java +++ b/src/main/java/com/rebelkeithy/deeppockets/Items/ItemMiningPack.java @@ -10,6 +10,7 @@ import com.rebelkeithy.deeppockets.proxy.compatability.Compatability; import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; @@ -27,8 +28,13 @@ import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; -public class ItemMiningPack extends Item -{ +public class ItemMiningPack extends Item { + + ItemMiningPack(){ + this.setCreativeTab(CreativeTabs.TOOLS); + this.setHasSubtypes(true); + } + public static Map prefix = new HashMap(); static { @@ -397,5 +403,5 @@ public void save(NBTTagCompound tag) tag.removeTag(oreDictName); } } - } + } } diff --git a/src/main/java/com/rebelkeithy/deeppockets/PackModel.java b/src/main/java/com/rebelkeithy/deeppockets/PackModel.java index 1024b24..f63333b 100644 --- a/src/main/java/com/rebelkeithy/deeppockets/PackModel.java +++ b/src/main/java/com/rebelkeithy/deeppockets/PackModel.java @@ -1,8 +1,6 @@ package com.rebelkeithy.deeppockets; import com.rebelkeithy.deeppockets.Items.ItemMiningPack; -import com.rebelkeithy.deeppockets.Items.DeepPocketsItems; - import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; @@ -10,27 +8,14 @@ public class PackModel implements ItemMeshDefinition { @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - if(stack.getItem() == DeepPocketsItems.miningPack) - { - ItemMiningPack pack = (ItemMiningPack)stack.getItem(); - - int items = pack.getTotalItems(stack); - int i = Math.min(1+items/128, 4); - return new ModelResourceLocation("miningpack:miningpack" + i, "inventory"); - } - - if(stack.getItem() == DeepPocketsItems.advancedMiningPack) - { + public ModelResourceLocation getModelLocation(ItemStack stack){ + ItemMiningPack pack = (ItemMiningPack)stack.getItem(); int items = pack.getTotalItems(stack); - int i = Math.min(1+items/128, 4); - return new ModelResourceLocation("miningpack:advancedminingpack" + i, "inventory"); - } + int i = Math.min(1+items/128, 4); + return new ModelResourceLocation(stack.getItem().getRegistryName()+""+ i, "inventory"); - return null; } } diff --git a/src/main/java/com/rebelkeithy/deeppockets/event/ItemPickupEvent.java b/src/main/java/com/rebelkeithy/deeppockets/event/ItemPickupEvent.java index 644d3a0..7921742 100644 --- a/src/main/java/com/rebelkeithy/deeppockets/event/ItemPickupEvent.java +++ b/src/main/java/com/rebelkeithy/deeppockets/event/ItemPickupEvent.java @@ -48,7 +48,7 @@ public void pickupItemEvent(EntityItemPickupEvent event) player.world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.AMBIENT, 0.2f, f); Compatability.setCount(event.getItem().getEntityItem(), 0); - event.setCanceled(true); + event.setCanceled(true); return; } } diff --git a/src/main/java/com/rebelkeithy/deeppockets/proxy/ClientProxy.java b/src/main/java/com/rebelkeithy/deeppockets/proxy/ClientProxy.java index 79d321a..bfa98aa 100644 --- a/src/main/java/com/rebelkeithy/deeppockets/proxy/ClientProxy.java +++ b/src/main/java/com/rebelkeithy/deeppockets/proxy/ClientProxy.java @@ -2,10 +2,18 @@ import com.rebelkeithy.deeppockets.Items.DeepPocketsItems; -public class ClientProxy extends CommonProxy -{ - public void registerRenderers() - { - DeepPocketsItems.registeryRenderers(); - } +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; + +public class ClientProxy extends CommonProxy{ + + public void preinit(FMLPreInitializationEvent e){ + super.preinit(e); + DeepPocketsItems.clientpreInit(); + } + public void init(FMLInitializationEvent e){ + super.init(e); + + } + } diff --git a/src/main/java/com/rebelkeithy/deeppockets/proxy/CommonProxy.java b/src/main/java/com/rebelkeithy/deeppockets/proxy/CommonProxy.java index 2306ad9..f506ab6 100644 --- a/src/main/java/com/rebelkeithy/deeppockets/proxy/CommonProxy.java +++ b/src/main/java/com/rebelkeithy/deeppockets/proxy/CommonProxy.java @@ -1,8 +1,18 @@ package com.rebelkeithy.deeppockets.proxy; +import com.rebelkeithy.deeppockets.Items.DeepPocketsItems; + +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; + public class CommonProxy { - public void registerRenderers() - { - } + public void preinit(FMLPreInitializationEvent e){ + DeepPocketsItems.commonPreInit(); + } + public void init(FMLInitializationEvent e){ + + } + + } diff --git a/src/main/resources/assets/deeppockets/lang/en_US.lang b/src/main/resources/assets/deeppockets/lang/en_US.lang index 34b4388..f2204d3 100644 --- a/src/main/resources/assets/deeppockets/lang/en_US.lang +++ b/src/main/resources/assets/deeppockets/lang/en_US.lang @@ -1,2 +1,2 @@ -item.miningpack.name=Miner's Backpack -item.advancedminingpack.name=Advanced Miner's Backpack \ No newline at end of file +item.mining_pack.name=Miner's Backpack +item.advanced_mining_pack.name=Advanced Miner's Backpack \ No newline at end of file diff --git a/src/main/resources/assets/deeppockets/models/item/advanced_mining_pack.json b/src/main/resources/assets/deeppockets/models/item/advanced_mining_pack.json new file mode 100644 index 0000000..620183f --- /dev/null +++ b/src/main/resources/assets/deeppockets/models/item/advanced_mining_pack.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "deeppockets:items/advanced_mining_pack" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/deeppockets/models/item/advanced_mining_pack1.json b/src/main/resources/assets/deeppockets/models/item/advanced_mining_pack1.json new file mode 100644 index 0000000..83747ee --- /dev/null +++ b/src/main/resources/assets/deeppockets/models/item/advanced_mining_pack1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "deeppockets:items/advanced_mining_pack1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/deeppockets/models/item/advanced_mining_pack2.json b/src/main/resources/assets/deeppockets/models/item/advanced_mining_pack2.json new file mode 100644 index 0000000..29468ed --- /dev/null +++ b/src/main/resources/assets/deeppockets/models/item/advanced_mining_pack2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "deeppockets:items/advanced_mining_pack2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/deeppockets/models/item/advanced_mining_pack3.json b/src/main/resources/assets/deeppockets/models/item/advanced_mining_pack3.json new file mode 100644 index 0000000..9314d3b --- /dev/null +++ b/src/main/resources/assets/deeppockets/models/item/advanced_mining_pack3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "deeppockets:items/advanced_mining_pack3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/deeppockets/models/item/advanced_mining_pack4.json b/src/main/resources/assets/deeppockets/models/item/advanced_mining_pack4.json new file mode 100644 index 0000000..2e89f75 --- /dev/null +++ b/src/main/resources/assets/deeppockets/models/item/advanced_mining_pack4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "deeppockets:items/advanced_mining_pack4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/deeppockets/models/item/mining_pack.json b/src/main/resources/assets/deeppockets/models/item/mining_pack.json new file mode 100644 index 0000000..1bc4094 --- /dev/null +++ b/src/main/resources/assets/deeppockets/models/item/mining_pack.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "deeppockets:items/mining_pack" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/deeppockets/models/item/mining_pack1.json b/src/main/resources/assets/deeppockets/models/item/mining_pack1.json new file mode 100644 index 0000000..543a865 --- /dev/null +++ b/src/main/resources/assets/deeppockets/models/item/mining_pack1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "deeppockets:items/mining_pack1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/deeppockets/models/item/mining_pack2.json b/src/main/resources/assets/deeppockets/models/item/mining_pack2.json new file mode 100644 index 0000000..e99b164 --- /dev/null +++ b/src/main/resources/assets/deeppockets/models/item/mining_pack2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "deeppockets:items/mining_pack2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/deeppockets/models/item/mining_pack3.json b/src/main/resources/assets/deeppockets/models/item/mining_pack3.json new file mode 100644 index 0000000..2183466 --- /dev/null +++ b/src/main/resources/assets/deeppockets/models/item/mining_pack3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "deeppockets:items/mining_pack3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/deeppockets/models/item/mining_pack4.json b/src/main/resources/assets/deeppockets/models/item/mining_pack4.json new file mode 100644 index 0000000..3e7fd8b --- /dev/null +++ b/src/main/resources/assets/deeppockets/models/item/mining_pack4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "deeppockets:items/mining_pack4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/deeppockets/textures/items/advanced_mining_pack.png b/src/main/resources/assets/deeppockets/textures/items/advanced_mining_pack.png new file mode 100644 index 0000000..4377062 Binary files /dev/null and b/src/main/resources/assets/deeppockets/textures/items/advanced_mining_pack.png differ diff --git a/src/main/resources/assets/deeppockets/textures/items/advanced_mining_pack1.png b/src/main/resources/assets/deeppockets/textures/items/advanced_mining_pack1.png new file mode 100644 index 0000000..f54dc8d Binary files /dev/null and b/src/main/resources/assets/deeppockets/textures/items/advanced_mining_pack1.png differ diff --git a/src/main/resources/assets/deeppockets/textures/items/advanced_mining_pack2.png b/src/main/resources/assets/deeppockets/textures/items/advanced_mining_pack2.png new file mode 100644 index 0000000..6182812 Binary files /dev/null and b/src/main/resources/assets/deeppockets/textures/items/advanced_mining_pack2.png differ diff --git a/src/main/resources/assets/deeppockets/textures/items/advanced_mining_pack3.png b/src/main/resources/assets/deeppockets/textures/items/advanced_mining_pack3.png new file mode 100644 index 0000000..f80c15b Binary files /dev/null and b/src/main/resources/assets/deeppockets/textures/items/advanced_mining_pack3.png differ diff --git a/src/main/resources/assets/deeppockets/textures/items/advanced_mining_pack4.png b/src/main/resources/assets/deeppockets/textures/items/advanced_mining_pack4.png new file mode 100644 index 0000000..8cbd6a0 Binary files /dev/null and b/src/main/resources/assets/deeppockets/textures/items/advanced_mining_pack4.png differ diff --git a/src/main/resources/assets/deeppockets/textures/items/mining_pack.png b/src/main/resources/assets/deeppockets/textures/items/mining_pack.png new file mode 100644 index 0000000..ca348c2 Binary files /dev/null and b/src/main/resources/assets/deeppockets/textures/items/mining_pack.png differ diff --git a/src/main/resources/assets/deeppockets/textures/items/mining_pack1.png b/src/main/resources/assets/deeppockets/textures/items/mining_pack1.png new file mode 100644 index 0000000..3fe72d8 Binary files /dev/null and b/src/main/resources/assets/deeppockets/textures/items/mining_pack1.png differ diff --git a/src/main/resources/assets/deeppockets/textures/items/mining_pack2.png b/src/main/resources/assets/deeppockets/textures/items/mining_pack2.png new file mode 100644 index 0000000..83b297a Binary files /dev/null and b/src/main/resources/assets/deeppockets/textures/items/mining_pack2.png differ diff --git a/src/main/resources/assets/deeppockets/textures/items/mining_pack3.png b/src/main/resources/assets/deeppockets/textures/items/mining_pack3.png new file mode 100644 index 0000000..479eb06 Binary files /dev/null and b/src/main/resources/assets/deeppockets/textures/items/mining_pack3.png differ diff --git a/src/main/resources/assets/deeppockets/textures/items/mining_pack4.png b/src/main/resources/assets/deeppockets/textures/items/mining_pack4.png new file mode 100644 index 0000000..d5d1351 Binary files /dev/null and b/src/main/resources/assets/deeppockets/textures/items/mining_pack4.png differ