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 8b71b9c4d..e8e4bb083 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -9,36 +9,20 @@ package vazkii.botania.client.core.handler; import net.minecraft.block.Block; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.block.statemap.StateMap; +import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; +import net.minecraft.client.renderer.block.statemap.IStateMapper; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.obj.OBJLoader; -import net.minecraftforge.fml.common.registry.ForgeRegistries; +import net.minecraftforge.fml.common.registry.RegistryDelegate; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IFloatingFlower; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.AltGrassVariant; -import vazkii.botania.api.state.enums.AltarVariant; -import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; -import vazkii.botania.api.state.enums.CrateVariant; -import vazkii.botania.api.state.enums.CustomBrickVariant; -import vazkii.botania.api.state.enums.DrumVariant; -import vazkii.botania.api.state.enums.LivingRockVariant; -import vazkii.botania.api.state.enums.LivingWoodVariant; -import vazkii.botania.api.state.enums.LuminizerVariant; -import vazkii.botania.api.state.enums.PlatformVariant; -import vazkii.botania.api.state.enums.PoolVariant; -import vazkii.botania.api.state.enums.PylonVariant; -import vazkii.botania.api.state.enums.SpreaderVariant; -import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.client.model.SpecialFlowerModel; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.ModBlocks; @@ -90,6 +74,7 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import java.util.Locale; +import java.util.Map; import java.util.function.IntFunction; public final class ModelHandler { @@ -100,8 +85,6 @@ public final class ModelHandler { registerSubtiles(); - registerStandardBlocks(); - for(Block block : Block.REGISTRY) { if(block instanceof IModelRegister) ((IModelRegister) block).registerModels(); @@ -184,129 +167,10 @@ public final class ModelHandler { BotaniaAPIClient.registerSubtileModel(SubTileBergamute.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BERGAMUTE)); } - private static void registerStandardBlocks() { - registerBlockCustomPath(ModBlocks.avatar, "avatar"); - registerBlockCustomPath(ModBlocks.bellows, "bellows"); - registerBlockCustomPath(ModBlocks.brewery, "brewery"); - registerBlockVariantInventory(ModBlocks.corporeaCrystalCube); - registerBlockCustomPath(ModBlocks.corporeaIndex, "corporea_index"); - registerBlockCustomPath(ModBlocks.hourglass, "hovering_hourglass"); - registerBlockCustomPath(ModBlocks.teruTeruBozu, "teru_teru_bozu"); - - registerBlockVariantNormal(ModBlocks.alchemyCatalyst); - registerBlockVariant(ModBlocks.alfPortal, "state=off"); - registerBlockCustomPath(ModFluffBlocks.alfglassPane, "alfglass_pane"); - registerBlockVariantNormal(ModBlocks.bifrost); - registerBlockCustomPath(ModFluffBlocks.bifrostPane, "bifrost_pane"); - registerBlockVariantNormal(ModBlocks.bifrostPerm); - registerBlockCustomPathMetas(ModFluffBlocks.biomeStoneWall, 8, i -> BiomeStoneVariant.values()[i + 8].getName() + "_wall"); - registerBlockVariantNormal(ModBlocks.blazeBlock); - registerBlockVariant(ModBlocks.cacophonium, "powered=false"); - registerBlockVariantNormal(ModBlocks.cellBlock); - registerBlockVariantNormal(ModBlocks.conjurationCatalyst); - registerBlockVariantNormal(ModBlocks.cocoon); - registerBlockVariant(ModBlocks.corporeaFunnel, "powered=false"); - registerBlockVariant(ModBlocks.corporeaInterceptor, "powered=false"); - registerBlockVariant(ModBlocks.corporeaRetainer, "powered=false"); - registerBlockVariantNormal(ModBlocks.dirtPath); - registerBlockCustomPathMetas(ModBlocks.doubleFlower1, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i).getName()); - registerBlockCustomPathMetas(ModBlocks.doubleFlower2, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i + 8).getName()); - registerBlockVariantNormal(ModBlocks.distributor); - registerBlockCustomPath(ModFluffBlocks.dreamwoodWall, "dreamwood_wall"); - registerBlockVariantNormal(ModBlocks.elfGlass); - registerBlockVariantNormal(ModBlocks.enchantedSoil); - registerBlockVariant(ModBlocks.enchanter, "facing=x"); - registerBlockVariant(ModBlocks.enderEye, "powered=false"); - registerBlockVariant(ModBlocks.felPumpkin, "facing=north"); - registerBlockVariantInventory(ModBlocks.floatingSpecialFlower); - registerBlockCustomPathMetas(ModBlocks.flower, EnumDyeColor.values().length, i -> "flower_" + EnumDyeColor.byMetadata(i).getName()); - registerBlockVariantNormal(ModBlocks.forestEye); - registerBlockCustomPath(ModBlocks.ghostRail, "ghost_rail"); - registerBlockVariant(ModBlocks.incensePlate, "facing=south"); - registerBlockVariant(ModBlocks.lightLauncher, "powered=false"); - registerBlockCustomPath(ModFluffBlocks.livingrockWall, "livingrock_wall"); - registerBlockCustomPath(ModFluffBlocks.livingwoodWall, "livingwood_wall"); - registerBlockVariantNormal(ModBlocks.manaBomb); - registerBlockVariant(ModBlocks.manaDetector, "powered=false"); - registerBlockVariantNormal(ModBlocks.manaGlass); - registerBlockCustomPath(ModFluffBlocks.managlassPane, "managlass_pane"); - registerBlockVariantNormal(ModBlocks.manaVoid); - registerBlockCustomPathMetas(ModBlocks.mushroom, EnumDyeColor.values().length, i -> "mushroom_" + EnumDyeColor.byMetadata(i).getName()); - // Explicit mapping needed because saved meta does not match EnumDyeColor - EnumDyeColor[] manualMapping = { EnumDyeColor.WHITE, EnumDyeColor.BLACK, EnumDyeColor.BLUE, EnumDyeColor.RED, EnumDyeColor.YELLOW, EnumDyeColor.GREEN }; - registerBlockVariantMetas(ModFluffBlocks.pavement, 6, i -> "color=" + manualMapping[i].getName()); - registerBlockVariant(ModBlocks.prism, "has_lens=false,powered=false"); - registerBlockVariantNormal(ModBlocks.pistonRelay); - registerBlockVariantInventory(ModBlocks.pump); - registerBlockVariant(ModBlocks.redStringComparator, "facing=north"); - registerBlockVariant(ModBlocks.redStringContainer, "facing=north"); - registerBlockVariant(ModBlocks.redStringDispenser, "facing=north"); - registerBlockVariant(ModBlocks.redStringFertilizer, "facing=north"); - registerBlockVariant(ModBlocks.redStringInterceptor, "facing=north"); - registerBlockVariant(ModBlocks.redStringRelay, "facing=north"); - registerBlockVariantNormal(ModBlocks.rfGenerator); - registerBlockVariantNormal(ModBlocks.root); - registerBlockVariantNormal(ModBlocks.runeAltar); - registerBlockVariantNormal(ModBlocks.shimmerrock); - registerBlockVariantNormal(ModBlocks.shimmerwoodPlanks); - registerBlockCustomPathMetas(ModBlocks.shinyFlower, EnumDyeColor.values().length, i -> "glimmering_flower_" + EnumDyeColor.byMetadata(i).getName()); - registerBlockVariant(ModBlocks.sparkChanger, "powered=false"); - registerBlockVariantNormal(ModBlocks.spawnerClaw); - registerBlockVariantInventory(ModBlocks.specialFlower); - registerBlockVariant(ModBlocks.starfield, "powered=false"); - registerBlockVariantNormal(ModBlocks.terraPlate); - registerBlockVariantNormal(ModBlocks.tinyPlanet); - registerBlockVariant(ModBlocks.tinyPotato, "facing=north"); - registerBlockVariantNormal(ModBlocks.turntable); - - // Register all metas to variant inventory, so the smartmodel can take over from there. See MiscellaneousIcons - registerItemAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); - - // Item models which all use the same base model and recolored by render layer - registerBlockVariantMetas(ModBlocks.manaBeacon, EnumDyeColor.values().length, "normal"); - registerBlockVariantMetas(ModBlocks.petalBlock, EnumDyeColor.values().length, "normal"); - registerBlockVariantMetas(ModBlocks.unstableBlock, EnumDyeColor.values().length, "normal"); - - // Blocks which share models with their item, and have only one variant to switch over - registerVariantsDefaulted(ModBlocks.pylon, PylonVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.altar, AltarVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); - registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); - registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.customBrick, CustomBrickVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.dreamwood, LivingWoodVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.lightRelay, LuminizerVariant.class, "powered=false,variant"); - registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "pattern=none,variant"); - registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.pool, PoolVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.spreader, SpreaderVariant.class, "variant"); - // todo 1.8 this is temporary until animation API is done, currnetly item model textures will not match true spreader texture - registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); - } - - private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { - Item item = Item.getItemFromBlock(b); - for (T e : enumclazz.getEnumConstants()) { - String baseName = ForgeRegistries.BLOCKS.getKey(b).toString(); - String variantName = variantHeader + "=" + e.getName(); - ModelLoader.setCustomModelResourceLocation(item, e.ordinal(), new ModelResourceLocation(baseName, variantName)); - } - } - - /** - * Registers all metas of the given item to models/item/registryname.json - */ public static void registerItemAllMeta(Item item, int range) { registerItemMetas(item, range, i -> item.getRegistryName().getResourcePath()); } - /** - * Registers each meta of an item to models/item/registryname.json - * Range is exclusive upper bound - */ public static void registerItemAppendMeta(Item item, int maxExclusive, String loc) { registerItemMetas(item, maxExclusive, i -> loc + i); } @@ -320,44 +184,46 @@ public final class ModelHandler { } } - // -- Registers the ItemBlock model to be the Block's model, of the specified variant -- // - private static void registerBlockVariantNormal(Block b) { - registerBlockVariant(b, "normal"); + private static final Map, IStateMapper> customStateMappers = ReflectionHelper.getPrivateValue(ModelLoader.class, null, "customStateMappers"); + private static final DefaultStateMapper fallbackMapper = new DefaultStateMapper(); + + private static ModelResourceLocation getMrlForState(IBlockState state) { + return customStateMappers + .getOrDefault(state.getBlock().delegate, fallbackMapper) + .putStateModelLocations(state.getBlock()) + .get(state); + } + + public static void registerBlockToState(Block b, int meta, IBlockState state) { + ModelLoader.setCustomModelResourceLocation( + Item.getItemFromBlock(b), + meta, + getMrlForState(state) + ); + } + + public static void registerBlockToState(Block b, int maxExclusive) { + for(int i = 0; i < maxExclusive; i++) + registerBlockToState(b, i, b.getStateFromMeta(i)); } // Registers the ItemBlock to models/item/#inventory - private static void registerBlockVariantInventory(Block b) { - registerBlockVariant(b, "inventory"); - } - - public static void registerBlockVariant(Block b, String variant) { - registerBlockVariantMetas(b, 1, variant); - } - - private static void registerBlockVariantMetas(Block b, int maxExclusive, String variant) { - registerBlockVariantMetas(b, maxExclusive, i -> variant); - } - - public static void registerBlockVariantMetas(Block b, int maxExclusive, IntFunction metaToVariant) { - Item item = Item.getItemFromBlock(b); - for (int i = 0; i < maxExclusive; i++) { - ModelLoader.setCustomModelResourceLocation( - item, i, - new ModelResourceLocation(item.getRegistryName(), metaToVariant.apply(i)) - ); - } + public static void registerInventoryVariant(Block b) { + ModelLoader.setCustomModelResourceLocation( + Item.getItemFromBlock(b), 0, + new ModelResourceLocation(b.getRegistryName(), "inventory")); } // Registers the ItemBlock to a custom path in models/item/itemblock/ - private static void registerBlockCustomPath(Block b, String path) { - registerBlockCustomPathMetas(b, 1, path); + public static void registerCustomItemblock(Block b, String path) { + registerCustomItemblock(b, 1, path); } - private static void registerBlockCustomPathMetas(Block b, int maxExclusive, String path) { - registerBlockCustomPathMetas(b, maxExclusive, i -> path); + public static void registerCustomItemblock(Block b, int maxExclusive, String path) { + registerCustomItemblock(b, maxExclusive, i -> path); } - private static void registerBlockCustomPathMetas(Block b, int maxExclusive, IntFunction metaToPath) { + public static void registerCustomItemblock(Block b, int maxExclusive, IntFunction metaToPath) { Item item = Item.getItemFromBlock(b); for (int i = 0; i < maxExclusive; i++) { ModelLoader.setCustomModelResourceLocation( diff --git a/src/main/java/vazkii/botania/client/render/IModelRegister.java b/src/main/java/vazkii/botania/client/render/IModelRegister.java index 4f3f82a3d..358074074 100644 --- a/src/main/java/vazkii/botania/client/render/IModelRegister.java +++ b/src/main/java/vazkii/botania/client/render/IModelRegister.java @@ -6,6 +6,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; public interface IModelRegister { /** * Do whatever needs to be done to register models + * For Blocks, statemapper registration needs to be done BEFORE itemblock registration + * Exceptions to that rule are noted */ @SideOnly(Side.CLIENT) void registerModels(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 783bd6f29..1a0530836 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -29,10 +29,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; 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.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; @@ -151,4 +154,10 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.grassSeeds; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, AltGrassVariant.values().length); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 92ed8cdb2..06832a1cd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -30,19 +30,20 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltarVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileSimpleInventory; @@ -281,4 +282,10 @@ public class BlockAltar extends BlockMod implements ILexiconable { return LexiconData.apothecary; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, AltarVariant.values().length - 1); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index e584f92af..284f7461e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -37,6 +37,7 @@ import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileAvatar; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.InventoryHelper; @@ -155,9 +156,10 @@ public class BlockAvatar extends BlockMod implements ILexiconable { @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); + ModelHandler.registerCustomItemblock(this, "avatar"); + super.registerModels(); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 4fcb1771f..8e124cc99 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -27,9 +27,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +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; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -104,4 +107,10 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { return LexiconData.gardenOfGlass; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, 0, getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH)); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index df2662fa1..94b3c6404 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -25,9 +25,13 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.minecart.MinecartUpdateEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; 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.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; +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; @@ -36,7 +40,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class BlockGhostRail extends BlockRailBase implements ILexiconable, IRegisterCallback { +public class BlockGhostRail extends BlockRailBase implements ILexiconable, IRegisterCallback, IModelRegister { private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; @@ -114,4 +118,10 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable, IRegi GameRegistry.register(this); GameRegistry.register(new ItemBlockMod(this), getRegistryName()); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, "ghost_rail"); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 021119711..a57912d38 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -43,6 +43,7 @@ import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileHourglass; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.InventoryHelper; @@ -204,9 +205,9 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, @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); + ModelHandler.registerCustomItemblock(this, "hovering_hourglass"); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 0a3776833..1122d1310 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -26,11 +26,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; 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.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; @@ -170,4 +173,12 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable return LexiconData.luminizerTransport; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + int i = 0; + for(LuminizerVariant v : LuminizerVariant.values()) + ModelHandler.registerBlockToState(this, i++, getDefaultState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, v)); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index b185705b5..1948c3fef 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -22,10 +22,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; 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.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LivingRockVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -91,4 +94,10 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { return isDefaultVariant ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, LivingRockVariant.values().length); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 5a498e17b..00df2c3bd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -23,10 +23,13 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; 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.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LivingWoodVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -107,4 +110,10 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.DEFAULT; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, LivingWoodVariant.values().length); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 82cd912a9..ab6db0ee0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -12,11 +12,13 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.item.Item; 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.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockElven; @@ -47,7 +49,8 @@ public class BlockMod extends Block implements IModelRegister, IRegisterCallback @SideOnly(Side.CLIENT) @Override public void registerModels() { - + if(Item.getItemFromBlock(this) != null) + ModelHandler.registerBlockToState(this, 0, getDefaultState()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 2f5ea4375..b41bf12a5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -229,7 +229,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I @SideOnly(Side.CLIENT) @Override - public final void registerModels() { + public void registerModels() { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.FACING).build()); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java index 17b52f84f..291d3e405 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -5,7 +5,10 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import javax.annotation.Nonnull; @@ -42,4 +45,11 @@ public class BlockModDoubleFlower1 extends BlockModDoubleFlower { meta &= -9; return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.byMetadata(meta)); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ModelHandler.registerCustomItemblock(this, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i).getName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java index 2b6206e04..f28db0f6d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -5,7 +5,10 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import javax.annotation.Nonnull; @@ -43,4 +46,11 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { meta &= -9; return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.byMetadata(meta + 8)); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ModelHandler.registerCustomItemblock(this, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i + 8).getName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index f0583e55c..1d23e582f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -37,6 +37,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.IPickupAchievement; @@ -178,7 +179,8 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @SideOnly(Side.CLIENT) @Override - public final void registerModels() { + public void registerModels() { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(getTypeProperty()).build()); + ModelHandler.registerCustomItemblock(this, EnumDyeColor.values().length, i -> "flower_" + EnumDyeColor.byMetadata(i).getName()); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 24db554ee..12827d7b7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -30,6 +30,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; 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.api.state.BotaniaStateProps; @@ -37,6 +39,7 @@ import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.api.state.enums.CrateVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.block.tile.TileOpenCrate; import vazkii.botania.common.block.tile.TileSimpleInventory; @@ -188,4 +191,11 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, } } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, 0, getDefaultState()); + ModelHandler.registerBlockToState(this, 1, getDefaultState().withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.CRAFTY)); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 6d01833a5..a369ca59f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -41,6 +41,7 @@ import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileCamo; import vazkii.botania.common.block.tile.TilePlatform; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -160,6 +161,9 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, @SideOnly(Side.CLIENT) @Override public void registerModels() { + ModelHandler.registerBlockToState(this, 3); + // Statemapper after item registration, because the items should be registered to the actual variant names ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.PLATFORM_VARIANT).build()); + } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 0714cfdca..ba0caa08f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -26,11 +26,14 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PylonVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -143,4 +146,10 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi public boolean canStabaliseInfusion(World world, BlockPos pos) { return ConfigHandler.enableThaumcraftStablizers; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, PylonVariant.values().length); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 1950bee9c..e6ffa1476 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -55,6 +55,7 @@ import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -391,5 +392,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I public void registerModels() { // Let custom loader work ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).ignore(getTypeProperty()).build()); + ModelHandler.registerInventoryVariant(this); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 833d54301..18660b9c6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -22,10 +22,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; 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.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.StorageVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -90,4 +93,10 @@ public class BlockStorage extends BlockMod implements ILexiconable { return variant == StorageVariant.MANASTEEL ? LexiconData.pool : LexiconData.terrasteel; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, StorageVariant.values().length); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 9d41926c3..91dd42569 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -31,6 +31,7 @@ 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.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -144,7 +145,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override public void registerModels() { - super.registerModels(); + ModelHandler.registerCustomItemblock(this, "teru_teru_bozu"); 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 e51369563..9b755491f 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -33,6 +33,7 @@ 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.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.lexicon.LexiconData; @@ -132,7 +133,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi @SideOnly(Side.CLIENT) @Override public void registerModels() { - super.registerModels(); + ModelHandler.registerInventoryVariant(this); 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 c0f3d0864..1b19b8d79 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -31,6 +31,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.StorageVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; @@ -113,7 +114,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl @SideOnly(Side.CLIENT) @Override public void registerModels() { - super.registerModels(); + ModelHandler.registerCustomItemblock(this, "corporea_index"); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileCorporeaIndex.class); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 5edfa88f7..2ccbe8ee7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.util.EnumBlockRenderType; @@ -18,6 +19,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.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModFlower; @@ -74,4 +78,11 @@ public class BlockBuriedPetals extends BlockModFlower { public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.INVISIBLE; } + + @SideOnly(Side.CLIENT) + @Override + public final void registerModels() { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(getTypeProperty()).build()); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index 3e2da2553..d189bf730 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -22,10 +22,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; 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.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.CustomBrickVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; @@ -92,4 +95,10 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { return variant.getName().contains("azulejo") ? LexiconData.azulejo : LexiconData.decorativeBlocks; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, CustomBrickVariant.values().length); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 0d69d83f0..59142b4a3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -52,6 +52,7 @@ import vazkii.botania.api.item.IFloatingFlower.IslandType; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileFloatingFlower; @@ -256,5 +257,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); + // All to variant inventory so smartmodel can work + ModelHandler.registerItemAllMeta(Item.getItemFromBlock(this), EnumDyeColor.values().length); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java index c46d606c9..177a4d448 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -32,6 +32,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileManaBeacon; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; @@ -125,5 +126,6 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelHandler.registerBlockToState(this, EnumDyeColor.values().length); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index 640ac86fa..30e911e86 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -37,6 +37,8 @@ import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.Botania; import vazkii.botania.common.block.IRegisterCallback; import vazkii.botania.common.block.ModBlocks; @@ -52,7 +54,7 @@ import java.util.List; import java.util.Random; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) -public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable, IRegisterCallback { +public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable, IRegisterCallback, IModelRegister { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); @@ -160,4 +162,10 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis GameRegistry.register(this); GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, EnumDyeColor.values().length, i -> "mushroom_" + EnumDyeColor.byMetadata(i).getName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index 4fe5a108e..66bb3769d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -23,7 +23,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; @@ -104,4 +107,10 @@ public class BlockPavement extends BlockMod { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues().size()); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index 1852f142b..d79a8f01d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -29,6 +29,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.lexicon.LexiconData; @@ -91,6 +92,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelHandler.registerBlockToState(this, EnumDyeColor.values().length); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 66829a04a..4fc9d2a21 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -11,15 +11,21 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; 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.Optional; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; @@ -63,4 +69,11 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili @Override public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) {} + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(getTypeProperty()).build()); + ModelHandler.registerCustomItemblock(this, EnumDyeColor.values().length, i -> "glimmering_flower_" + EnumDyeColor.byMetadata(i).getName()); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java index 869661573..e6dcc0360 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -32,6 +32,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.core.helper.Vector3; @@ -129,6 +130,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelHandler.registerBlockToState(this, EnumDyeColor.values().length); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java index a8c054cfe..c5f206768 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java @@ -12,8 +12,11 @@ package vazkii.botania.common.block.decor.biomestone; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeStoneVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; @@ -54,4 +57,10 @@ public class BlockBiomeStoneA extends BlockBiomeStone { return meta; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, BiomeStoneVariant.values().length); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java index 5a1a61ca2..e8d43e23e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java @@ -12,8 +12,11 @@ package vazkii.botania.common.block.decor.biomestone; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeBrickVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; @@ -44,4 +47,10 @@ public class BlockBiomeStoneB extends BlockBiomeStone { } return getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, BiomeBrickVariant.values()[meta]); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, BiomeBrickVariant.values().length); + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java index 6bcd7df75..ff6db6a28 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java @@ -11,6 +11,9 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.util.BlockRenderLayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; @@ -26,4 +29,11 @@ public class BlockAlfglassPane extends BlockModPane { public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, "alfglass_pane"); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index c20a05633..5c8361ebb 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -11,6 +11,9 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.util.BlockRenderLayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; @@ -26,4 +29,11 @@ public class BlockBifrostPane extends BlockModPane { public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, "bifrost_pane"); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java index 359eb7a45..0f6b30830 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java @@ -11,6 +11,9 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.util.BlockRenderLayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; @@ -27,4 +30,11 @@ public class BlockManaglassPane extends BlockModPane { return BlockRenderLayer.TRANSLUCENT; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, "managlass_pane"); + } + + } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java index c60f7353f..503cbaba8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java @@ -19,6 +19,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.IRegisterCallback; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -27,7 +28,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class BlockModPane extends BlockPane implements IRegisterCallback { +public class BlockModPane extends BlockPane implements IRegisterCallback, IModelRegister { public BlockModPane(Block source) { super(Material.GLASS, false); @@ -59,4 +60,7 @@ public class BlockModPane extends BlockPane implements IRegisterCallback { GameRegistry.register(this); GameRegistry.register(new ItemBlockMod(this), getRegistryName()); } + + @Override + public void registerModels() {} } 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 f35138c83..bfeee198f 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 @@ -129,8 +129,9 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override public void registerModels() { - String[] variantNames = { "variant=normal", "variant=chiseled", "variant=pillar_y" }; - ModelHandler.registerBlockVariantMetas(this, 3, i -> variantNames[i]); + ModelHandler.registerBlockToState(this, 0, getDefaultState()); + ModelHandler.registerBlockToState(this, 1, getDefaultState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.CHISELED)); + ModelHandler.registerBlockToState(this, 2, getDefaultState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.PILLAR_Y)); } } 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 e90da5033..894cebdcc 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 @@ -140,7 +140,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IM public void registerModels() { if(!doubleSlab) { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - ModelHandler.registerBlockVariant(this, "half=bottom"); + ModelHandler.registerBlockToState(this, 0, getDefaultState()); } else { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); } 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 80e4c3054..b640df5b6 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 @@ -28,6 +28,7 @@ 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; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; @@ -88,6 +89,7 @@ public class BlockBiomeStoneWall extends BlockModWall { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).withName(BotaniaStateProps.BIOMESTONEWALL_VARIANT) .ignore(BlockWall.VARIANT).withSuffix("_wall").build()); + ModelHandler.registerCustomItemblock(this, 8, i -> BiomeStoneVariant.values()[i + 8].getName() + "_wall"); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java index 8555956dc..638ff1ee2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java @@ -11,6 +11,9 @@ package vazkii.botania.common.block.decor.walls.living; import net.minecraft.block.SoundType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.walls.BlockModWall; @@ -22,4 +25,10 @@ public class BlockDreamwoodWall extends BlockModWall { setSoundType(SoundType.WOOD); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, "dreamwood_wall"); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java index 4f44d3db0..9445b0d15 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java @@ -11,6 +11,9 @@ package vazkii.botania.common.block.decor.walls.living; import net.minecraft.block.SoundType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.walls.BlockModWall; @@ -23,4 +26,10 @@ public class BlockLivingrockWall extends BlockModWall { setSoundType(SoundType.STONE); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, "livingrock_wall"); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java index bc2ff754a..57e96e141 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java @@ -11,6 +11,9 @@ package vazkii.botania.common.block.decor.walls.living; import net.minecraft.block.SoundType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.walls.BlockModWall; @@ -22,4 +25,10 @@ public class BlockLivingwoodWall extends BlockModWall { setSoundType(SoundType.WOOD); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, "livingwood_wall"); + } + } 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 dd8ffa891..b1977d0f2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -34,6 +34,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileBellows; import vazkii.botania.common.entity.EntityDoppleganger; @@ -126,9 +127,9 @@ public class BlockBellows extends BlockMod implements ILexiconable { @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); + ModelHandler.registerCustomItemblock(this, "bellows"); } } 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 be16dd69d..dba0c5684 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -38,6 +38,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileBrewery; import vazkii.botania.common.block.tile.TileSimpleInventory; @@ -157,9 +158,9 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { @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); + ModelHandler.registerCustomItemblock(this, "brewery"); } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index f9c6d5df7..9ccc259bd 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -29,11 +29,14 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; +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; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.item.ModItems; @@ -177,4 +180,10 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, ((TileEnchanter) world.getTileEntity(pos)).renderHUD(res); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, 0, getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X)); + } + } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 1edb23326..d97c22040 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -31,12 +31,15 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.DrumVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.ItemGrassHorn; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -189,4 +192,10 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, DrumVariant.values().length); + } + } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 2c5ae29b4..1588489c8 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -45,6 +45,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockMod; @@ -246,5 +247,6 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelHandler.registerBlockToState(this, PoolVariant.values().length); } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index 0c6bf4fbd..5d4dfa13a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -27,9 +27,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; 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.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.lexicon.LexiconData; @@ -127,4 +130,10 @@ public class BlockPump extends BlockMod implements ILexiconable { public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TilePump(); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerInventoryVariant(this); + } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 09cd4e6f8..dd1f0e617 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -31,6 +31,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; 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.api.mana.ILens; @@ -39,6 +41,7 @@ import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.api.wand.IWireframeAABBProvider; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.core.helper.InventoryHelper; @@ -49,7 +52,6 @@ import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; import java.util.List; -import java.util.Random; public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider { @@ -236,4 +238,10 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex pos.getX() + 1 - f, pos.getY() + 1 - f, pos.getZ() + 1 - f); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, SpreaderVariant.values().length); + } + } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index a9bbfcf82..353babb9b 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -21,9 +21,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +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; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; @@ -71,4 +74,10 @@ public abstract class BlockRedString extends BlockMod implements ILexiconable { return LexiconData.redString; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, 0, getDefaultState().withProperty(BotaniaStateProps.FACING, EnumFacing.NORTH)); + } + } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java index 1ee5daa36..025ced489 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -82,6 +82,7 @@ public class BlockRedStringDispenser extends BlockRedString { @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + super.registerModels(); } } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 3f64d95a0..858dc92a5 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -100,6 +100,7 @@ public class BlockRedStringInterceptor extends BlockRedString { @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + super.registerModels(); } } diff --git a/src/main/resources/assets/botania/models/block/corporea_interceptor.json b/src/main/resources/assets/botania/models/block/corporea_interceptor.json index e94c14f92..ec405725a 100644 --- a/src/main/resources/assets/botania/models/block/corporea_interceptor.json +++ b/src/main/resources/assets/botania/models/block/corporea_interceptor.json @@ -1,5 +1,5 @@ { - "model": "minecraft:cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "bottom": "botania:blocks/corporeaInterceptor0", "top": "botania:blocks/corporeaInterceptor0",