Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions src/main/java/com/rebelkeithy/deeppockets/DeepPocketsMod.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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<Item> items = new ArrayList<Item>();

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<ModelResourceLocation> packModels = new ArrayList<ModelResourceLocation>();
List<ModelResourceLocation> advancedPackModels = new ArrayList<ModelResourceLocation>();
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<ModelResourceLocation> packModels = new ArrayList<ModelResourceLocation>();
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());
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<Integer, String> prefix = new HashMap<Integer, String>();
static
{
Expand Down Expand Up @@ -397,5 +403,5 @@ public void save(NBTTagCompound tag)
tag.removeTag(oreDictName);
}
}
}
}
}
23 changes: 4 additions & 19 deletions src/main/java/com/rebelkeithy/deeppockets/PackModel.java
Original file line number Diff line number Diff line change
@@ -1,36 +1,21 @@
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;

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;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
20 changes: 14 additions & 6 deletions src/main/java/com/rebelkeithy/deeppockets/proxy/ClientProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);

}

}
16 changes: 13 additions & 3 deletions src/main/java/com/rebelkeithy/deeppockets/proxy/CommonProxy.java
Original file line number Diff line number Diff line change
@@ -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){

}


}
4 changes: 2 additions & 2 deletions src/main/resources/assets/deeppockets/lang/en_US.lang
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
item.miningpack.name=Miner's Backpack
item.advancedminingpack.name=Advanced Miner's Backpack
item.mining_pack.name=Miner's Backpack
item.advanced_mining_pack.name=Advanced Miner's Backpack
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "deeppockets:items/advanced_mining_pack"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "deeppockets:items/advanced_mining_pack1"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "deeppockets:items/advanced_mining_pack2"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "deeppockets:items/advanced_mining_pack3"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "deeppockets:items/advanced_mining_pack4"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "deeppockets:items/mining_pack"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "deeppockets:items/mining_pack1"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "deeppockets:items/mining_pack2"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "deeppockets:items/mining_pack3"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "deeppockets:items/mining_pack4"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.