From c08d2221fa5ec54669daa802083a273c452a8466 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 8 Jan 2016 16:52:53 +0100 Subject: [PATCH] This doesn't work. --- .../mod/blocks/base/BlockBase.java | 3 +++ .../mod/blocks/base/BlockBushBase.java | 3 +++ .../mod/blocks/base/BlockContainerBase.java | 2 ++ .../mod/blocks/base/BlockFluidFlowing.java | 3 +++ .../mod/blocks/base/BlockPlant.java | 3 +++ .../mod/blocks/base/BlockStair.java | 3 +++ .../mod/blocks/base/BlockWallAA.java | 3 +++ .../mod/items/base/ItemAllToolAA.java | 3 +++ .../mod/items/base/ItemArmorAA.java | 3 +++ .../mod/items/base/ItemAxeAA.java | 3 +++ .../mod/items/base/ItemBase.java | 3 +++ .../mod/items/base/ItemBucketAA.java | 3 +++ .../mod/items/base/ItemEnergy.java | 3 +++ .../mod/items/base/ItemFoodBase.java | 3 +++ .../mod/items/base/ItemHoeAA.java | 3 +++ .../mod/items/base/ItemPickaxeAA.java | 3 +++ .../mod/items/base/ItemShovelAA.java | 3 +++ .../mod/items/base/ItemSwordAA.java | 3 +++ .../mod/proxy/ClientProxy.java | 26 +++++++++++++++++++ .../actuallyadditions/mod/util/Util.java | 3 +++ .../blockstates/blockGrinder.json | 6 +++++ .../models/block/blockGrinder.json | 12 +++++++++ .../models/block/blockGrinderOn.json | 12 +++++++++ .../models/item/blockGrinder.json | 10 +++++++ 24 files changed, 122 insertions(+) create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockGrinder.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockGrinder.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockGrinderOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockGrinder.json diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java index 8b278af9b..a30a47613 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java @@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -41,6 +42,8 @@ public class BlockBase extends Block{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java index 58c407a74..2ef28c895 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java @@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.BlockBush; import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockState; @@ -39,6 +40,8 @@ public class BlockBushBase extends BlockBush{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java index 1107eba4e..b277ef052 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java @@ -59,6 +59,8 @@ public abstract class BlockContainerBase extends BlockContainer{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java index e35c10b0b..77b399785 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java @@ -14,6 +14,7 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.PosUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.material.Material; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; @@ -45,6 +46,8 @@ public class BlockFluidFlowing extends BlockFluidClassic{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java index 2fe64985b..eb08d0435 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java @@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.BlockCrops; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumRarity; @@ -51,6 +52,8 @@ public class BlockPlant extends BlockCrops{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java index e3ab693e7..5e820217c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java @@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.item.EnumRarity; @@ -44,6 +45,8 @@ public class BlockStair extends BlockStairs{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java index c052be249..d2f2dc179 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java @@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.block.BlockWall; import net.minecraft.block.state.IBlockState; @@ -51,6 +52,8 @@ public class BlockWallAA extends BlockWall{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java index 8a36cf0fa..f55898e1a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java @@ -15,6 +15,7 @@ import de.ellpeck.actuallyadditions.mod.config.ConfigValues; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.material.Material; @@ -74,6 +75,8 @@ public class ItemAllToolAA extends ItemTool{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java index d7868c13b..b6e560a42 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java @@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.items.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; @@ -46,6 +47,8 @@ public class ItemArmorAA extends ItemArmor{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAxeAA.java index 2d3589230..9716101a6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAxeAA.java @@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.items.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; @@ -43,6 +44,8 @@ public class ItemAxeAA extends ItemAxe{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java index f8eeb4f60..1b0751dd1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java @@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.items.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.Item; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -35,6 +36,8 @@ public class ItemBase extends Item{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBucketAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBucketAA.java index d43eed4ba..1346cf5d7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBucketAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBucketAA.java @@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.items.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.EnumRarity; @@ -40,6 +41,8 @@ public class ItemBucketAA extends ItemBucket{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java index e31b45f6a..5a4d2259d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java @@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.items.base; import cofh.api.energy.ItemEnergyContainer; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -47,6 +48,8 @@ public abstract class ItemEnergy extends ItemEnergyContainer{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java index 5953c2b85..d1dc47c3f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java @@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.items.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.ItemFood; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -36,6 +37,8 @@ public class ItemFoodBase extends ItemFood{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java index af3eddf2e..eef2dd295 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java @@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.items.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemHoe; @@ -44,6 +45,8 @@ public class ItemHoeAA extends ItemHoe{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemPickaxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemPickaxeAA.java index c6aa13ebd..9a063fa29 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemPickaxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemPickaxeAA.java @@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.items.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; @@ -43,6 +44,8 @@ public class ItemPickaxeAA extends ItemPickaxe{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemShovelAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemShovelAA.java index 3f7293658..fbb380d8a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemShovelAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemShovelAA.java @@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.items.base; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemSpade; @@ -44,6 +45,8 @@ public class ItemShovelAA extends ItemSpade{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java index fae0a2f9c..06183f132 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java @@ -14,6 +14,7 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; @@ -44,6 +45,8 @@ public class ItemSwordAA extends ItemSword{ else{ this.setCreativeTab(null); } + + Util.ITEMS_AND_BLOCKS.add(this); } protected String getBaseName(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java index 25df1657f..1864d8937 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java @@ -22,8 +22,14 @@ import de.ellpeck.actuallyadditions.mod.misc.special.SpecialRenderInit; import de.ellpeck.actuallyadditions.mod.tile.*; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import de.ellpeck.actuallyadditions.mod.util.playerdata.PersistentClientData; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemModelMesher; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.event.FMLInitializationEvent; @@ -31,7 +37,9 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import java.io.File; +import java.util.ArrayList; import java.util.Calendar; +import java.util.List; @SuppressWarnings("unused") public class ClientProxy implements IProxy{ @@ -75,6 +83,24 @@ public class ClientProxy implements IProxy{ //TODO Fix villager //VillagerRegistry.instance().registerVillagerSkin(ConfigIntValues.JAM_VILLAGER_ID.getValue(), new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/entity/villager/jamVillager.png")); + + for(Object o : Util.ITEMS_AND_BLOCKS){ + ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher(); + if(o instanceof Item){ + List subItems = new ArrayList(); + ((Item)o).getSubItems((Item)o, null, subItems); + for(ItemStack aStack : subItems){ + mesher.register(aStack.getItem(), aStack.getItemDamage(), new ModelResourceLocation(ModUtil.MOD_ID_LOWER+":"+aStack.getItem().getRegistryName(), "inventory")); + } + } + else if(o instanceof Block){ + List subItems = new ArrayList(); + ((Block)o).getSubBlocks(Item.getItemFromBlock((Block)o), null, subItems); + for(ItemStack aStack : subItems){ + mesher.register(aStack.getItem(), aStack.getItemDamage(), new ModelResourceLocation(ModUtil.MOD_ID_LOWER+":"+aStack.getItem().getRegistryName(), "inventory")); + } + } + } } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java index fff61d9e6..36ff8f015 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java @@ -24,12 +24,15 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; +import java.util.ArrayList; import java.util.List; import java.util.Random; @SuppressWarnings("unused") public class Util{ + public static final List ITEMS_AND_BLOCKS = new ArrayList(); + public static final Random RANDOM = new Random(); public static final int WILDCARD = OreDictionary.WILDCARD_VALUE; diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockGrinder.json b/src/main/resources/assets/actuallyadditions/blockstates/blockGrinder.json new file mode 100644 index 000000000..1d8694186 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockGrinder.json @@ -0,0 +1,6 @@ +{ + "variants": { + "meta=0": { "model": "actuallyadditions:blockGrinder" }, + "meta=1": { "model": "actuallyadditions:blockGrinderOn" } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockGrinder.json b/src/main/resources/assets/actuallyadditions/models/block/blockGrinder.json new file mode 100644 index 000000000..c6cf965b5 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockGrinder.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "actuallyadditions:blocks/blockGrinder", + "down": "actuallyadditions:blocks/blockGrinderBottom", + "up": "actuallyadditions:blocks/blockGrinderTop", + "north": "actuallyadditions:blocks/blockGrinder", + "east": "actuallyadditions:blocks/blockGrinder", + "south": "actuallyadditions:blocks/blockGrinder", + "west": "actuallyadditions:blocks/blockGrinder" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockGrinderOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockGrinderOn.json new file mode 100644 index 000000000..32ace4441 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockGrinderOn.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "actuallyadditions:blocks/blockGrinder", + "down": "actuallyadditions:blocks/blockGrinderBottom", + "up": "actuallyadditions:blocks/blockGrinderOn", + "north": "actuallyadditions:blocks/blockGrinder", + "east": "actuallyadditions:blocks/blockGrinder", + "south": "actuallyadditions:blocks/blockGrinder", + "west": "actuallyadditions:blocks/blockGrinder" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockGrinder.json b/src/main/resources/assets/actuallyadditions/models/item/blockGrinder.json new file mode 100644 index 000000000..f3ad2c432 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockGrinder.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockGrinder", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file