From 23cab39892231e61196cad5db0f23eefdb04698a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Dec 2015 11:05:00 -0600 Subject: [PATCH] All special flowers. item model system not yet done --- .../java/vazkii/botania/api/BotaniaAPI.java | 4 +- .../api/render/SpecialFlowerModel.java | 70 +++++++----- .../botania/api/state/BotaniaStateProps.java | 4 +- .../botania/api/state/PropertyClass.java | 35 ------ .../botania/api/state/PropertyString.java | 33 ++++++ .../client/core/handler/ModelHandler.java | 105 +++++++++++++++++- .../common/block/BlockSpecialFlower.java | 14 ++- .../common/block/tile/TileSpecialFlower.java | 5 + .../botania/blockstates/agricarnation.json | 11 ++ .../blockstates/agricarnationChibi.json | 11 ++ .../botania/blockstates/arcanerose.json | 11 ++ .../botania/blockstates/bellethorn.json | 11 ++ .../botania/blockstates/bellethornChibi.json | 11 ++ .../assets/botania/blockstates/bubbell.json | 11 ++ .../botania/blockstates/bubbellChibi.json | 11 ++ .../assets/botania/blockstates/clayconia.json | 11 ++ .../assets/botania/blockstates/daffomill.json | 11 ++ .../botania/blockstates/dandelifeon.json | 11 ++ .../assets/botania/blockstates/daybloom.json | 2 +- .../botania/blockstates/daybloomDecor.json | 11 ++ .../botania/blockstates/daybloomPrime.json | 11 ++ .../botania/blockstates/dreadthorn.json | 11 ++ .../assets/botania/blockstates/endoflame.json | 11 ++ .../botania/blockstates/entropinnyum.json | 11 ++ .../assets/botania/blockstates/exoflame.json | 11 ++ .../botania/blockstates/fallenKanade.json | 11 ++ .../botania/blockstates/gourmaryllis.json | 11 ++ .../botania/blockstates/heiseiDream.json | 11 ++ .../botania/blockstates/hopperhock.json | 11 ++ .../botania/blockstates/hopperhockChibi.json | 11 ++ .../assets/botania/blockstates/hyacidus.json | 11 ++ .../botania/blockstates/hydroangeas.json | 11 ++ .../botania/blockstates/hydroangeasDecor.json | 11 ++ .../botania/blockstates/jadedAmaranthus.json | 11 ++ .../assets/botania/blockstates/jiyuulia.json | 11 ++ .../assets/botania/blockstates/kekimurus.json | 11 ++ .../assets/botania/blockstates/loonium.json | 11 ++ .../assets/botania/blockstates/manastar.json | 11 ++ .../botania/blockstates/marimorphosis.json | 11 ++ .../blockstates/marimorphosisChibi.json | 11 ++ .../assets/botania/blockstates/medumone.json | 11 ++ .../assets/botania/blockstates/munchdew.json | 11 ++ .../botania/blockstates/narslimmus.json | 11 ++ .../botania/blockstates/nightshade.json | 11 ++ .../botania/blockstates/nightshadeDecor.json | 11 ++ .../botania/blockstates/nightshadePrime.json | 11 ++ .../assets/botania/blockstates/orechid.json | 11 ++ .../botania/blockstates/orechidIgnem.json | 11 ++ .../botania/blockstates/pollidisiac.json | 11 ++ .../assets/botania/blockstates/puredaisy.json | 11 ++ .../botania/blockstates/rafflowsia.json | 11 ++ .../botania/blockstates/rannuncarpus.json | 11 ++ .../blockstates/rannuncarpusChibi.json | 11 ++ .../botania/blockstates/solegnolia.json | 11 ++ .../botania/blockstates/solegnoliaChibi.json | 11 ++ .../botania/blockstates/specialFlower.json | 7 +- .../botania/blockstates/spectranthemum.json | 11 ++ .../botania/blockstates/spectrolus.json | 11 ++ .../botania/blockstates/tangleberrie.json | 11 ++ .../botania/blockstates/thermalily.json | 11 ++ .../assets/botania/blockstates/tigerseye.json | 11 ++ .../botania/blockstates/vinculotus.json | 11 ++ .../botania/models/block/cross_tinted.json | 28 +++++ 63 files changed, 802 insertions(+), 77 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/state/PropertyClass.java create mode 100644 src/main/java/vazkii/botania/api/state/PropertyString.java create mode 100644 src/main/resources/assets/botania/blockstates/agricarnation.json create mode 100644 src/main/resources/assets/botania/blockstates/agricarnationChibi.json create mode 100644 src/main/resources/assets/botania/blockstates/arcanerose.json create mode 100644 src/main/resources/assets/botania/blockstates/bellethorn.json create mode 100644 src/main/resources/assets/botania/blockstates/bellethornChibi.json create mode 100644 src/main/resources/assets/botania/blockstates/bubbell.json create mode 100644 src/main/resources/assets/botania/blockstates/bubbellChibi.json create mode 100644 src/main/resources/assets/botania/blockstates/clayconia.json create mode 100644 src/main/resources/assets/botania/blockstates/daffomill.json create mode 100644 src/main/resources/assets/botania/blockstates/dandelifeon.json create mode 100644 src/main/resources/assets/botania/blockstates/daybloomDecor.json create mode 100644 src/main/resources/assets/botania/blockstates/daybloomPrime.json create mode 100644 src/main/resources/assets/botania/blockstates/dreadthorn.json create mode 100644 src/main/resources/assets/botania/blockstates/endoflame.json create mode 100644 src/main/resources/assets/botania/blockstates/entropinnyum.json create mode 100644 src/main/resources/assets/botania/blockstates/exoflame.json create mode 100644 src/main/resources/assets/botania/blockstates/fallenKanade.json create mode 100644 src/main/resources/assets/botania/blockstates/gourmaryllis.json create mode 100644 src/main/resources/assets/botania/blockstates/heiseiDream.json create mode 100644 src/main/resources/assets/botania/blockstates/hopperhock.json create mode 100644 src/main/resources/assets/botania/blockstates/hopperhockChibi.json create mode 100644 src/main/resources/assets/botania/blockstates/hyacidus.json create mode 100644 src/main/resources/assets/botania/blockstates/hydroangeas.json create mode 100644 src/main/resources/assets/botania/blockstates/hydroangeasDecor.json create mode 100644 src/main/resources/assets/botania/blockstates/jadedAmaranthus.json create mode 100644 src/main/resources/assets/botania/blockstates/jiyuulia.json create mode 100644 src/main/resources/assets/botania/blockstates/kekimurus.json create mode 100644 src/main/resources/assets/botania/blockstates/loonium.json create mode 100644 src/main/resources/assets/botania/blockstates/manastar.json create mode 100644 src/main/resources/assets/botania/blockstates/marimorphosis.json create mode 100644 src/main/resources/assets/botania/blockstates/marimorphosisChibi.json create mode 100644 src/main/resources/assets/botania/blockstates/medumone.json create mode 100644 src/main/resources/assets/botania/blockstates/munchdew.json create mode 100644 src/main/resources/assets/botania/blockstates/narslimmus.json create mode 100644 src/main/resources/assets/botania/blockstates/nightshade.json create mode 100644 src/main/resources/assets/botania/blockstates/nightshadeDecor.json create mode 100644 src/main/resources/assets/botania/blockstates/nightshadePrime.json create mode 100644 src/main/resources/assets/botania/blockstates/orechid.json create mode 100644 src/main/resources/assets/botania/blockstates/orechidIgnem.json create mode 100644 src/main/resources/assets/botania/blockstates/pollidisiac.json create mode 100644 src/main/resources/assets/botania/blockstates/puredaisy.json create mode 100644 src/main/resources/assets/botania/blockstates/rafflowsia.json create mode 100644 src/main/resources/assets/botania/blockstates/rannuncarpus.json create mode 100644 src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json create mode 100644 src/main/resources/assets/botania/blockstates/solegnolia.json create mode 100644 src/main/resources/assets/botania/blockstates/solegnoliaChibi.json create mode 100644 src/main/resources/assets/botania/blockstates/spectranthemum.json create mode 100644 src/main/resources/assets/botania/blockstates/spectrolus.json create mode 100644 src/main/resources/assets/botania/blockstates/tangleberrie.json create mode 100644 src/main/resources/assets/botania/blockstates/thermalily.json create mode 100644 src/main/resources/assets/botania/blockstates/tigerseye.json create mode 100644 src/main/resources/assets/botania/blockstates/vinculotus.json create mode 100644 src/main/resources/assets/botania/models/block/cross_tinted.json diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index a8af5a43e..6a2611e3e 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -292,8 +292,6 @@ public final class BotaniaAPI { paintableBlocks.put(paintable, colorProp); return paintable; - - //todo 1.8 improve this } /** @@ -334,7 +332,7 @@ public final class BotaniaAPI { } public static boolean isBlockBlacklistedFromMagnet(IBlockState state) { - return isBlockBlacklistedFromMagnet(state.getBlock(), state.getBlock().getMetaFromState(state), 0); + return isBlockBlacklistedFromMagnet(state.getBlock(), state.getBlock().getMetaFromState(state)); } public static boolean isBlockBlacklistedFromMagnet(Block block, int meta) { diff --git a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java index 98eaf22ed..5ae966d5e 100644 --- a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java @@ -17,6 +17,7 @@ import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelManager; import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ICustomModelLoader; @@ -26,13 +27,15 @@ import net.minecraftforge.client.model.IModelCustomData; import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.ISmartBlockModel; +import net.minecraftforge.client.model.ISmartItemModel; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.common.FMLLog; import org.apache.commons.lang3.tuple.Pair; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.common.block.BlockSpecialFlower; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import javax.vecmath.Matrix4f; import java.io.IOException; @@ -49,25 +52,29 @@ public class SpecialFlowerModel implements IModelCustomData { * Tint is applied whenever a player recolors the flower using floral dye * todo 1.8.8 move this elsewhere or otherwise make it fit better with the rest of the subtile registration process * - * @param subTileClass - * @param model + * @param subTileName The String ID of the subtile + * @param model A path to a blockstate json and variant to be used for this subtile */ - public static void register(Class subTileClass, ModelResourceLocation model) { - queuedModels.put(subTileClass, model); + public static void register(String subTileName, ModelResourceLocation model) { + queuedModels.put(subTileName, model); + } + + public static void register(Class clazz, ModelResourceLocation model) { + register(BotaniaAPI.getSubTileStringMapping(clazz), model); } /** * Internal implementation **/ // SpecialFlowerModel for when there are no models registered for a subtile - public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap.>, ModelResourceLocation>of()); + public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap., ModelResourceLocation>of()); // Models registered from the externel API thus far - private static final Map, ModelResourceLocation> queuedModels = Maps.newHashMap(); + private static final Map queuedModels = Maps.newHashMap(); - private final ImmutableMap>, ModelResourceLocation> models; + private final ImmutableMap, ModelResourceLocation> models; - public SpecialFlowerModel(ImmutableMap>, ModelResourceLocation> models) { + public SpecialFlowerModel(ImmutableMap, ModelResourceLocation> models) { this.models = models; } @@ -95,16 +102,16 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IModel process(ImmutableMap customData) { // Load the base variant from blockstate json, and also add all the model paths we received from external API - ImmutableMap.Builder>, ModelResourceLocation> builder = ImmutableMap.builder(); + ImmutableMap.Builder, ModelResourceLocation> builder = ImmutableMap.builder(); for (String key : customData.keySet()) { if ("base".equals(key)) { - builder.put(Optional.>absent(), getLocation(customData.get(key))); + builder.put(Optional.absent(), getLocation(customData.get(key))); } - for (Map.Entry, ModelResourceLocation> e : queuedModels.entrySet()) { - builder.put(Optional.>of(e.getKey()), e.getValue()); + for (Map.Entry e : queuedModels.entrySet()) { + builder.put(Optional.of(e.getKey()), e.getValue()); } } - ImmutableMap>, ModelResourceLocation> models = builder.build(); + ImmutableMap, ModelResourceLocation> models = builder.build(); if (models.isEmpty()) return INSTANCE; return new SpecialFlowerModel(models); } @@ -140,30 +147,30 @@ public class SpecialFlowerModel implements IModelCustomData { } } - public static class SpecialFlowerBakedModel implements IPerspectiveAwareModel, ISmartBlockModel { + public static class SpecialFlowerBakedModel implements IPerspectiveAwareModel, ISmartBlockModel, ISmartItemModel { private final ImmutableMap transforms; - private final ImmutableMap>, ModelResourceLocation> models; + private final ImmutableMap, ModelResourceLocation> models; private final VertexFormat vertexFormat; private IBakedModel baseModel; - private ImmutableMap, IBakedModel> bakedFlowerModels; + private ImmutableMap bakedFlowerModels; private ImmutableMap, ImmutableList> quads; - public SpecialFlowerBakedModel(ImmutableMap>, ModelResourceLocation> models, VertexFormat format, ImmutableMap cameraTransforms) { + public SpecialFlowerBakedModel(ImmutableMap, ModelResourceLocation> models, VertexFormat format, ImmutableMap cameraTransforms) { this.models = models; this.vertexFormat = format; this.transforms = cameraTransforms; } private void refreshBakedModels() { - System.out.println("Refreshing"); - //if (baseModel == null) { + if (baseModel == null) { + System.out.println("Refreshing baked models"); ModelManager manager = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager(); - baseModel = getModel(manager, Optional.>absent()); + baseModel = getModel(manager, Optional.absent()); - ImmutableMap.Builder, IBakedModel> builder = ImmutableMap.builder(); - for (Map.Entry>, ModelResourceLocation> e : models.entrySet()) { + ImmutableMap.Builder builder = ImmutableMap.builder(); + for (Map.Entry, ModelResourceLocation> e : models.entrySet()) { if (e.getKey().isPresent()) { builder.put(e.getKey().get(), getModel(manager, e.getKey())); } @@ -177,10 +184,10 @@ public class SpecialFlowerModel implements IModelCustomData { quadBuilder.put(Optional.of(side), buildQuads(Optional.of(side))); } quads = quadBuilder.build(); - //} + } } - private IBakedModel getModel(ModelManager manager, Optional> optClazz) { + private IBakedModel getModel(ModelManager manager, Optional optClazz) { ModelResourceLocation loc = models.get(optClazz); if (loc == null) { loc = new ModelResourceLocation("builtin/missing", "missing"); @@ -245,8 +252,11 @@ public class SpecialFlowerModel implements IModelCustomData { public IBakedModel handleBlockState(IBlockState state) { refreshBakedModels(); IExtendedBlockState extendedState = ((IExtendedBlockState) state); - Class clazz = extendedState.getValue(BotaniaStateProps.SUBTILE_CLASS); - return bakedFlowerModels.get(clazz); + IBakedModel ret = bakedFlowerModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); + if (ret == null) { + System.out.println("Warning: no flower model for subtile: " + extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); + } + return ret == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : ret; } @Override @@ -258,5 +268,11 @@ public class SpecialFlowerModel implements IModelCustomData { public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { return IPerspectiveAwareModel.MapWrapper.handlePerspective(this, transforms, cameraTransformType); } + + @Override + public IBakedModel handleItemState(ItemStack stack) { + refreshBakedModels(); + return bakedFlowerModels.get(ItemBlockSpecialFlower.getType(stack)); + } } } diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 499947994..8f1f680fb 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -10,8 +10,6 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.enums.*; -import javax.annotation.Nullable; - /** * Holds all Botania block state properties. Use these to set botania blockstates */ @@ -19,7 +17,7 @@ public class BotaniaStateProps { /** The property for specialFlower **/ - public static final PropertyClass SUBTILE_CLASS = new PropertyClass("subtile_class"); + public static final PropertyString SUBTILE_ID = new PropertyString("subtile_id"); /** Common properties to all blocks to use **/ diff --git a/src/main/java/vazkii/botania/api/state/PropertyClass.java b/src/main/java/vazkii/botania/api/state/PropertyClass.java deleted file mode 100644 index bb9f863ae..000000000 --- a/src/main/java/vazkii/botania/api/state/PropertyClass.java +++ /dev/null @@ -1,35 +0,0 @@ -package vazkii.botania.api.state; - -import net.minecraftforge.common.property.IUnlistedProperty; -import vazkii.botania.api.subtile.SubTileEntity; - -public class PropertyClass implements IUnlistedProperty> { - - private final String name; - - public PropertyClass(String name) { - this.name = name; - } - - @Override - public String getName() { - return name; - } - - @Override - public boolean isValid(Class value) { - return true; - } - - @Override - public Class> getType() { - // todo is there a safe way? - Class clazz = Class.class; - return clazz; - } - - @Override - public String valueToString(Class value) { - return value.getName(); - } -} diff --git a/src/main/java/vazkii/botania/api/state/PropertyString.java b/src/main/java/vazkii/botania/api/state/PropertyString.java new file mode 100644 index 000000000..ed414b7ea --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/PropertyString.java @@ -0,0 +1,33 @@ +package vazkii.botania.api.state; + +import net.minecraftforge.common.property.IUnlistedProperty; +import vazkii.botania.api.subtile.SubTileEntity; + +public class PropertyString implements IUnlistedProperty { + + private final String name; + + public PropertyString(String name) { + this.name = name; + } + + @Override + public String getName() { + return name; + } + + @Override + public boolean isValid(String value) { + return true; + } + + @Override + public Class getType() { + return String.class; + } + + @Override + public String valueToString(String value) { + return value; + } +} 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 edfa5e407..aa70d67be 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -23,8 +23,50 @@ import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; +import vazkii.botania.common.block.subtile.SubTileDecor; +import vazkii.botania.common.block.subtile.SubTileManastar; +import vazkii.botania.common.block.subtile.SubTilePureDaisy; +import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation; +import vazkii.botania.common.block.subtile.functional.SubTileBellethorn; +import vazkii.botania.common.block.subtile.functional.SubTileBubbell; +import vazkii.botania.common.block.subtile.functional.SubTileClayconia; +import vazkii.botania.common.block.subtile.functional.SubTileDaffomill; +import vazkii.botania.common.block.subtile.functional.SubTileDreadthorn; +import vazkii.botania.common.block.subtile.functional.SubTileExoflame; +import vazkii.botania.common.block.subtile.functional.SubTileFallenKanade; +import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream; +import vazkii.botania.common.block.subtile.functional.SubTileHopperhock; +import vazkii.botania.common.block.subtile.functional.SubTileHyacidus; +import vazkii.botania.common.block.subtile.functional.SubTileJadedAmaranthus; +import vazkii.botania.common.block.subtile.functional.SubTileJiyuulia; +import vazkii.botania.common.block.subtile.functional.SubTileLoonuim; +import vazkii.botania.common.block.subtile.functional.SubTileMarimorphosis; +import vazkii.botania.common.block.subtile.functional.SubTileMedumone; +import vazkii.botania.common.block.subtile.functional.SubTileOrechid; +import vazkii.botania.common.block.subtile.functional.SubTileOrechidIgnem; +import vazkii.botania.common.block.subtile.functional.SubTilePollidisiac; +import vazkii.botania.common.block.subtile.functional.SubTileRannuncarpus; +import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia; +import vazkii.botania.common.block.subtile.functional.SubTileSpectranthemum; +import vazkii.botania.common.block.subtile.functional.SubTileTangleberrie; +import vazkii.botania.common.block.subtile.functional.SubTileTigerseye; +import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; +import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose; +import vazkii.botania.common.block.subtile.generating.SubTileDandelifeon; import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; +import vazkii.botania.common.block.subtile.generating.SubTileEndoflame; +import vazkii.botania.common.block.subtile.generating.SubTileEntropinnyum; +import vazkii.botania.common.block.subtile.generating.SubTileGourmaryllis; +import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas; +import vazkii.botania.common.block.subtile.generating.SubTileKekimurus; +import vazkii.botania.common.block.subtile.generating.SubTileMunchdew; +import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; +import vazkii.botania.common.block.subtile.generating.SubTileNightshade; +import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; +import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; +import vazkii.botania.common.block.subtile.generating.SubTileThermalily; import vazkii.botania.common.item.ItemGaiaHead; +import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; @@ -42,7 +84,8 @@ public final class ModelHandler { ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); OBJLoader.instance.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); - SpecialFlowerModel.register(SubTileDaybloom.class, new ModelResourceLocation("botania:daybloom")); + /** Subtile block models **/ + registerSubtiles(); /** Custom statemappers **/ registerStateMappers(); @@ -69,6 +112,64 @@ public final class ModelHandler { /** Special Item Meshers **/ } + private static void registerSubtiles() { + SpecialFlowerModel.register(SubTileManastar.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MANASTAR)); + SpecialFlowerModel.register(SubTilePureDaisy.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_PUREDAISY)); + + SpecialFlowerModel.register(SubTileDaybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM)); + SpecialFlowerModel.register(SubTileDecor.Daybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM + "Decor")); + SpecialFlowerModel.register(SubTileDaybloom.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM_PRIME)); + SpecialFlowerModel.register(SubTileEndoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENDOFLAME)); + SpecialFlowerModel.register(SubTileHydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS)); + SpecialFlowerModel.register(SubTileDecor.Hydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS + "Decor")); + SpecialFlowerModel.register(SubTileThermalily.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_THERMALILY)); + SpecialFlowerModel.register(SubTileNightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE)); + SpecialFlowerModel.register(SubTileDecor.Nightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE + "Decor")); + SpecialFlowerModel.register(SubTileNightshade.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE_PRIME)); + SpecialFlowerModel.register(SubTileArcaneRose.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ARCANE_ROSE)); + SpecialFlowerModel.register(SubTileMunchdew.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MUNCHDEW)); + SpecialFlowerModel.register(SubTileEntropinnyum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENTROPINNYUM)); + SpecialFlowerModel.register(SubTileKekimurus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_KEKIMURUS)); + SpecialFlowerModel.register(SubTileGourmaryllis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_GOURMARYLLIS)); + SpecialFlowerModel.register(SubTileNarslimmus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NARSLIMMUS)); + SpecialFlowerModel.register(SubTileSpectrolus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTROLUS)); + SpecialFlowerModel.register(SubTileDandelifeon.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DANDELIFEON)); + SpecialFlowerModel.register(SubTileRafflowsia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RAFFLOWSIA)); + + SpecialFlowerModel.register(SubTileBellethorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN)); + SpecialFlowerModel.register(SubTileBellethorn.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN + "Chibi")); + SpecialFlowerModel.register(SubTileDreadthorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DREADTHORN)); + SpecialFlowerModel.register(SubTileHeiseiDream.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HEISEI_DREAM)); + SpecialFlowerModel.register(SubTileTigerseye.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TIGERSEYE)); + SpecialFlowerModel.register(SubTileJadedAmaranthus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JADED_AMARANTHUS)); + SpecialFlowerModel.register(SubTileOrechid.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID)); + SpecialFlowerModel.register(SubTileOrechidIgnem.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID_IGNEM)); + SpecialFlowerModel.register(SubTileFallenKanade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_FALLEN_KANADE)); + SpecialFlowerModel.register(SubTileExoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_EXOFLAME)); + SpecialFlowerModel.register(SubTileAgricarnation.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION)); + SpecialFlowerModel.register(SubTileAgricarnation.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION + "Chibi")); + SpecialFlowerModel.register(SubTileHopperhock.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK)); + SpecialFlowerModel.register(SubTileHopperhock.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK + "Chibi")); + SpecialFlowerModel.register(SubTileTangleberrie.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TANGLEBERRIE)); + SpecialFlowerModel.register(SubTileJiyuulia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JIYUULIA)); + SpecialFlowerModel.register(SubTileRannuncarpus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS)); + SpecialFlowerModel.register(SubTileRannuncarpus.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS + "Chibi")); + SpecialFlowerModel.register(SubTileHyacidus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYACIDUS)); + SpecialFlowerModel.register(SubTilePollidisiac.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_POLLIDISIAC)); + SpecialFlowerModel.register(SubTileClayconia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_CLAYCONIA)); + SpecialFlowerModel.register(SubTileLoonuim.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_LOONIUM)); + SpecialFlowerModel.register(SubTileDaffomill.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAFFOMILL)); + SpecialFlowerModel.register(SubTileVinculotus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_VINCULOTUS)); + SpecialFlowerModel.register(SubTileSpectranthemum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTRANTHEMUM)); + SpecialFlowerModel.register(SubTileMedumone.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MEDUMONE)); + SpecialFlowerModel.register(SubTileMarimorphosis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS)); + SpecialFlowerModel.register(SubTileMarimorphosis.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS + "Chibi")); + SpecialFlowerModel.register(SubTileBubbell.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL)); + SpecialFlowerModel.register(SubTileBubbell.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL + "Chibi")); + SpecialFlowerModel.register(SubTileSolegnolia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA)); + SpecialFlowerModel.register(SubTileSolegnolia.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA + "Chibi")); + } + private static void registerStandardBlocks() { registerItemModel(ModBlocks.manaGlass); registerItemModel(ModBlocks.elfGlass); @@ -76,6 +177,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.pistonRelay); registerItemModel(ModBlocks.distributor); registerItemModel(ModBlocks.starfield); + registerItemModel(ModBlocks.specialFlower); } private static void registerStandardItems() { @@ -144,7 +246,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()); - ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); // Ignore vanilla variant in walls ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index d77c7e5ca..1020c9b4a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -23,6 +23,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -35,6 +36,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.RegistrySimple; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.event.ModelBakeEvent; @@ -46,10 +48,10 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.render.SpecialFlowerModel; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.PropertyClass; import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.wand.IWandHUD; @@ -125,7 +127,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid setCreativeTab(BotaniaCreativeTab.INSTANCE); setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); setDefaultState(((IExtendedBlockState) blockState.getBaseState()) - .withProperty(BotaniaStateProps.SUBTILE_CLASS, SubTileDaybloom.class) + .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) ); MinecraftForge.EVENT_BUS.register(this); @@ -134,6 +136,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid @SubscribeEvent @SideOnly(Side.CLIENT) public void onModelBake(ModelBakeEvent evt) { + // Ignore all vanilla rules, redirect all blockstates to blockstates/specialFlower.json#normal evt.modelManager.getBlockModelShapes().registerBlockWithStateMapper(this, new DefaultStateMapper() { @Override public ModelResourceLocation getModelResourceLocation(IBlockState state) { @@ -144,15 +147,16 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid @Override public BlockState createBlockState() { - return new ExtendedBlockState(this, new IProperty[]{ getTypeProperty(), BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.SUBTILE_CLASS } ); + return new ExtendedBlockState(this, new IProperty[] { getTypeProperty(), BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.SUBTILE_ID } ); } @Override public IExtendedBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { TileEntity te = world.getTileEntity(pos); - if (te instanceof TileSpecialFlower) { + if (te instanceof TileSpecialFlower && ((TileSpecialFlower) te).getSubTile() != null) { Class clazz = ((TileSpecialFlower) te).getSubTile().getClass(); - return ((IExtendedBlockState) state).withProperty(BotaniaStateProps.SUBTILE_CLASS, clazz); + String id = BotaniaAPI.getSubTileStringMapping(clazz); + return ((IExtendedBlockState) state).withProperty(BotaniaStateProps.SUBTILE_ID, id); } else { return ((IExtendedBlockState) state); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index 76f96ec60..55508ed22 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -43,6 +43,11 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil public String subTileName = ""; SubTileEntity subTile; + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + return oldState.getBlock() != newState.getBlock(); + } + @Override public SubTileEntity getSubTile() { return subTile; diff --git a/src/main/resources/assets/botania/blockstates/agricarnation.json b/src/main/resources/assets/botania/blockstates/agricarnation.json new file mode 100644 index 000000000..1f4791fcb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/agricarnation.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/agricarnation" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/agricarnationChibi.json b/src/main/resources/assets/botania/blockstates/agricarnationChibi.json new file mode 100644 index 000000000..0a787c69f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/agricarnationChibi.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/agricarnationChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/arcanerose.json b/src/main/resources/assets/botania/blockstates/arcanerose.json new file mode 100644 index 000000000..07a49d320 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/arcanerose.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/arcanerose" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bellethorn.json b/src/main/resources/assets/botania/blockstates/bellethorn.json new file mode 100644 index 000000000..a50a918a3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bellethorn.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/bellethorn" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bellethornChibi.json b/src/main/resources/assets/botania/blockstates/bellethornChibi.json new file mode 100644 index 000000000..4304f7441 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bellethornChibi.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/bellethornChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bubbell.json b/src/main/resources/assets/botania/blockstates/bubbell.json new file mode 100644 index 000000000..230c9d266 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bubbell.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/bubbell" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bubbellChibi.json b/src/main/resources/assets/botania/blockstates/bubbellChibi.json new file mode 100644 index 000000000..24db9e26f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bubbellChibi.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/bubbellChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/clayconia.json b/src/main/resources/assets/botania/blockstates/clayconia.json new file mode 100644 index 000000000..dd8c1367e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/clayconia.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/clayconia" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/daffomill.json b/src/main/resources/assets/botania/blockstates/daffomill.json new file mode 100644 index 000000000..3ae43a628 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/daffomill.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/daffomill" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dandelifeon.json b/src/main/resources/assets/botania/blockstates/dandelifeon.json new file mode 100644 index 000000000..5aede7277 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dandelifeon.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/dandelifeon" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/daybloom.json b/src/main/resources/assets/botania/blockstates/daybloom.json index 0e618b004..a5f94ec99 100644 --- a/src/main/resources/assets/botania/blockstates/daybloom.json +++ b/src/main/resources/assets/botania/blockstates/daybloom.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "minecraft:cross", + "model": "botania:cross_tinted", "textures": { "cross": "botania:blocks/daybloom" } diff --git a/src/main/resources/assets/botania/blockstates/daybloomDecor.json b/src/main/resources/assets/botania/blockstates/daybloomDecor.json new file mode 100644 index 000000000..6c73c3985 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/daybloomDecor.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/daybloomDecor" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/daybloomPrime.json b/src/main/resources/assets/botania/blockstates/daybloomPrime.json new file mode 100644 index 000000000..11abe2aa3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/daybloomPrime.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/daybloomPrime" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreadthorn.json b/src/main/resources/assets/botania/blockstates/dreadthorn.json new file mode 100644 index 000000000..9e31450b9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreadthorn.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/dreadthorn" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endoflame.json b/src/main/resources/assets/botania/blockstates/endoflame.json new file mode 100644 index 000000000..b6cacbe4d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endoflame.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/endoflame" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/entropinnyum.json b/src/main/resources/assets/botania/blockstates/entropinnyum.json new file mode 100644 index 000000000..4f617beee --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/entropinnyum.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/entropinnyum" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/exoflame.json b/src/main/resources/assets/botania/blockstates/exoflame.json new file mode 100644 index 000000000..15444e52b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/exoflame.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/exoflame" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/fallenKanade.json b/src/main/resources/assets/botania/blockstates/fallenKanade.json new file mode 100644 index 000000000..828bc4bac --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/fallenKanade.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/fallenKanade" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/gourmaryllis.json b/src/main/resources/assets/botania/blockstates/gourmaryllis.json new file mode 100644 index 000000000..53fb50545 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/gourmaryllis.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/gourmaryllis" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/heiseiDream.json b/src/main/resources/assets/botania/blockstates/heiseiDream.json new file mode 100644 index 000000000..b64c70bca --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/heiseiDream.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/heiseiDream" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hopperhock.json b/src/main/resources/assets/botania/blockstates/hopperhock.json new file mode 100644 index 000000000..61bdcd4ab --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hopperhock.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/hopperhock" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hopperhockChibi.json b/src/main/resources/assets/botania/blockstates/hopperhockChibi.json new file mode 100644 index 000000000..526815ef0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hopperhockChibi.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/hopperhockChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hyacidus.json b/src/main/resources/assets/botania/blockstates/hyacidus.json new file mode 100644 index 000000000..416dc7d74 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hyacidus.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/hyacidus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hydroangeas.json b/src/main/resources/assets/botania/blockstates/hydroangeas.json new file mode 100644 index 000000000..f72ca06f5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hydroangeas.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/hydroangeas" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json b/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json new file mode 100644 index 000000000..652009361 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/hydroangeasDecor" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json b/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json new file mode 100644 index 000000000..699815cd3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/jadedAmaranthus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/jiyuulia.json b/src/main/resources/assets/botania/blockstates/jiyuulia.json new file mode 100644 index 000000000..c6122f3b6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/jiyuulia.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/jiyuulia" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/kekimurus.json b/src/main/resources/assets/botania/blockstates/kekimurus.json new file mode 100644 index 000000000..e96c95a5a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/kekimurus.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/kekimurus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/loonium.json b/src/main/resources/assets/botania/blockstates/loonium.json new file mode 100644 index 000000000..81fb21ab3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/loonium.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/loonium" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manastar.json b/src/main/resources/assets/botania/blockstates/manastar.json new file mode 100644 index 000000000..f807ab1e2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manastar.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/manastar" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/marimorphosis.json b/src/main/resources/assets/botania/blockstates/marimorphosis.json new file mode 100644 index 000000000..65fe4fd1e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/marimorphosis.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/marimorphosis" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json b/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json new file mode 100644 index 000000000..f535a40fd --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/marimorphosisChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/medumone.json b/src/main/resources/assets/botania/blockstates/medumone.json new file mode 100644 index 000000000..c33f095fa --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/medumone.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/medumone" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/munchdew.json b/src/main/resources/assets/botania/blockstates/munchdew.json new file mode 100644 index 000000000..f0c15b021 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/munchdew.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/munchdew" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/narslimmus.json b/src/main/resources/assets/botania/blockstates/narslimmus.json new file mode 100644 index 000000000..cc7f449cc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/narslimmus.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/narslimmus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/nightshade.json b/src/main/resources/assets/botania/blockstates/nightshade.json new file mode 100644 index 000000000..eaeb777fa --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/nightshade.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/nightshade" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/nightshadeDecor.json b/src/main/resources/assets/botania/blockstates/nightshadeDecor.json new file mode 100644 index 000000000..3faed861d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/nightshadeDecor.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/nightshadeDecor" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/nightshadePrime.json b/src/main/resources/assets/botania/blockstates/nightshadePrime.json new file mode 100644 index 000000000..b9fe29f91 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/nightshadePrime.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/nightshadePrime" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/orechid.json b/src/main/resources/assets/botania/blockstates/orechid.json new file mode 100644 index 000000000..1e1db9f86 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/orechid.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/orechid" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/orechidIgnem.json b/src/main/resources/assets/botania/blockstates/orechidIgnem.json new file mode 100644 index 000000000..dd0672b64 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/orechidIgnem.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/orechidIgnem" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pollidisiac.json b/src/main/resources/assets/botania/blockstates/pollidisiac.json new file mode 100644 index 000000000..90e8597a2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pollidisiac.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/pollidisiac" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/puredaisy.json b/src/main/resources/assets/botania/blockstates/puredaisy.json new file mode 100644 index 000000000..1ce8a536c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/puredaisy.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/puredaisy" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rafflowsia.json b/src/main/resources/assets/botania/blockstates/rafflowsia.json new file mode 100644 index 000000000..8aea70fcb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/rafflowsia.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/rafflowsia" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rannuncarpus.json b/src/main/resources/assets/botania/blockstates/rannuncarpus.json new file mode 100644 index 000000000..01f847cb7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/rannuncarpus.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/rannuncarpus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json b/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json new file mode 100644 index 000000000..2ab3383d0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/rannuncarpusChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/solegnolia.json b/src/main/resources/assets/botania/blockstates/solegnolia.json new file mode 100644 index 000000000..0867bdb89 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/solegnolia.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/solegnolia" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json b/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json new file mode 100644 index 000000000..821339402 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/solegnoliaChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/specialFlower.json b/src/main/resources/assets/botania/blockstates/specialFlower.json index 281ffbc7c..3a011d524 100644 --- a/src/main/resources/assets/botania/blockstates/specialFlower.json +++ b/src/main/resources/assets/botania/blockstates/specialFlower.json @@ -7,7 +7,12 @@ "variants": { "normal": [{ "custom": { - "base": "minecraft:poppy#normal" + "base": "botania:flower#color=white" + } + }], + "inventory": [{ + "custom": { + "base": "minecraft:poppy" } }] } diff --git a/src/main/resources/assets/botania/blockstates/spectranthemum.json b/src/main/resources/assets/botania/blockstates/spectranthemum.json new file mode 100644 index 000000000..11e2c4829 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/spectranthemum.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/spectranthemum" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spectrolus.json b/src/main/resources/assets/botania/blockstates/spectrolus.json new file mode 100644 index 000000000..b5db8573d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/spectrolus.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/spectrolus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tangleberrie.json b/src/main/resources/assets/botania/blockstates/tangleberrie.json new file mode 100644 index 000000000..537af0349 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/tangleberrie.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/tangleberrie" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thermalily.json b/src/main/resources/assets/botania/blockstates/thermalily.json new file mode 100644 index 000000000..97db80469 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/thermalily.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/thermalily" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tigerseye.json b/src/main/resources/assets/botania/blockstates/tigerseye.json new file mode 100644 index 000000000..2c13a52ce --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/tigerseye.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/tigerseye" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/vinculotus.json b/src/main/resources/assets/botania/blockstates/vinculotus.json new file mode 100644 index 000000000..b85f1779b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/vinculotus.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/vinculotus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cross_tinted.json b/src/main/resources/assets/botania/models/block/cross_tinted.json new file mode 100644 index 000000000..f5aad893c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/cross_tinted.json @@ -0,0 +1,28 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#cross" + }, + "elements": [ + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 } + } + } + ] +}