From 6997a96460719dbbea062921d14b1c37ccf912ec Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 24 Jul 2016 15:45:43 -0500 Subject: [PATCH] Slabs/walls/stairs own their own model registration --- .../client/core/handler/ModelHandler.java | 180 ++---------------- .../botania/common/block/BlockAvatar.java | 14 ++ .../botania/common/block/BlockGaiaHead.java | 13 +- .../botania/common/block/BlockHourglass.java | 14 ++ .../vazkii/botania/common/block/BlockMod.java | 10 +- .../common/block/BlockTeruTeruBozu.java | 10 + .../corporea/BlockCorporeaCrystalCube.java | 11 ++ .../block/corporea/BlockCorporeaIndex.java | 9 + .../decor/quartz/BlockSpecialQuartz.java | 9 + .../block/decor/slabs/BlockModSlab.java | 26 ++- .../block/decor/stairs/BlockModStairs.java | 13 +- .../decor/walls/BlockBiomeStoneWall.java | 13 ++ .../block/decor/walls/BlockModWall.java | 13 +- .../common/block/mana/BlockBellows.java | 14 ++ .../common/block/mana/BlockBrewery.java | 14 ++ .../botania/common/item/ItemManaCookie.java | 12 +- 16 files changed, 202 insertions(+), 173 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 9099887ec..d93f1b4a1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -123,17 +123,18 @@ public final class ModelHandler { registerStateMappers(); registerStandardBlocks(); - registerStairs(); - registerSlabs(); - registerQuartzBlocks(); + + for (Block block : Block.REGISTRY) { + if (block.getRegistryName().getResourceDomain().equalsIgnoreCase(LibMisc.MOD_ID) + && block instanceof IModelRegister) + ((IModelRegister) block).registerModels(); + } for (Item item : Item.REGISTRY) { if (item.getRegistryName().getResourceDomain().equalsIgnoreCase(LibMisc.MOD_ID) && item instanceof IModelRegister) ((IModelRegister) item).registerModels(); } - - registerTESRItems(); } private static void registerSubtiles() { @@ -208,6 +209,14 @@ public final class ModelHandler { } private static void registerStandardBlocks() { + registerBlockStandardPath(ModBlocks.avatar); + registerBlockStandardPath(ModBlocks.bellows); + registerBlockStandardPath(ModBlocks.brewery); + registerBlockStandardPath(ModBlocks.corporeaCrystalCube); + registerBlockStandardPath(ModBlocks.corporeaIndex); + registerBlockStandardPath(ModBlocks.hourglass); + registerBlockStandardPath(ModBlocks.teruTeruBozu); + registerBlockStandardPath(ModBlocks.alchemyCatalyst); registerBlockStandardPath(ModBlocks.alfPortal); registerBlockCustomPath(ModFluffBlocks.alfglassPane, "alfglass_pane"); @@ -302,31 +311,6 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); } - // Only for models that absolutely can't be converted to JSON. Use VERY sparingly - @SuppressWarnings("deprecation") - private static void registerTESRItems() { - registerBlockStandardPath(ModBlocks.avatar); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.avatar), 0, TileAvatar.class); - - registerBlockStandardPath(ModBlocks.bellows); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.bellows), 0, TileBellows.class); - - registerBlockStandardPath(ModBlocks.brewery); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.brewery), 0, TileBrewery.class); - - registerBlockStandardPath(ModBlocks.corporeaCrystalCube); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaCrystalCube), 0, TileCorporeaCrystalCube.class); - - registerBlockStandardPath(ModBlocks.corporeaIndex); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaIndex), 0, TileCorporeaIndex.class); - - registerBlockStandardPath(ModBlocks.hourglass); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.hourglass), 0, TileHourglass.class); - - registerBlockStandardPath(ModBlocks.teruTeruBozu); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.teruTeruBozu), 0, TileTeruTeruBozu.class); - } - private static void registerStateMappers() { // Override to let custom model loader work, see SpecialFlowerModel ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); @@ -351,138 +335,6 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.flower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); - - // Ignore vanilla variant in walls - ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, - (new StateMap.Builder()).withName(BotaniaStateProps.BIOMESTONEWALL_VARIANT).ignore(BlockWall.VARIANT).withSuffix("_wall").build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - - // Ignore dummy variant in slabs - for (Block b : ModFluffBlocks.biomeStoneSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } - - for (Block b : ModFluffBlocks.pavementSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } - - List otherSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, - ModFluffBlocks.dreamwoodPlankSlab, - ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, - ModFluffBlocks.tileSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.darkQuartzSlab, - ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab, - ModFluffBlocks.shimmerrockSlab, ModFluffBlocks.shimmerwoodPlankSlab); - - for (Block b : otherSlabs) { - if (b == null) // Dark quartz disabled - continue; - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } - - // Ignore both dummy variant and half prop in full slabs - for (Block b : ModFluffBlocks.biomeStoneFullSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } - - for (Block b : ModFluffBlocks.pavementFullSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } - - List otherFullSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, - ModFluffBlocks.dreamwoodPlankSlabFull, - ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, - ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, - ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull, ModFluffBlocks.dirtPathSlabFull, - ModFluffBlocks.shimmerrockSlabFull, ModFluffBlocks.shimmerwoodPlankSlabFull); - - for (Block b : otherFullSlabs) { - if (b == null) // Dark quartz disabled - continue; - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } - - // Ignore everything in TESR items to suppress missing model errors - ModelLoader.setCustomStateMapper(ModBlocks.avatar, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); - ModelLoader.setCustomStateMapper(ModBlocks.bellows, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); - ModelLoader.setCustomStateMapper(ModBlocks.brewery, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); - ModelLoader.setCustomStateMapper(ModBlocks.gaiaHead, new StateMap.Builder().ignore(BlockSkull.FACING, BlockSkull.NODROP).build()); - ModelLoader.setCustomStateMapper(ModBlocks.hourglass, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); - } - - private static void registerStairs() { - for (Block b : ModFluffBlocks.pavementStairs) { - registerBlockStandardPath(b); - } - - for (Block b : ModFluffBlocks.biomeStoneStairs) { - registerBlockStandardPath(b); - } - - registerBlockStandardPath(ModFluffBlocks.blazeQuartzStairs); - if (ConfigHandler.darkQuartzEnabled) - registerBlockStandardPath(ModFluffBlocks.darkQuartzStairs); - registerBlockStandardPath(ModFluffBlocks.dreamwoodStairs); - registerBlockStandardPath(ModFluffBlocks.dreamwoodPlankStairs); - registerBlockStandardPath(ModFluffBlocks.elfQuartzStairs); - registerBlockStandardPath(ModFluffBlocks.lavenderQuartzStairs); - registerBlockStandardPath(ModFluffBlocks.livingrockStairs); - registerBlockStandardPath(ModFluffBlocks.livingrockBrickStairs); - registerBlockStandardPath(ModFluffBlocks.livingwoodStairs); - registerBlockStandardPath(ModFluffBlocks.livingwoodPlankStairs); - registerBlockStandardPath(ModFluffBlocks.manaQuartzStairs); - registerBlockStandardPath(ModFluffBlocks.netherBrickStairs); - registerBlockStandardPath(ModFluffBlocks.redQuartzStairs); - registerBlockStandardPath(ModFluffBlocks.shimmerrockStairs); - registerBlockStandardPath(ModFluffBlocks.shimmerwoodPlankStairs); - registerBlockStandardPath(ModFluffBlocks.snowBrickStairs); - registerBlockStandardPath(ModFluffBlocks.soulBrickStairs); - registerBlockStandardPath(ModFluffBlocks.sunnyQuartzStairs); - registerBlockStandardPath(ModFluffBlocks.tileStairs); - } - - private static void registerSlabs() { - for (Block b : ModFluffBlocks.biomeStoneSlabs) { - registerBlockVariant(b, "half=bottom"); - } - - for (Block b : ModFluffBlocks.pavementSlabs) { - registerBlockVariant(b, "half=bottom"); - } - - registerBlockVariant(ModFluffBlocks.livingwoodSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.livingwoodPlankSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.livingrockSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.livingrockBrickSlab, "half=bottom"); - - registerBlockVariant(ModFluffBlocks.blazeQuartzSlab, "half=bottom"); - if (ConfigHandler.darkQuartzEnabled) - registerBlockVariant(ModFluffBlocks.darkQuartzSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.elfQuartzSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.lavenderQuartzSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.manaQuartzSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.redQuartzSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.sunnyQuartzSlab, "half=bottom"); - - registerBlockVariant(ModFluffBlocks.dreamwoodSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.dreamwoodPlankSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.dirtPathSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.shimmerrockSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.shimmerwoodPlankSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.netherBrickSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.soulBrickSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.snowBrickSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.tileSlab, "half=bottom"); - } - - private static void registerQuartzBlocks() { - String[] variantNames = { "variant=normal", "variant=chiseled", "variant=pillar_y" }; - for (Block b : Lists.newArrayList(ModFluffBlocks.blazeQuartz, ModFluffBlocks.darkQuartz, ModFluffBlocks.elfQuartz, ModFluffBlocks.lavenderQuartz, ModFluffBlocks.manaQuartz, ModFluffBlocks.redQuartz, ModFluffBlocks.sunnyQuartz)) { - if (b == null) // Dark quartz disabled - continue; - registerBlockVariantMetas(b, 3, i -> variantNames[i]); - } } private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { @@ -523,7 +375,7 @@ public final class ModelHandler { registerBlockVariant(b, "normal"); } - private static void registerBlockVariant(Block b, String variant) { + public static void registerBlockVariant(Block b, String variant) { registerBlockVariantMetas(b, 1, variant); } @@ -531,7 +383,7 @@ public final class ModelHandler { registerBlockVariantMetas(b, maxExclusive, i -> variant); } - private static void registerBlockVariantMetas(Block b, int maxExclusive, IntFunction metaToVariant) { + public static void registerBlockVariantMetas(Block b, int maxExclusive, IntFunction metaToVariant) { Item item = Item.getItemFromBlock(b); for (int i = 0; i < maxExclusive; i++) { ModelLoader.setCustomModelResourceLocation( diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 1018721d1..e584f92af 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -14,9 +14,11 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -27,6 +29,10 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -146,4 +152,12 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return LexiconData.avatar; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileAvatar.class); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index a69d006c8..9acc0d285 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockSkull; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -22,7 +23,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +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; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; @@ -33,7 +38,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -public class BlockGaiaHead extends BlockSkull { +public class BlockGaiaHead extends BlockSkull implements IModelRegister { public BlockGaiaHead() { GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD)); @@ -79,4 +84,10 @@ public class BlockGaiaHead extends BlockSkull { public TileEntity createNewTileEntity(World world, int meta) { return new TileGaiaHead(); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(FACING, NODROP).build()); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 1f23e5928..021119711 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -16,8 +16,10 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -29,6 +31,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; @@ -195,4 +201,12 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, return LexiconData.hourglass; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileHourglass.class); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index d8c4168be..e05cc29ce 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -14,7 +14,10 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.recipe.IElvenItem; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockElven; import vazkii.botania.common.item.block.ItemBlockMod; @@ -22,7 +25,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class BlockMod extends Block { +public class BlockMod extends Block implements IModelRegister { public BlockMod(Material par2Material, String name) { super(par2Material); @@ -41,4 +44,9 @@ public class BlockMod extends Block { return true; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index fb02e2916..9d41926c3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -26,6 +26,9 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TileTeruTeruBozu; @@ -138,4 +141,11 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { return LexiconData.teruTeruBozu; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileTeruTeruBozu.class); + } + } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index 2b11bd696..e51369563 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -16,6 +16,7 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -23,10 +24,13 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; @@ -125,4 +129,11 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return ((TileCorporeaCrystalCube) world.getTileEntity(pos)).compValue; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileCorporeaCrystalCube.class); + } + } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index fa81e090a..c0f3d0864 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -17,12 +17,14 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.ParticleDigging; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -108,4 +110,11 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl } } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileCorporeaIndex.class); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index b303e9532..f35138c83 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -28,6 +28,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.QuartzVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; @@ -124,4 +125,12 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return this == ModFluffBlocks.elfQuartz ? LexiconData.elvenResources : LexiconData.decorativeBlocks; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + String[] variantNames = { "variant=normal", "variant=chiseled", "variant=pillar_y" }; + ModelHandler.registerBlockVariantMetas(this, 3, i -> variantNames[i]); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index b6107bfee..7a408a90b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -6,6 +6,7 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -14,9 +15,15 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +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; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.core.handler.ModelHandler; +import vazkii.botania.client.render.IModelRegister; +import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lexicon.LexiconData; @@ -26,10 +33,10 @@ import javax.annotation.Nonnull; import java.util.Locale; import java.util.Random; -public abstract class BlockModSlab extends BlockSlab implements ILexiconable { +public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IModelRegister { - final String name; - protected final boolean doubleSlab; + private final String name; + private final boolean doubleSlab; public static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); public BlockModSlab(boolean full, Material mat, String name) { @@ -123,7 +130,18 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { return LexiconData.decorativeBlocks; } - public enum DummyEnum implements IStringSerializable { + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + if(!doubleSlab) { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + ModelHandler.registerBlockVariant(this, "half=bottom"); + } else { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } + } + + private enum DummyEnum implements IStringSerializable { SINGLETON { @Nonnull @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index db9ed0a3a..3de4a27f4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -2,20 +2,26 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.block.BlockStairs; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +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; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; -public class BlockModStairs extends BlockStairs implements ILexiconable { +public class BlockModStairs extends BlockStairs implements ILexiconable, IModelRegister { public BlockModStairs(IBlockState state, String name) { super(state); @@ -31,4 +37,9 @@ public class BlockModStairs extends BlockStairs implements ILexiconable { return LexiconData.decorativeBlocks; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(this), 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 8ac77e3f4..8420433eb 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -10,8 +10,10 @@ */ package vazkii.botania.common.block.decor.walls; +import net.minecraft.block.BlockWall; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -19,7 +21,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +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; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeStoneVariant; @@ -77,4 +82,12 @@ public class BlockBiomeStoneWall extends BlockModWall { return LexiconData.marimorphosis; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, + (new StateMap.Builder()).withName(BotaniaStateProps.BIOMESTONEWALL_VARIANT) + .ignore(BlockWall.VARIANT).withSuffix("_wall").build()); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 516f97deb..0e634615f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockWall; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,9 +23,13 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +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; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; @@ -33,7 +38,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; -public abstract class BlockModWall extends BlockWall implements ILexiconable { +public abstract class BlockModWall extends BlockWall implements ILexiconable, IModelRegister { public BlockModWall(Block block, int meta) { super(block); @@ -100,4 +105,10 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { return LexiconData.decorativeBlocks; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + } + } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index e03223cec..dd8ffa891 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -14,8 +14,10 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; @@ -25,6 +27,10 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -117,4 +123,12 @@ public class BlockBellows extends BlockMod implements ILexiconable { return LexiconData.bellows; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileBellows.class); + } + } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 3a456f05f..be16dd69d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -16,8 +16,10 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -28,6 +30,10 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -148,4 +154,12 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { ((TileBrewery) world.getTileEntity(pos)).renderHUD(mc, res); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileBrewery.class); + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index ac72c995a..b98ccc4d3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; @@ -19,8 +20,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +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; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; @@ -30,7 +35,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Locale; -public class ItemManaCookie extends ItemFood { +public class ItemManaCookie extends ItemFood implements IModelRegister { public ItemManaCookie() { super(0, 0.1F, false); @@ -54,4 +59,9 @@ public class ItemManaCookie extends ItemFood { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } }