diff --git a/MC18_notes.txt b/MC18_notes.txt index de9c28fb4..ea7bf1c46 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -9,6 +9,8 @@ Anyways, vanilla removed it from their method so we follow suit. * SubTileEntity's methods that are copied from block (onBlockadded, etc.) updated to match vanilla counterparts * Multiblock system reworked to use states and blockposes * Magnet blacklist still uses metas instead of states because they need to support the short maxvalue wildcard. +* Now includes a way for addons to pass the Botania loader the models they want to use to render their subtile with +* IRelic changed to use UUIDs -- Other -- * Most things left untouched to make patches from upstream easier @@ -21,7 +23,9 @@ Unless someone figures out a way to use the old one sorry :/ The systems needed to dynamically switch out the textures like that is not worth just throwing them into a resource pack * Slabs are kinda janky if you look at them - Mojang made some extremely silly assumptions and we're going to have to go with them * Quartz stair textures may be assigned incorrectly - resource pack authors check me -* Glass pane inner faces are not getting culled +* Glass pane inner faces are not getting culled (vanilla bug?) +* Some item forms of technical/non-user blocks are removed + * Full list: [all double slab items, all solid vine items] -- Todo -- * JSON models for everything (tedious/med-hard) diff --git a/build.properties b/build.properties index ed6bf3472..2c249269e 100644 --- a/build.properties +++ b/build.properties @@ -3,7 +3,7 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ -forge_version=11.15.0.1635-1.8.8 +forge_version=11.15.0.1649-1.8.8 mc_version=1.8.8 build_number=246 mod_name=Botania diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index a8af5a43e..77c00e022 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -88,7 +88,7 @@ public final class BotaniaAPI { public static Map seeds = new HashMap(); public static Set looniumBlacklist = new LinkedHashSet(); - public static Map paintableBlocks = new LinkedHashMap(); + public static Map> paintableBlocks = new LinkedHashMap>(); public static Set magnetBlacklist = new LinkedHashSet(); @@ -285,15 +285,9 @@ public final class BotaniaAPI { * You must also provide the PropertyEnum that this block uses to express its color * The component type of the property must be EnumDyeColor */ - public static Block registerPaintableBlock(Block paintable, PropertyEnum colorProp){ - if (colorProp.getValueClass() != EnumDyeColor.class) { - throw new IllegalArgumentException("Must be EnumDyeColor"); - } - + public static Block registerPaintableBlock(Block paintable, PropertyEnum colorProp){ paintableBlocks.put(paintable, colorProp); return paintable; - - //todo 1.8 improve this } /** @@ -334,7 +328,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/item/IRelic.java b/src/main/java/vazkii/botania/api/item/IRelic.java index aecd1cde4..d907d36b4 100644 --- a/src/main/java/vazkii/botania/api/item/IRelic.java +++ b/src/main/java/vazkii/botania/api/item/IRelic.java @@ -13,6 +13,8 @@ package vazkii.botania.api.item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import java.util.UUID; + /** * An item that implements this counts as a Relic item. This is purely for interaction * and other mod items should not implement this interface. @@ -20,14 +22,14 @@ import net.minecraft.stats.Achievement; public interface IRelic { /** - * Binds to the player name passed in. + * Binds to the player UUID passed in. */ - public void bindToUsername(String playerName, ItemStack stack); + public void bindToUuid(UUID playerName, ItemStack stack); /** - * Gets the username of the person this relic is bound to. + * Gets the UUID of the person this relic is bound to. */ - public String getSoulbindUsername(ItemStack stack); + public UUID getSoulbindUuid(ItemStack stack); /** * Sets the achievement that this relic binds to. diff --git a/src/main/java/vazkii/botania/api/mana/IManaCollector.java b/src/main/java/vazkii/botania/api/mana/IManaCollector.java index 280e46007..f62352864 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaCollector.java +++ b/src/main/java/vazkii/botania/api/mana/IManaCollector.java @@ -18,7 +18,7 @@ import vazkii.botania.api.internal.IManaBurst; * * Implementation Instructions:
* - Override invalidate() and onChunkUnload(), calling ManaNetworkEvent.removeCollector(this); on both.
- * - On the first tick of onUpdate(), call ManaNetworkEvent.addCollector(this); + * - On the first tick of update() (or onLoad() in Forge build 1606 or higher), call ManaNetworkEvent.addCollector(this); */ public interface IManaCollector extends IManaReceiver { diff --git a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java new file mode 100644 index 000000000..c8fecc1b4 --- /dev/null +++ b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java @@ -0,0 +1,351 @@ +package vazkii.botania.api.render; + +import com.google.common.base.Function; +import com.google.common.base.Optional; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Maps; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +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; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IModel; +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.item.block.ItemBlockSpecialFlower; + +import javax.vecmath.Matrix4f; +import java.io.IOException; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +public class SpecialFlowerModel implements IModelCustomData { + + /** + * Register your model for the given subtile class here. + * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work. + * Your model json must specify key "tintindex" in all the faces it wants tint applied. + * 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 subTileName The String ID of the subtile + * @param model A path to a blockstate json and variant to be used for this subtile + * @param itemModel A path to a blockstate json and variant to be used for this subtile's item form + */ + public static void register(String subTileName, ModelResourceLocation model, ModelResourceLocation itemModel) { + queuedBlockModels.put(subTileName, model); + queuedItemModels.put(subTileName, itemModel); + } + + /** + * Register your model for the given subtile class here. + * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work. + * Your model json must specify key "tintindex" in all the faces it wants tint applied. + * 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 subTileName The String ID of the subtile + * @param model A path to a blockstate json and variant to be used the block. The item model will be drawn from the same blockstate json, from variant "inventory" + */ + public static void register(String subTileName, ModelResourceLocation model) { + register(subTileName, model, new ModelResourceLocation(model.getResourceDomain() + ":" + model.getResourcePath(), "inventory")); + } + + public static void register(Class clazz, ModelResourceLocation model) { + register(BotaniaAPI.getSubTileStringMapping(clazz), model); + } + + public static void register(Class clazz, ModelResourceLocation model, ModelResourceLocation itemModel) { + register(BotaniaAPI.getSubTileStringMapping(clazz), model, itemModel); + } + + /** + * Internal implementation + **/ + // SpecialFlowerModel for when there are no blockModels registered for a subtile + public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap., ModelResourceLocation>of(), ImmutableMap., ModelResourceLocation>of()); + // Models registered from the externel API thus far + private static final Map queuedBlockModels = Maps.newHashMap(); + private static final Map queuedItemModels = Maps.newHashMap(); + + + private final ImmutableMap, ModelResourceLocation> blockModels; + private final ImmutableMap, ModelResourceLocation> itemModels; + + public SpecialFlowerModel(ImmutableMap, ModelResourceLocation> blockModels, + ImmutableMap, ModelResourceLocation> itemModels) { + this.blockModels = blockModels; + this.itemModels = itemModels; + } + + @Override + public Collection getDependencies() { + ImmutableSet.Builder builder = ImmutableSet.builder(); + builder.addAll(blockModels.values()); + builder.addAll(itemModels.values()); + return builder.build(); + } + + @Override + public Collection getTextures() { + return ImmutableList.of(); + } + + @Override + public IFlexibleBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { + // "Bake" the SpecialFlowerModel (in reality, just create another wrapper for all the delegate blockModels) + return new SpecialFlowerBakedModel(blockModels, itemModels, format, IPerspectiveAwareModel.MapWrapper.getTransforms(state)); + } + + @Override + public IModelState getDefaultState() { + return TRSRTransformation.identity(); + } + + @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> blockBuilder = ImmutableMap.builder(); + ImmutableMap.Builder, ModelResourceLocation> itemBuilder = ImmutableMap.builder(); + + for (String key : customData.keySet()) { + if ("base".equals(key)) { + blockBuilder.put(Optional.absent(), getLocation(customData.get(key))); + } + } + + for (Map.Entry e : queuedBlockModels.entrySet()) { + blockBuilder.put(Optional.of(e.getKey()), e.getValue()); + } + for (Map.Entry e : queuedItemModels.entrySet()) { + itemBuilder.put(Optional.of(e.getKey()), e.getValue()); + } + + ImmutableMap, ModelResourceLocation> blockModels = blockBuilder.build(); + ImmutableMap, ModelResourceLocation> itemModels = itemBuilder.build(); + if (blockModels.isEmpty() && itemModels.isEmpty()) return INSTANCE; + return new SpecialFlowerModel(blockModels, itemModels); + } + + private ModelResourceLocation getLocation(String json) { + JsonElement e = new JsonParser().parse(json); + if (e.isJsonPrimitive() && e.getAsJsonPrimitive().isString()) { + return new ModelResourceLocation(e.getAsString()); + } + FMLLog.severe("Expect ModelResourceLocation, got: ", json); + return new ModelResourceLocation("builtin/missing", "missing"); + } + + public enum Loader implements ICustomModelLoader { + INSTANCE { + @Override + public void onResourceManagerReload(IResourceManager resourceManager) { + } + + @Override + public boolean accepts(ResourceLocation modelLocation) { + return modelLocation.getResourceDomain().equals("botania_special") && ( + modelLocation.getResourcePath().equals("specialFlower") || + modelLocation.getResourcePath().equals("models/block/specialFlower") || + modelLocation.getResourcePath().equals("models/item/specialFlower")); + } + + @Override + public IModel loadModel(ResourceLocation modelLocation) throws IOException { + // Load a dummy model for now, all actual blockModels added in process(). + return SpecialFlowerModel.INSTANCE; + } + } + } + + public static class SpecialFlowerBakedModel implements IPerspectiveAwareModel, ISmartBlockModel, ISmartItemModel { + + private final ImmutableMap transforms; + private final ImmutableMap, ModelResourceLocation> blockModels; + private final ImmutableMap, ModelResourceLocation> itemModels; + private final VertexFormat vertexFormat; + + private IBakedModel baseModel; + private ImmutableMap bakedBlockModels; + private ImmutableMap bakedItemModels; + private ImmutableMap, ImmutableList> quads; + + public SpecialFlowerBakedModel(ImmutableMap, ModelResourceLocation> blockModels, + ImmutableMap, ModelResourceLocation> itemModels, + VertexFormat format, ImmutableMap cameraTransforms) { + this.blockModels = blockModels; + this.itemModels = itemModels; + this.vertexFormat = format; + this.transforms = cameraTransforms; + } + + private void refreshBakedModels() { + if (baseModel == null) { + ModelManager manager = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager(); + baseModel = getBlockModel(manager, Optional.absent()); + + ImmutableMap.Builder builder = ImmutableMap.builder(); + for (Map.Entry, ModelResourceLocation> e : blockModels.entrySet()) { + if (e.getKey().isPresent()) { + builder.put(e.getKey().get(), getBlockModel(manager, e.getKey())); + } + } + + bakedBlockModels = builder.build(); + + ImmutableMap.Builder builder2 = ImmutableMap.builder(); + for (Map.Entry, ModelResourceLocation> e : itemModels.entrySet()) { + if (e.getKey().isPresent()) { + builder2.put(e.getKey().get(), getItemModel(manager, e.getKey())); + } + } + + bakedItemModels = builder2.build(); + + ImmutableMap.Builder, ImmutableList> quadBuilder = ImmutableMap.builder(); + quadBuilder.put(Optional.absent(), buildQuads(Optional.absent())); + for (EnumFacing side : EnumFacing.values()) { + quadBuilder.put(Optional.of(side), buildQuads(Optional.of(side))); + } + quads = quadBuilder.build(); + } + } + + private IBakedModel getBlockModel(ModelManager manager, Optional opt) { + ModelResourceLocation loc = blockModels.get(opt); + if (loc == null) { + loc = new ModelResourceLocation("builtin/missing", "missing"); + } + return manager.getModel(loc); + } + + private IBakedModel getItemModel(ModelManager manager, Optional opt) { + ModelResourceLocation loc = itemModels.get(opt); + if (loc == null) { + loc = new ModelResourceLocation("builtin/missing", "missing"); + } + return manager.getModel(loc); + } + + private ImmutableList buildQuads(Optional side) { + ImmutableList.Builder builder = ImmutableList.builder(); + for (IBakedModel model : bakedBlockModels.values()) { + if (side.isPresent()) { + builder.addAll(model.getFaceQuads(side.get())); + } else { + builder.addAll(model.getGeneralQuads()); + } + } + + for (IBakedModel model : bakedItemModels.values()) { + if (side.isPresent()) { + builder.addAll(model.getFaceQuads(side.get())); + } else { + builder.addAll(model.getGeneralQuads()); + } + } + + return builder.build(); + } + + @Override + public List getFaceQuads(EnumFacing side) { + refreshBakedModels(); + return quads.get(Optional.of(side)); + } + + @Override + public List getGeneralQuads() { + refreshBakedModels(); + return quads.get(Optional.absent()); + } + + @Override + public boolean isAmbientOcclusion() { + refreshBakedModels(); + return baseModel.isAmbientOcclusion(); + } + + @Override + public boolean isGui3d() { + refreshBakedModels(); + return baseModel.isGui3d(); + } + + @Override + public boolean isBuiltInRenderer() { + refreshBakedModels(); + return baseModel.isBuiltInRenderer(); + } + + @Override + public TextureAtlasSprite getParticleTexture() { + refreshBakedModels(); + return baseModel.getParticleTexture(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return ItemCameraTransforms.DEFAULT; + } + + @Override + public IBakedModel handleBlockState(IBlockState state) { + refreshBakedModels(); + IExtendedBlockState extendedState = ((IExtendedBlockState) state); + IBakedModel ret = bakedBlockModels.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 + public VertexFormat getFormat() { + return vertexFormat; + } + + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + return IPerspectiveAwareModel.MapWrapper.handlePerspective(this, transforms, cameraTransformType); + } + + @Override + public IBakedModel handleItemState(ItemStack stack) { + refreshBakedModels(); + //System.out.println("calling smart item"); + IBakedModel item = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack)); + if (item == null) { + System.out.println("Missing item model, selecting block model"); + item = bakedBlockModels.get(ItemBlockSpecialFlower.getType(stack)); + } + + return item == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : item; + } + } +} diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index b28839111..c8e9691fe 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -2,6 +2,8 @@ package vazkii.botania.api.state; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import net.minecraft.block.BlockRailBase; +import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; @@ -17,16 +19,20 @@ import javax.annotation.Nullable; */ public class BotaniaStateProps { + /** The property for specialFlower **/ + + public static final PropertyString SUBTILE_ID = new PropertyString("subtile_id"); + /** Common properties to all blocks to use **/ // The 16 Minecraft colors - public static final PropertyEnum COLOR = PropertyEnum.create("color", EnumDyeColor.class); + public static final PropertyEnum COLOR = PropertyEnum.create("color", EnumDyeColor.class); // The four cardinal directions - public static final PropertyEnum CARDINALS = PropertyEnum.create("facing", EnumFacing.class, EnumFacing.Plane.HORIZONTAL); + public static final PropertyEnum CARDINALS = PropertyEnum.create("facing", EnumFacing.class, EnumFacing.Plane.HORIZONTAL); // All 6 directions - public static final PropertyEnum FACING = PropertyEnum.create("facing", EnumFacing.class); + public static final PropertyEnum FACING = PropertyEnum.create("facing", EnumFacing.class); // Redstone power - boolean // Also for any other simple boolean "on/off" state @@ -38,18 +44,18 @@ public class BotaniaStateProps { /** Properties for certain kinds of blocks **/ // The axis directions (think quartz pillars and wood logs) - public static final PropertyEnum AXIS_FACING = BlockRotatedPillar.AXIS; + public static final PropertyEnum AXIS_FACING = BlockRotatedPillar.AXIS; // Extra Quartz Blocks - public static final PropertyEnum QUARTZ_VARIANT = PropertyEnum.create("variant", QuartzVariant.class); + public static final PropertyEnum QUARTZ_VARIANT = PropertyEnum.create("variant", QuartzVariant.class); /** Properties for individual blocks **/ // Block18Stone - public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); + public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); // Block18StoneWall - public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, new Predicate() { + public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, new Predicate() { @Override public boolean apply(FutureStoneVariant variant) { // Just the four kinds (no polished, chiseled, etc.) @@ -58,40 +64,51 @@ public class BotaniaStateProps { }); // BlockAlfPortal - public static final PropertyEnum ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class); + public static final PropertyEnum ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class); // BlockAltGrass - public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); + public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); // BlockBiomeStoneA - public static final PropertyEnum BIOMESTONE_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class); + public static final PropertyEnum BIOMESTONE_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class); // BlockBiomeStoneB - public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); + public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); + + // BlockBiomeStoneWall + public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, new Predicate() { + @Override + public boolean apply(BiomeStoneVariant input) { + return input.getName().contains("cobble"); + } + }); // BlockCustomBrick - public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); + public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); // BlockDreamWood, BlockLivingWood - public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); + public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); // BlockEnchanter - public static final PropertyEnum ENCHANTER_DIRECTION = PropertyEnum.create("facing", EnumFacing.Axis.class, Predicates.not(Predicates.equalTo(EnumFacing.Axis.Y))); + public static final PropertyEnum ENCHANTER_DIRECTION = PropertyEnum.create("facing", EnumFacing.Axis.class, Predicates.not(Predicates.equalTo(EnumFacing.Axis.Y))); // BlockEndStoneBrick - public static final PropertyEnum ENDBRICK_VARIANT = PropertyEnum.create("variant", EndBrickVariant.class); + public static final PropertyEnum ENDBRICK_VARIANT = PropertyEnum.create("variant", EndBrickVariant.class); // BlockForestDrum - public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); + public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); + + // BlockGhostRail + public static final PropertyEnum RAIL_DIRECTION = BlockRailPowered.SHAPE; // BlockLightRelay - public static final PropertyEnum LUMINIZER_VARIANT = PropertyEnum.create("variant", LuminizerVariant.class); + public static final PropertyEnum LUMINIZER_VARIANT = PropertyEnum.create("variant", LuminizerVariant.class); // BlockLivingRock - public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); + public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); // BlockModDoubleFlower - public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { @Override public boolean apply(EnumDyeColor input) { // White to gray @@ -99,7 +116,7 @@ public class BotaniaStateProps { } }); - public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { @Override public boolean apply(EnumDyeColor input) { // Silver to black @@ -108,10 +125,10 @@ public class BotaniaStateProps { }); // BlockOpenCrate - public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); + public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); // BlockPavement - public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate() { + public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate() { @Override public boolean apply(EnumDyeColor color) { return color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK @@ -121,25 +138,25 @@ public class BotaniaStateProps { }); // BlockPlatform - public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); + public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); // BlockPool - public static final PropertyEnum POOL_VARIANT = PropertyEnum.create("variant", PoolVariant.class); + public static final PropertyEnum POOL_VARIANT = PropertyEnum.create("variant", PoolVariant.class); // BlockPrism public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens"); // BlockPrismarine - public static final PropertyEnum PRISMARINE_VARIANT = PropertyEnum.create("variant", PrismarineVariant.class); + public static final PropertyEnum PRISMARINE_VARIANT = PropertyEnum.create("variant", PrismarineVariant.class); // BlockPylon - public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); + public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); // BlockSpreader - public static final PropertyEnum SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class); + public static final PropertyEnum SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class); // BlockStorage - public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); + public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); private BotaniaStateProps() {} } 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 3e8d99428..c272f9ea1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -1,31 +1,87 @@ package vazkii.botania.client.core.handler; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; import net.minecraft.block.Block; +import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.resources.model.ModelResourceLocation; 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.GameData; +import vazkii.botania.api.render.SpecialFlowerModel; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; +import vazkii.botania.api.state.enums.BiomeBrickVariant; +import vazkii.botania.api.state.enums.BiomeStoneVariant; +import vazkii.botania.api.state.enums.DrumVariant; +import vazkii.botania.api.state.enums.EndBrickVariant; +import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; +import vazkii.botania.api.state.enums.PylonVariant; 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.item.ItemGaiaHead; +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.lib.LibBlockNames; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import static vazkii.botania.common.item.ModItems.*; +import java.util.Collection; import java.util.List; import java.util.Locale; @@ -35,23 +91,25 @@ public final class ModelHandler { // In addition, many of the jsons currently use the vanilla format (simple and verified bug-free). // Once things settle down, we'll move to forge jsons, which will drastically cut down on the number of json files public static void registerModels() { + ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); OBJLoader.instance.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); + /** Subtile block models **/ + registerSubtiles(); + /** Custom statemappers **/ registerStateMappers(); /** ItemBlocks **/ registerStandardBlocks(); - registerStorage(); registerMushrooms(); registerFlowers(); - registerLivingRockWood(); - registerAltGrass(); + registerPavement(); registerStairs(); registerSlabs(); - registerFullSlabs(); + registerWalls(); registerPanes(); - registerPylons(); + registerUnstableBeaconPetal(); /** Normal Items **/ registerStandardItems(); @@ -62,15 +120,103 @@ public final class ModelHandler { registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); /** Special Item Meshers **/ } - private static void registerStandardBlocks() { - registerItemModel(ModBlocks.manaGlass); - registerItemModel(ModBlocks.elfGlass); + + 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); + registerItemModel(ModBlocks.runeAltar); + registerItemModel(ModBlocks.pistonRelay); + registerItemModel(ModBlocks.distributor); + registerItemModel(ModBlocks.starfield); + registerItemModel(ModBlocks.specialFlower); + registerItemModel(ModBlocks.dirtPath); + registerItemModel(ModBlocks.felPumpkin); + registerItemModel(ModBlocks.ghostRail); + registerItemModel(ModBlocks.shimmerrock); + registerItemModel(ModBlocks.shimmerwoodPlanks); + registerItemModel(ModBlocks.manaVoid); + registerItemModel(ModBlocks.alchemyCatalyst); + registerItemModel(ModBlocks.conjurationCatalyst); + registerItemModel(ModBlocks.reedBlock); + + // Blocks which share models with their item, and have only one variant to switch over + registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.pylon, PylonVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.dreamwood, LivingWoodVariant.class, "variant"); + registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant"); + registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); + registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.endStoneBrick, EndBrickVariant.class, "variant"); + } + private static void registerStandardItems() { registerItemModel(pestleAndMortar); registerItemModel(blackLotus); registerItemModel(blackLotus, 1); registerItemModel(lexicon); + registerItemModel(manaCookie); registerItemModel(manasteelHelm); registerItemModel(manasteelChest); @@ -108,22 +254,46 @@ public final class ModelHandler { registerItemModel(starSword); registerItemModel(thunderSword); registerItemModel(glassPick); + registerItemModel(twigWand); + + registerItemModel(dirtRod); + registerItemModel(cobbleRod); + registerItemModel(fireRod); + registerItemModel(rainbowRod); + registerItemModel(skyDirtRod); + registerItemModel(tornadoRod); + registerItemModel(terraformRod); } + private static void registerManaResources() { Item item = manaResource; for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { String name = "botania:" + LibItemNames.MANA_RESOURCE_NAMES[i]; - ModelLoader.addVariantName(item, name); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, "inventory")); } } private static void registerStateMappers() { + // Ignore vanilla facing, variant in double flower + ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); + ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); + + // Ignore redstone power state in some blocks + ModelLoader.setCustomStateMapper(ModBlocks.starfield, (new StateMap.Builder()).ignore(BotaniaStateProps.POWERED).build()); + + // Ignore color in unstable cube, mana beacon, and petals (handled by color multiplier) + ModelLoader.setCustomStateMapper(ModBlocks.unstableBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelLoader.setCustomStateMapper(ModBlocks.manaBeacon, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelLoader.setCustomStateMapper(ModBlocks.petalBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + // Ignore vanilla variant in flowers 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 in special flower to suppress errors (handled in custom statemapper in BlockSpecialFlower + ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR, ((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); // Ignore vanilla variant in walls ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); @@ -148,11 +318,12 @@ public final class ModelHandler { } List otherSlabs = ImmutableList.copyOf(new Block[] { - ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, + ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab, ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, ModFluffBlocks.tileSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, - ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab + ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab, + ModFluffBlocks.shimmerrockSlab, ModFluffBlocks.shimmerwoodPlankSlab, ModFluffBlocks.endStoneSlab, ModFluffBlocks.enderBrickSlab }); for (Block b : otherSlabs) { @@ -171,13 +342,14 @@ public final class ModelHandler { for (Block b : ModFluffBlocks.stoneFullSlabs) { ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); } - + List otherFullSlabs = ImmutableList.copyOf(new Block[] { - ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, + ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull, ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, - ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull + ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull, ModFluffBlocks.dirtPathSlabFull, + ModFluffBlocks.shimmerrockSlabFull, ModFluffBlocks.shimmerwoodPlankSlabFull, ModFluffBlocks.endStoneSlabFull, ModFluffBlocks.enderBrickSlabFull }); for (Block b : otherFullSlabs) { @@ -185,62 +357,86 @@ public final class ModelHandler { } } - private static void registerAltGrass() { - Item item = ItemGaiaHead.getItemFromBlock(ModBlocks.altGrass); - for (AltGrassVariant variant : AltGrassVariant.values()) { - String name = "botania:altGrass_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); - } - } - - private static void registerStorage() { - Item item = Item.getItemFromBlock(ModBlocks.storage); - for (StorageVariant variant : StorageVariant.values()) { - String name = "botania:storage_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); - } - } - private static void registerMushrooms() { Item item = Item.getItemFromBlock(ModBlocks.mushroom); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:mushroom_" + color.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.mushroom).toString(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory_" + color.getName())); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } } private static void registerFlowers() { Item item = Item.getItemFromBlock(ModBlocks.flower); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:flower_" + color.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.flower).toString(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory_" + color.getName())); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } item = Item.getItemFromBlock(ModBlocks.shinyFlower); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:shinyFlower_" + color.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.shinyFlower).toString(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory_" + color.getName())); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); + } + + item = Item.getItemFromBlock(ModBlocks.doubleFlower1); + for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1.getAllowedValues()) { + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower1).toString(); + String variant = "inventory_" + color.getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, variant)); + } + + item = Item.getItemFromBlock(ModBlocks.doubleFlower2); + for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_2.getAllowedValues()) { + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower2).toString(); + String variant = "inventory_" + color.getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant)); } } - private static void registerLivingRockWood() { - Item item = Item.getItemFromBlock(ModBlocks.livingrock); - for (LivingRockVariant variant : LivingRockVariant.values()) { - String name = "botania:livingrock_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); - } + private static void registerPavement() { + Item item = Item.getItemFromBlock(ModFluffBlocks.pavement); + String name = GameData.getBlockRegistry().getNameForObject(ModFluffBlocks.pavement).toString(); - item = Item.getItemFromBlock(ModBlocks.livingwood); - for (LivingWoodVariant variant : LivingWoodVariant.values()) { - String name = "botania:livingwood_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + for (EnumDyeColor e : BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues()) { + String variant = "color=" + e.getName(); + switch (e) { + case BLACK: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation(name, variant)); + break; + } + case BLUE: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation(name, variant)); + break; + } + case RED: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 3, new ModelResourceLocation(name, variant)); + break; + } + case YELLOW: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 4, new ModelResourceLocation(name, variant)); + break; + } + case GREEN: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 5, new ModelResourceLocation(name, variant)); + break; + } + case WHITE: + default: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(name, variant)); + break; + } + } } } @@ -286,11 +482,70 @@ public final class ModelHandler { } private static void registerSlabs() { + for (Block b : ModFluffBlocks.biomeStoneSlabs) { + registerItemModel(b); + } + + for (Block b : ModFluffBlocks.pavementSlabs) { + registerItemModel(b); + } + + for (Block b : ModFluffBlocks.stoneSlabs) { + registerItemModel(b); + } + + registerItemModel(ModFluffBlocks.livingwoodSlab); + registerItemModel(ModFluffBlocks.livingwoodPlankSlab); + registerItemModel(ModFluffBlocks.livingrockSlab); + registerItemModel(ModFluffBlocks.livingrockBrickSlab); + + registerItemModel(ModFluffBlocks.blazeQuartzSlab); + registerItemModel(ModFluffBlocks.darkQuartzSlab); + registerItemModel(ModFluffBlocks.elfQuartzSlab); + registerItemModel(ModFluffBlocks.lavenderQuartzSlab); + registerItemModel(ModFluffBlocks.manaQuartzSlab); + registerItemModel(ModFluffBlocks.redQuartzSlab); + registerItemModel(ModFluffBlocks.sunnyQuartzSlab); + + registerItemModel(ModFluffBlocks.dreamwoodSlab); + registerItemModel(ModFluffBlocks.dreamwoodPlankSlab); + registerItemModel(ModFluffBlocks.prismarineSlab); + registerItemModel(ModFluffBlocks.prismarineBrickSlab); + registerItemModel(ModFluffBlocks.darkPrismarineSlab); + registerItemModel(ModFluffBlocks.dirtPathSlab); + registerItemModel(ModFluffBlocks.shimmerrockSlab); + registerItemModel(ModFluffBlocks.shimmerwoodPlankSlab); + registerItemModel(ModFluffBlocks.endStoneSlab); + registerItemModel(ModFluffBlocks.enderBrickSlab); + registerItemModel(ModFluffBlocks.netherBrickSlab); + registerItemModel(ModFluffBlocks.soulBrickSlab); + registerItemModel(ModFluffBlocks.snowBrickSlab); + registerItemModel(ModFluffBlocks.tileSlab); + registerItemModel(ModFluffBlocks.reedSlab); + registerItemModel(ModFluffBlocks.thatchSlab); } - private static void registerFullSlabs() { + private static void registerWalls() { + Item item = Item.getItemFromBlock(ModFluffBlocks.biomeStoneWall); + for (BiomeStoneVariant variant : BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues()) { + String variantName = "inventory_" + variant.getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); + } + item = Item.getItemFromBlock(ModFluffBlocks.stoneWall); + for (FutureStoneVariant variant : BotaniaStateProps.FUTURESTONEWALL_VARIANT.getAllowedValues()) { + String variantName = "inventory_" + variant.getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation("botania:stone0Wall", variantName)); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation("botania:stone0Wall", variantName)); + } + + registerItemModel(ModFluffBlocks.livingrockWall); + registerItemModel(ModFluffBlocks.livingwoodWall); + registerItemModel(ModFluffBlocks.dreamwoodWall); + registerItemModel(ModFluffBlocks.prismarineWall); + registerItemModel(ModFluffBlocks.reedWall); } private static void registerPanes() { @@ -299,12 +554,28 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.managlassPane); } - private static void registerPylons() { - Item item = Item.getItemFromBlock(ModBlocks.pylon); - ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation("botania:pylon", "variant=mana")); - ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation("botania:pylon", "variant=natura")); - ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation("botania:pylon", "variant=gaia")); + private static void registerUnstableBeaconPetal() { + // The blocks that are dynamically colored, not through their states + for (EnumDyeColor color : EnumDyeColor.values()) { + Item unstable = Item.getItemFromBlock(ModBlocks.unstableBlock); + Item beacon = Item.getItemFromBlock(ModBlocks.manaBeacon); + Item petal = Item.getItemFromBlock(ModBlocks.petalBlock); + ModelLoader.setCustomModelResourceLocation(unstable, color.getMetadata(), new ModelResourceLocation("botania:unstableBlock", "inventory")); + ModelLoader.setCustomModelResourceLocation(beacon, color.getMetadata(), new ModelResourceLocation("botania:manaBeacon", "inventory")); + ModelLoader.setCustomModelResourceLocation(petal, color.getMetadata(), new ModelResourceLocation("botania:petalBlock", "inventory")); + } } + + private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { + Item item = Item.getItemFromBlock(b); + for (T e : enumclazz.getEnumConstants()) { + String baseName = GameData.getBlockRegistry().getNameForObject(b).toString(); + String variantName = variantHeader + "=" + e.getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(baseName, variantName)); + ModelLoader.setCustomModelResourceLocation(item, e.ordinal(), new ModelResourceLocation(baseName, variantName)); + } + } + private static void registerItemModelMetas(Item item, String loc,int range) { for(int i =0; i < range;i++) { String name = "botania:"+loc+i; @@ -312,6 +583,7 @@ public final class ModelHandler { ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name,"inventory")); } } + private static void registerItemModel(Block b) { registerItemModel(Item.getItemFromBlock(b)); } @@ -326,4 +598,4 @@ public final class ModelHandler { } private ModelHandler() {} -} \ No newline at end of file +} diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 31fd4f4a6..6b7424553 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -176,13 +176,11 @@ public final class RenderHelper { int r = (color & 0xFF0000) >> 16; int g = (color & 0xFF00) >> 8; int b = (color & 0xFF); - tessellator.getWorldRenderer().putColorMultiplier(r, g, b, (int) (255F * (1F - f2))); - tessellator.getWorldRenderer().pos(0, 0, 0).endVertex(); - tessellator.getWorldRenderer().putColorMultiplier(0F, 0F, 0F, 0); - tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).endVertex(); - tessellator.getWorldRenderer().pos(0.866D * f4, f3, -0.5F * f4).endVertex(); - tessellator.getWorldRenderer().pos(0, f3, 1F * f4).endVertex(); - tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).endVertex(); + tessellator.getWorldRenderer().pos(0, 0, 0).color(r, g, b, 255F * (1F - f2)).endVertex(); + tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getWorldRenderer().pos(0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getWorldRenderer().pos(0, f3, 1F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index e451cfd93..9e9c24c24 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -33,6 +33,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.item.IExtendedPlayerController; import vazkii.botania.api.lexicon.LexiconEntry; @@ -40,6 +41,7 @@ import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.AnyComponent; +import vazkii.botania.api.render.SpecialFlowerModel; import vazkii.botania.api.wiki.IWikiProvider; import vazkii.botania.api.wiki.WikiHooks; import vazkii.botania.client.challenge.ModChallenges; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 75b43e950..85577ca7f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -16,8 +16,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -59,17 +61,9 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); ItemStack stack = flower.getDisplayStack(); -// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 -// IIcon icon = stack.getIconIndex(); -// -// Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); -// float f = icon.getMinU(); -// float f1 = icon.getMaxU(); -// float f2 = icon.getMinV(); -// float f3 = icon.getMaxV(); -// GlStateManager.translate(0.25F, 0.4F, 0.5F); -// GlStateManager.scale(0.5F, 0.5F, 0.5F); -// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); + GlStateManager.translate(0.5F, 0.65F, 0.5F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); + Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.NONE); GlStateManager.color(1F, 1F, 1F); GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 30c32c351..217bbfecd 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -73,7 +73,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { time += new Random(tileentity.getPos().hashCode()).nextInt(100000); Color color = Color.getHSBColor(time * 0.005F, 0.6F, 1F); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) 255); + GL11.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) 255); } else { int hex = pool.color.getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index 580be7a9b..f55132eaf 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -44,7 +44,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { float f2 = (float)this.rendererDispatcher.entityZ; GlStateManager.disableLighting(); field_147527_e.setSeed(31100L); - float f3 = 0.75F; + float f3 = 0.24F; for (int i = 0; i < 16; ++i) { @@ -97,7 +97,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { GlStateManager.matrixMode(5890); GlStateManager.pushMatrix(); GlStateManager.loadIdentity(); - GlStateManager.translate(0.0F, (float)(Minecraft.getSystemTime() % 700000L) / 700000.0F, 0.0F); + GlStateManager.translate(0.0F, (float)(Minecraft.getSystemTime() % 20000) / 20000.0F, 0.0F); GlStateManager.scale(f5, f5, f5); GlStateManager.translate(0.5F, 0.5F, 0.0F); GlStateManager.rotate((float)(i * i * 4321 + i * 9) * 2.0F, 0.0F, 0.0F, 1.0F); @@ -117,6 +117,13 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { f11 = f12 = f13 = 1.0F * f6; } + Color color = Color.getHSBColor(Minecraft.getSystemTime() / 20F % 360 / 360F, 1F, 1F); + f11 = color.getRed() / 255F; + f12 = color.getGreen() / 255F; + f13 = color.getBlue() / 255F; + + f11 *= f6; f12 *= f6; f13 *= f6; + worldrenderer.pos(x, y + (double)f3, z).color(f11, f12, f13, 1.0F).endVertex(); worldrenderer.pos(x, y + (double)f3, z + 1.0D).color(f11, f12, f13, 1.0F).endVertex(); worldrenderer.pos(x + 1.0D, y + (double)f3, z + 1.0D).color(f11, f12, f13, 1.0F).endVertex(); diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 52b7311e0..6bd622ad1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -26,6 +26,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.minecart.MinecartUpdateEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; @@ -38,7 +39,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockGhostRail extends BlockRailBase implements ILexiconable { - public static final PropertyEnum SHAPE = BlockRailPowered.SHAPE; private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; public BlockGhostRail() { @@ -46,22 +46,22 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { setCreativeTab(BotaniaCreativeTab.INSTANCE); MinecraftForge.EVENT_BUS.register(this); setUnlocalizedName(LibBlockNames.GHOST_RAIL); - setDefaultState(blockState.getBaseState().withProperty(SHAPE, EnumRailDirection.NORTH_SOUTH)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH)); } @Override public BlockState createBlockState() { - return new BlockState(this, SHAPE); + return new BlockState(this, BotaniaStateProps.RAIL_DIRECTION); } @Override public int getMetaFromState(IBlockState state) { - return state.getValue(SHAPE).getMetadata(); + return state.getValue(BotaniaStateProps.RAIL_DIRECTION).getMetadata(); } @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(SHAPE, EnumRailDirection.byMetadata(meta)); + return getDefaultState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.byMetadata(meta)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 7493e23bb..63d7e748a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.block; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockDoublePlant; @@ -30,6 +32,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; @@ -50,15 +53,13 @@ import java.util.List; import java.util.Random; // Lots of copy paste from BlockDoublePlant because we can no longer extend it in 1.8.x -public abstract class BlockModDoubleFlower extends BlockBush implements IGrowable, IShearable, ILexiconable { - public static final PropertyEnum HALF = BlockDoublePlant.HALF; +public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable { private static final int COUNT = 8; final int offset; final boolean second; public BlockModDoubleFlower(boolean second) { - super(Material.vine); this.second = second; this.setHardness(0.0F); this.setStepSound(soundTypeGrass); @@ -93,7 +94,7 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl @Override public int damageDropped(IBlockState state) { - return getMetaFromState(state.withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER)); + return 0; } @Override @@ -106,11 +107,6 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl return true; } - @Override - public void grow(World world, Random rand, BlockPos pos, IBlockState state) { - // todo 1.8.8 drop - } - @Override public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, BlockPos pos, IBlockState state, TileEntity te) { if(p_149636_1_.isRemote || p_149636_2_.getCurrentEquippedItem() == null || p_149636_2_.getCurrentEquippedItem().getItem() != Items.shears || state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.LOWER) @@ -185,7 +181,10 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl @Override public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { ArrayList ret = new ArrayList(); - ret.add(new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos).withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER)))); + if (world.getBlockState(pos.down()).getBlock() == this + && world.getBlockState(pos.down()).getValue(HALF) == EnumBlockHalf.LOWER) { + ret.add(new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos.down())))); + } return ret; } @@ -205,14 +204,9 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl p_149666_3_.add(new ItemStack(p_149666_1_, 1, i)); } - @Override - public int getRenderType() { - return LibRenderIDs.idDoubleFlower; - } - @Override public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { - int hex = ((EnumDyeColor) state.getValue(second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1)).getMapColor().colorValue; + int hex = state.getValue(second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); @@ -227,93 +221,18 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl return LexiconData.flowers; } - - - /** BEGIN COPY BlockDoublePlant **/ - @Override - public void setBlockBoundsBasedOnState(IBlockAccess worldIn, BlockPos pos) - { - this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - } - - @Override - public boolean canPlaceBlockAt(World worldIn, BlockPos pos) - { - return super.canPlaceBlockAt(worldIn, pos) && worldIn.isAirBlock(pos.up()); - } - - @Override - protected void checkAndDropBlock(World worldIn, BlockPos pos, IBlockState state) - { - if (!this.canBlockStay(worldIn, pos, state)) - { - boolean flag = state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER; - BlockPos blockpos = flag ? pos : pos.up(); - BlockPos blockpos1 = flag ? pos.down() : pos; - Block block = (Block)(flag ? this : worldIn.getBlockState(blockpos).getBlock()); - Block block1 = (Block)(flag ? worldIn.getBlockState(blockpos1).getBlock() : this); - - if (!flag) this.dropBlockAsItem(worldIn, pos, state, 0); //Forge move above the setting to air. - - if (block == this) - { - worldIn.setBlockState(blockpos, Blocks.air.getDefaultState(), 2); - } - - if (block1 == this) - { - worldIn.setBlockState(blockpos1, Blocks.air.getDefaultState(), 3); - } - } - } - - @Override - public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state) - { - if (state.getBlock() != this) return super.canBlockStay(worldIn, pos, state); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check. - if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) - { - return worldIn.getBlockState(pos.down()).getBlock() == this; - } - else - { - IBlockState iblockstate = worldIn.getBlockState(pos.up()); - return iblockstate.getBlock() == this && super.canBlockStay(worldIn, pos, iblockstate); - } - } - - @Override - public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) - { - worldIn.setBlockState(pos.up(), this.getDefaultState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.UPPER), 2); - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) - { - if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) - { + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { IBlockState iblockstate = worldIn.getBlockState(pos.down()); - if (iblockstate.getBlock() == this) - { - state = state.withProperty(BotaniaStateProps.COLOR, iblockstate.getValue(BotaniaStateProps.COLOR)); + if (iblockstate.getBlock() == this) { + PropertyEnum prop = second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1; + state = state.withProperty(prop, iblockstate.getValue(prop)); } } - return state; + return state.withProperty(VARIANT, EnumPlantType.SUNFLOWER).withProperty(field_181084_N, EnumFacing.SOUTH); } - @Override - public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest) - { - //Forge: Break both parts on the client to prevent the top part flickering as default type for a few frames. - IBlockState state = world.getBlockState(pos); - if (state.getBlock() == this && state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.LOWER && world.getBlockState(pos.up()).getBlock() == this) - world.setBlockToAir(pos.up()); - return world.setBlockToAir(pos); - } - - } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java index 634f644ae..8d8c1b8b9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -4,23 +4,28 @@ import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; // White to Gray public class BlockModDoubleFlower1 extends BlockModDoubleFlower { public BlockModDoubleFlower1() { super(false); - setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); + setDefaultState(blockState.getBaseState() + .withProperty(field_181084_N, EnumFacing.SOUTH) + .withProperty(VARIANT, EnumPlantType.SUNFLOWER) + .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) + .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); } @Override public BlockState createBlockState() { - return new BlockState(this, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); + return new BlockState(this, field_181084_N, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); } @Override public int getMetaFromState(IBlockState state) { - int meta = ((EnumDyeColor) state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1)).getMetadata(); + int meta = state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getMetadata(); if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { meta |= 8; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java index 8604b2ddb..9f97b95eb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -4,6 +4,7 @@ import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; // Silver to black @@ -11,17 +12,21 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { public BlockModDoubleFlower2() { super(true); - setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); + setDefaultState(blockState.getBaseState() + .withProperty(field_181084_N, EnumFacing.SOUTH) + .withProperty(VARIANT, EnumPlantType.SUNFLOWER) + .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) + .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); } @Override public BlockState createBlockState() { - return new BlockState(this, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); + return new BlockState(this, field_181084_N, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); } @Override public int getMetaFromState(IBlockState state) { - int meta = ((EnumDyeColor) state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2)).getMetadata() - 8; + int meta = state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2).getMetadata() - 8; if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { meta |= 8; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index d908495df..bf678aa51 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -52,7 +52,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { @Override public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); + GameRegistry.registerBlock(this, null, par1Str); return super.setUnlocalizedName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 07b9dfc0b..a6ac0aeb9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -12,37 +12,58 @@ package vazkii.botania.common.block; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.client.particle.EntityDiggingFX; +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; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.RegistrySimple; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; +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.subtile.ISpecialFlower; +import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.lib.LibRenderIDs; +import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.integration.coloredlights.LightHelper; @@ -112,12 +133,40 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); + setDefaultState(((IExtendedBlockState) blockState.getBaseState()) + .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") + .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) + ); + MinecraftForge.EVENT_BUS.register(this); + } + + @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) { + return new ModelResourceLocation("botania:specialFlower"); + } + }); } @Override public BlockState createBlockState() { - return new BlockState(this, getTypeProperty(), BotaniaStateProps.COLOR); + 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 && ((TileSpecialFlower) te).getSubTile() != null) { + Class clazz = ((TileSpecialFlower) te).getSubTile().getClass(); + String id = BotaniaAPI.getSubTileStringMapping(clazz); + return ((IExtendedBlockState) state).withProperty(BotaniaStateProps.SUBTILE_ID, id); + } else { + return ((IExtendedBlockState) state); + } } @Override @@ -167,8 +216,8 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public int getRenderType() { - return LibRenderIDs.idSpecialFlower; + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.CUTOUT; } @Override @@ -257,11 +306,16 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public int colorMultiplier(IBlockAccess world, BlockPos pos, int pass) { - return ((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)) + public int getRenderColor(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)) .getMapColor().colorValue; } + @Override + public int colorMultiplier(IBlockAccess world, BlockPos pos, int pass) { + return getRenderColor(world.getBlockState(pos)); + } + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getCurrentEquippedItem(); @@ -280,4 +334,38 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); } + @Override + public boolean addLandingEffects(net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles) { + float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); + double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); + if (d0 > 2.5D) { + d0 = 2.5D; + } + int i = (int)(150.0D * d0); + worldObj.spawnParticle(EnumParticleTypes.BLOCK_DUST, entity.posX, entity.posY, entity.posZ, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, Block.getStateId(Blocks.waterlily.getDefaultState())); + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean addDestroyEffects(World world, BlockPos pos, EffectRenderer effectRenderer) { + if (world.getBlockState(pos).getBlock() == this) { + int i = 4; + EntityDiggingFX.Factory factory = new EntityDiggingFX.Factory(); + for (int j = 0; j < i; ++j) { + for (int k = 0; k < i; ++k) { + for (int l = 0; l < i; ++l) { + double d0 = (double)pos.getX() + ((double)j + 0.5D) / (double)i; + double d1 = (double)pos.getY() + ((double)k + 0.5D) / (double)i; + double d2 = (double)pos.getZ() + ((double)l + 0.5D) / (double)i; + effectRenderer.addEffect(factory.getEntityFX(-1, world, d0, d1, d2, d0 - (double)pos.getX() - 0.5D, d1 - (double)pos.getY() - 0.5D, d2 - (double)pos.getZ() - 0.5D, Block.getStateId(Blocks.waterlily.getDefaultState()))); + } + } + } + return true; + } else { + return false; + } + } + } 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 571b2390d..770d17284 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -33,6 +33,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileManaBeacon; +import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -51,6 +52,11 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Override + public int getRenderType() { + return 3; + } + @Override public BlockState createBlockState() { return new BlockState(this, BotaniaStateProps.COLOR); @@ -77,7 +83,7 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { @Override public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str); return super.setUnlocalizedName(par1Str); } 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 9b7d398c8..9db19fef0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -30,6 +30,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -76,7 +77,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { @Override public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str); return super.setUnlocalizedName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java index c965be68e..1d33853d7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -15,6 +15,7 @@ import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -47,7 +48,7 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - switch (((EnumFacing.Axis) state.getValue(BotaniaStateProps.AXIS_FACING))) { + switch (state.getValue(BotaniaStateProps.AXIS_FACING)) { case Z: return 8; case X: return 4; case Y: @@ -67,6 +68,11 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.AXIS_FACING, axis); } + @Override + public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { + return getStateFromMeta(meta).withProperty(BotaniaStateProps.AXIS_FACING, facing.getAxis()); + } + @Override public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index 45b856dcf..3ec634b7a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -39,6 +40,16 @@ public class BlockStarfield extends BlockModContainer implements ILexiconable { setBlockBounds(0F, 0F, 0F, 1F, 0.25F, 1F); } + @Override + public int getRenderType() { + return 3; + } + + @Override + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.CUTOUT_MIPPED; + } + @Override public BlockState createBlockState() { return new BlockState(this, BotaniaStateProps.POWERED); 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 a37883145..076ccc26b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -33,6 +33,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.core.helper.Vector3; +import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -76,7 +77,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { @Override public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str); return super.setUnlocalizedName(par1Str); } 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 3f261bc5d..3c411fd95 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 @@ -90,7 +90,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } public void register() { - GameRegistry.registerBlock(this, ItemBlockModSlab.class, name); + GameRegistry.registerBlock(this, isDouble() ? null : ItemBlockModSlab.class, name); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index 86cc6edde..cd37e895b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; @@ -31,10 +32,10 @@ import java.util.List; public class Block18StoneWall extends BlockModWall { public Block18StoneWall() { - super(ModFluffBlocks.stone, 4); + super(ModFluffBlocks.stone, 0); setHardness(1.5F); setResistance(10F); - setDefaultState(getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE).withProperty(VARIANT, EnumType.NORMAL)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE).withProperty(VARIANT, EnumType.NORMAL)); } @Override @@ -52,7 +53,7 @@ public class Block18StoneWall extends BlockModWall { if (meta < 0 || meta > 3) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]).withProperty(VARIANT, EnumType.NORMAL); + return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]); } @Override 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 44da2cace..5e6fa5f6e 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 @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; @@ -31,28 +32,28 @@ import java.util.List; public class BlockBiomeStoneWall extends BlockModWall { public BlockBiomeStoneWall() { - super(ModFluffBlocks.biomeStoneA, 8); + super(ModFluffBlocks.biomeStoneA, 0); setHardness(1.5F); setResistance(10F); - setDefaultState(getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST).withProperty(VARIANT, EnumType.NORMAL)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMESTONEWALL_VARIANT, BiomeStoneVariant.FOREST_COBBLE).withProperty(VARIANT, EnumType.NORMAL)); } @Override public BlockState createBlockState() { - return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONE_VARIANT); + return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONEWALL_VARIANT); } @Override public int getMetaFromState(IBlockState state) { - return ((Enum) state.getValue(BotaniaStateProps.BIOMESTONE_VARIANT)).ordinal(); + return ((Enum) state.getValue(BotaniaStateProps.BIOMESTONEWALL_VARIANT)).ordinal() - 8; } @Override public IBlockState getStateFromMeta(int meta) { - if (meta < 0 || meta >= BiomeStoneVariant.values().length) { + if (meta < 0 || meta >= BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues().size()) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.values()[meta]).withProperty(VARIANT, EnumType.NORMAL); + return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONEWALL_VARIANT, BiomeStoneVariant.values()[meta + 8]); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 0f8a53ee7..efc30fd78 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -47,6 +47,16 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { ); } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return super.getActualState(state, world, pos).withProperty(VARIANT, EnumType.NORMAL); + } + + @Override + public int damageDropped(IBlockState state) { + return getMetaFromState(state); + } + @Override public BlockState createBlockState() { return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index 7b8a74365..cf1bb11ad 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -35,6 +35,11 @@ public class BlockDistributor extends BlockModContainer implements ILexiconable setUnlocalizedName(LibBlockNames.DISTRIBUTOR); } + @Override + public int getRenderType() { + return 3; + } + @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileDistributor(); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index cf0985358..cd73072a3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -45,6 +45,11 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP MinecraftForge.EVENT_BUS.register(this); } + @Override + public int getRenderType() { + return 3; + } + @SubscribeEvent @SideOnly(Side.CLIENT) public void onTextureStitch(TextureStitchEvent.Pre evt) { 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 e0637af30..e4b5ae2f2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -192,7 +192,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, @Override public int getRenderType() { - return LibRenderIDs.idPool; + return 2; } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 3dac4408f..e9b02430b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -52,6 +52,11 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, ILex random = new Random(); } + @Override + public int getRenderType() { + return 3; + } + @Override public boolean isOpaqueCube() { return false; 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/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java index 1eed8838b..4c1b65d57 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java @@ -18,6 +18,8 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; +import java.util.UUID; + public class AesirRingRecipe implements IRecipe { @Override @@ -44,13 +46,13 @@ public class AesirRingRecipe implements IRecipe { @Override public ItemStack getCraftingResult(InventoryCrafting var1) { - String soulbind = null; + UUID soulbind = null; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); if(stack != null) { if(stack.getItem() instanceof IRelic) { - String bind = ((IRelic) stack.getItem()).getSoulbindUsername(stack); + UUID bind = ((IRelic) stack.getItem()).getSoulbindUuid(stack); if(soulbind == null) soulbind = bind; else if(!soulbind.equals(bind)) @@ -60,7 +62,7 @@ public class AesirRingRecipe implements IRecipe { } ItemStack stack = new ItemStack(ModItems.aesirRing); - ((IRelic) ModItems.aesirRing).bindToUsername(soulbind, stack); + ((IRelic) ModItems.aesirRing).bindToUuid(soulbind, stack); return stack; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 800558f3a..c6fc22a6b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -13,7 +13,10 @@ package vazkii.botania.common.entity; import java.awt.Rectangle; import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import java.util.UUID; import java.util.regex.Pattern; import net.minecraft.block.Block; @@ -107,7 +110,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi boolean spawnPixies = false; boolean anyWithArmor = false; - List playersWhoAttacked = new ArrayList(); + List playersWhoAttacked = new ArrayList(); private static boolean isPlayingMusic = false; @@ -357,8 +360,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi Entity e = par1DamageSource.getEntity(); if((par1DamageSource.damageType.equals("player") || e instanceof EntityPixie) && e != null && isTruePlayer(e) && getInvulTime() == 0) { EntityPlayer player = (EntityPlayer) e; - if(!playersWhoAttacked.contains(player.getName())) - playersWhoAttacked.add(player.getName()); + if(!playersWhoAttacked.contains(player.getUniqueID())) + playersWhoAttacked.add(player.getUniqueID()); float dmg = par2; boolean crit = false; @@ -445,7 +448,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi entityDropItem(new ItemStack(ModItems.ancientWill, 1, rand.nextInt(6)), 1F); if(ConfigHandler.relicsEnabled) { ItemStack dice = new ItemStack(ModItems.dice); - ItemRelic.bindToUsernameS(playersWhoAttacked.get(pl), dice); + ItemRelic.bindToUuidS(playersWhoAttacked.get(pl), dice); entityDropItem(dice, 1F); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index ba7808459..8ba380c0b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -10,8 +10,10 @@ */ package vazkii.botania.common.entity; +import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; import net.minecraft.block.BlockVine; +import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; @@ -21,6 +23,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; +import java.util.Map; + public class EntityVineBall extends EntityThrowable { public EntityVineBall(World par1World) { @@ -39,18 +43,18 @@ public class EntityVineBall extends EntityThrowable { protected void onImpact(MovingObjectPosition var1) { if(var1 != null) { EnumFacing dir = var1.sideHit; - int[] metaPlace = new int[] { - 1, 4, 8, 2 - }; - if(dir.getAxis() != EnumFacing.Axis.Y) { + Map propMap = ImmutableMap.of(EnumFacing.NORTH, BlockVine.NORTH, EnumFacing.SOUTH, BlockVine.SOUTH, + EnumFacing.WEST, BlockVine.WEST, EnumFacing.EAST, BlockVine.EAST); + + if(dir != null && dir.getAxis() != EnumFacing.Axis.Y) { BlockPos pos = var1.getBlockPos().offset(dir); while(pos.getY() > 0) { Block block = worldObj.getBlockState(pos).getBlock(); if(block.isAir(worldObj, pos)) { - IBlockState state = ModBlocks.solidVines.getDefaultState().withProperty(BlockVine.ALL_FACES[dir.getIndex() + 1], true); + IBlockState state = ModBlocks.solidVines.getDefaultState().withProperty(propMap.get(dir.getOpposite()), true); worldObj.setBlockState(pos, state, 1 | 2); - worldObj.playAuxSFX(2001, pos, Block.getStateId(state)); // todo 1.8 verify + worldObj.playAuxSFX(2001, pos, Block.getStateId(state)); pos = pos.down(); } else break; } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java new file mode 100644 index 000000000..093dc909e --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java @@ -0,0 +1,19 @@ +package vazkii.botania.common.item.block; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class ItemBlockWithMetaNameAndColor extends ItemBlockWithMetadataAndName { + public ItemBlockWithMetaNameAndColor(Block block) { + super(block); + } + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int renderPass) + { + return this.block.getRenderColor(this.block.getStateFromMeta(stack.getMetadata())); + } +} diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java index 630c88b1b..fac476911 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java @@ -20,7 +20,7 @@ import net.minecraft.stats.Achievement; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.IPickupAchievement; -// todo 1.8 revalidate this (used to extend ItemBlockWithMetadata which got removed) + public class ItemBlockWithMetadataAndName extends ItemBlock implements IPickupAchievement, ICraftAchievement { public ItemBlockWithMetadataAndName(Block par2Block) { diff --git a/src/main/java/vazkii/botania/common/item/material/ItemDye.java b/src/main/java/vazkii/botania/common/item/material/ItemDye.java index 7697d2d28..f0f01db83 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -51,7 +51,6 @@ public class ItemDye extends Item16Colors { TileEntity tile = par3World.getTileEntity(pos); if(tile instanceof IDyablePool) { IDyablePool dyable = (IDyablePool) tile; - int itemMeta = par1ItemStack.getItemDamage(); if(color != dyable.getColor()) { dyable.setColor(color); par1ItemStack.stackSize--; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 9c91f84f7..27ba122c0 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.relic; import java.util.List; +import java.util.UUID; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -61,10 +62,10 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe if(stack.getItem() != null && stack.getItem() == this) { event.entityItem.setDead(); - String user = getSoulbindUsername(stack); + UUID user = getSoulbindUuid(stack); for(Item item : new Item[] { ModItems.thorRing, ModItems.lokiRing, ModItems.odinRing }) { ItemStack stack1 = new ItemStack(item); - bindToUsername(user, stack1); + bindToUuid(user, stack1); EntityItem entity = new EntityItem(event.entityItem.worldObj, event.entityItem.posX, event.entityItem.posY, event.entityItem.posZ, stack1); entity.motionX = event.entityItem.motionX; entity.motionY = event.entityItem.motionY; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 88f93bfeb..2b7a0276c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -11,7 +11,9 @@ package vazkii.botania.common.item.relic; import java.util.List; +import java.util.UUID; +import com.mojang.authlib.GameProfile; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -30,7 +32,8 @@ import vazkii.botania.common.item.ModItems; public class ItemRelic extends ItemMod implements IRelic { - private static final String TAG_SOULBIND = "soulbind"; + private static final String TAG_SOLBIND_NAME = "soulbind"; + private static final String TAG_SOULBIND_UUID = "soulbindUuid"; Achievement achievement; @@ -50,15 +53,19 @@ public class ItemRelic extends ItemMod implements IRelic { addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); } - public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) { + public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) { if(GuiScreen.isShiftKeyDown()) { - String bind = getSoulbindUsernameS(stack); - if(bind.isEmpty()) + UUID bind = getSoulbindUuidS(stack); + if(bind == null) addStringToTooltip(StatCollector.translateToLocal("botaniamisc.relicUnbound"), list); else { - addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.relicSoulbound"), bind), list); + String disp = getSoulbindNameS(stack); + if (disp.isEmpty()) { + disp = bind.toString(); + } + addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.relicSoulbound"), disp), list); if(!isRightPlayer(player, stack)) - addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.notYourSagittarius"), bind), list); + addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.notYourSagittarius"), disp), list); } if(stack.getItem() == ModItems.aesirRing) @@ -86,19 +93,28 @@ public class ItemRelic extends ItemMod implements IRelic { tooltip.add(s.replaceAll("&", "\u00a7")); } - public static String getSoulbindUsernameS(ItemStack stack) { - return ItemNBTHelper.getString(stack, TAG_SOULBIND, ""); + public static UUID getSoulbindUuidS(ItemStack stack) { + try { + return UUID.fromString(ItemNBTHelper.getString(stack, TAG_SOULBIND_UUID, "")); + } catch (IllegalArgumentException ex) { + // Bad text in tag + return null; + } + } + + public static String getSoulbindNameS(ItemStack stack) { + return ItemNBTHelper.getString(stack, TAG_SOLBIND_NAME, ""); } public static void updateRelic(ItemStack stack, EntityPlayer player) { if(stack == null || !(stack.getItem() instanceof IRelic)) return; - String soulbind = getSoulbindUsernameS(stack); - if(soulbind.isEmpty()) { + UUID soulbind = getSoulbindUuidS(stack); + if(soulbind == null) { player.addStat(((IRelic) stack.getItem()).getBindAchievement(), 1); bindToPlayer(player, stack); - soulbind = getSoulbindUsernameS(stack); + soulbind = getSoulbindUuidS(stack); } if(!isRightPlayer(player, stack) && player.ticksExisted % 10 == 0 && (!(stack.getItem() instanceof ItemRelic) || ((ItemRelic) stack.getItem()).shouldDamageWrongPlayer())) @@ -106,19 +122,24 @@ public class ItemRelic extends ItemMod implements IRelic { } public static void bindToPlayer(EntityPlayer player, ItemStack stack) { - bindToUsernameS(player.getName(), stack); + bindToUuidS(player.getUniqueID(), stack); + bindToNameS(player.getName(), stack); } - public static void bindToUsernameS(String username, ItemStack stack) { - ItemNBTHelper.setString(stack, TAG_SOULBIND, username); + public static void bindToNameS(String playerName, ItemStack stack) { + ItemNBTHelper.setString(stack, TAG_SOLBIND_NAME, playerName); + } + + public static void bindToUuidS(UUID uuid, ItemStack stack) { + ItemNBTHelper.setString(stack, TAG_SOULBIND_UUID, uuid.toString()); } public static boolean isRightPlayer(EntityPlayer player, ItemStack stack) { - return isRightPlayer(player.getName(), stack); + return isRightPlayer(player.getUniqueID(), stack); } - public static boolean isRightPlayer(String player, ItemStack stack) { - return getSoulbindUsernameS(stack).equals(player); + public static boolean isRightPlayer(UUID uuid, ItemStack stack) { + return uuid.equals(getSoulbindUuidS(stack)); } public static DamageSource damageSource() { @@ -126,13 +147,13 @@ public class ItemRelic extends ItemMod implements IRelic { } @Override - public void bindToUsername(String playerName, ItemStack stack) { - bindToUsernameS(playerName, stack); + public void bindToUuid(UUID playerName, ItemStack stack) { + bindToUuidS(playerName, stack); } @Override - public String getSoulbindUsername(ItemStack stack) { - return getSoulbindUsernameS(stack); + public UUID getSoulbindUuid(ItemStack stack) { + return getSoulbindUuidS(stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 6d735743b..7c459db07 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.relic; import java.util.List; +import java.util.UUID; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -64,13 +65,13 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { } @Override - public void bindToUsername(String playerName, ItemStack stack) { - ItemRelic.bindToUsernameS(playerName, stack); + public void bindToUuid(UUID playerName, ItemStack stack) { + ItemRelic.bindToUuidS(playerName, stack); } @Override - public String getSoulbindUsername(ItemStack stack) { - return ItemRelic.getSoulbindUsernameS(stack); + public UUID getSoulbindUuid(ItemStack stack) { + return ItemRelic.getSoulbindUuidS(stack); } @Override diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index f047b6203..231e00020 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -138,7 +138,7 @@ public class PageCraftingRecipe extends PageRecipe { for(int x = 0; x < width; x++) { Object input = shaped.getInput()[y * width + x]; if(input != null) - renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((ArrayList) input).get(0), true); + renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((List) input).get(0), true); } oreDictRecipe = true; @@ -171,7 +171,7 @@ public class PageCraftingRecipe extends PageRecipe { Object input = shapeless.getInput().get(index); if(input != null) - renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((ArrayList) input).get(0), true); + renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((List) input).get(0), true); } } 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..fea9affd1 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/agricarnation.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/agricarnation" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..75f3debf9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/agricarnationChibi.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/agricarnationChibi" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/agricarnationChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json b/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json new file mode 100644 index 000000000..e054f42ab --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/alchemyCatalyst0", + "top": "botania:blocks/alchemyCatalyst1", + "side": "botania:blocks/alchemyCatalyst2" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/altGrass.json b/src/main/resources/assets/botania/blockstates/altGrass.json index a9c6f7706..ec9f93048 100644 --- a/src/main/resources/assets/botania/blockstates/altGrass.json +++ b/src/main/resources/assets/botania/blockstates/altGrass.json @@ -1,10 +1,30 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { "bottom": "minecraft:blocks/dirt" }, + "transform": "forge:default-block" + }, "variants": { - "variant=dry": { "model": "botania:altGrass_dry" }, - "variant=golden": { "model": "botania:altGrass_golden" }, - "variant=vivid": { "model": "botania:altGrass_vivid" }, - "variant=scorched": { "model": "botania:altGrass_scorched" }, - "variant=infused": { "model": "botania:altGrass_infused" }, - "variant=mutated": { "model": "botania:altGrass_mutated" } + "variant": { + "dry": { + "textures": { "top": "botania:blocks/altGrass0", "side": "botania:blocks/altGrass1" } + }, + "golden": { + "textures": { "top": "botania:blocks/altGrass2", "side": "botania:blocks/altGrass3" } + }, + "vivid": { + "textures": { "top": "botania:blocks/altGrass4", "side": "botania:blocks/altGrass5" } + }, + "scorched": { + "textures": { "top": "botania:blocks/altGrass6", "side": "botania:blocks/altGrass7" } + }, + "infused": { + "textures": { "top": "botania:blocks/altGrass8", "side": "botania:blocks/altGrass9" } + }, + "mutated": { + "textures": { "top": "botania:blocks/altGrass10", "side": "botania:blocks/altGrass11" } + } + } } } \ 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..14f2a67b5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/arcanerose.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/arcanerose" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..a32114a6c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bellethorn.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/bellethorn" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..be25798d4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bellethornChibi.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/bellethornChibi" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/bellethornChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStomeA11SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStomeA11SlabFull.json new file mode 100644 index 000000000..b8e1cc61d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStomeA11SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStome11" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA.json b/src/main/resources/assets/botania/blockstates/biomeStoneA.json new file mode 100644 index 000000000..2ec09cc6b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA.json @@ -0,0 +1,25 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant=forest": [{ "textures": { "all": "botania:blocks/biomeStone0" } }], + "variant=plains": [{ "textures": { "all": "botania:blocks/biomeStone1" } }], + "variant=mountain": [{ "textures": { "all": "botania:blocks/biomeStone2" } }], + "variant=fungal": [{ "textures": { "all": "botania:blocks/biomeStone3" } }], + "variant=swamp": [{ "textures": { "all": "botania:blocks/biomeStone4" } }], + "variant=desert": [{ "textures": { "all": "botania:blocks/biomeStone5" } }], + "variant=taiga": [{ "textures": { "all": "botania:blocks/biomeStone6" } }], + "variant=mesa": [{ "textures": { "all": "botania:blocks/biomeStone7" } }], + "variant=forest_cobble": [{ "textures": { "all": "botania:blocks/biomeStone8" } }], + "variant=plains_cobble": [{ "textures": { "all": "botania:blocks/biomeStone9" } }], + "variant=mountain_cobble": [{ "textures": { "all": "botania:blocks/biomeStone10" } }], + "variant=fungal_cobble": [{ "textures": { "all": "botania:blocks/biomeStone11" } }], + "variant=swamp_cobble": [{ "textures": { "all": "botania:blocks/biomeStone12" } }], + "variant=desert_cobble": [{ "textures": { "all": "botania:blocks/biomeStone13" } }], + "variant=taiga_cobble": [{ "textures": { "all": "botania:blocks/biomeStone14" } }], + "variant=mesa_cobble": [{ "textures": { "all": "botania:blocks/biomeStone15" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json new file mode 100644 index 000000000..26b01e0ad --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone0", + "top": "botania:blocks/biomeStone0", + "side": "botania:blocks/biomeStone0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json new file mode 100644 index 000000000..622220653 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json new file mode 100644 index 000000000..e06c39112 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json @@ -0,0 +1,90 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "east=false,north=true,south=true,up=false,variant=forest_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=plains_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=mountain_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=fungal_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=swamp_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=desert_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=taiga_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=mesa_cobble,west=false": { "model": null }, + + "east=true,north=false,south=false,up=false,variant=forest_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=plains_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=mountain_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=fungal_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=swamp_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=desert_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=taiga_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=mesa_cobble,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "variant": { + "forest_cobble": { "textures": { "wall": "botania:blocks/biomeStone8" } }, + "plains_cobble": { "textures": { "wall": "botania:blocks/biomeStone9" } }, + "mountain_cobble": { "textures": { "wall": "botania:blocks/biomeStone10" } }, + "fungal_cobble": { "textures": { "wall": "botania:blocks/biomeStone11" } }, + "swamp_cobble": { "textures": { "wall": "botania:blocks/biomeStone12" } }, + "desert_cobble": { "textures": { "wall": "botania:blocks/biomeStone13" } }, + "taiga_cobble": { "textures": { "wall": "botania:blocks/biomeStone14" } }, + "mesa_cobble": { "textures": { "wall": "botania:blocks/biomeStone15" } } + }, + "inventory_forest_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone8" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_plains_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone9" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_mountain_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone10" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_fungal_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone11" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_swamp_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone12" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_desert_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone13" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_taiga_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone14" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_mesa_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone15" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json new file mode 100644 index 000000000..2e3c9ce2d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone10", + "top": "botania:blocks/biomeStone10", + "side": "botania:blocks/biomeStone10" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json new file mode 100644 index 000000000..a0c0c5ba3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone10" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json new file mode 100644 index 000000000..492cdefab --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone11", + "top": "botania:blocks/biomeStone11", + "side": "botania:blocks/biomeStone11" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json new file mode 100644 index 000000000..685aced75 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone11" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json new file mode 100644 index 000000000..a78647e5d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone12", + "top": "botania:blocks/biomeStone12", + "side": "botania:blocks/biomeStone12" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json new file mode 100644 index 000000000..35fdc8ea2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone12" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json new file mode 100644 index 000000000..3d9e905fd --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone13", + "top": "botania:blocks/biomeStone13", + "side": "botania:blocks/biomeStone13" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json new file mode 100644 index 000000000..f0da4d47e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone13" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json new file mode 100644 index 000000000..ff31c6527 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone14", + "top": "botania:blocks/biomeStone14", + "side": "botania:blocks/biomeStone14" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json new file mode 100644 index 000000000..5a6e9b1dc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone14" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json new file mode 100644 index 000000000..1c3854d5a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone15", + "top": "botania:blocks/biomeStone15", + "side": "botania:blocks/biomeStone15" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json new file mode 100644 index 000000000..985fb290f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone15" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json new file mode 100644 index 000000000..638726afe --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone1", + "top": "botania:blocks/biomeStone1", + "side": "botania:blocks/biomeStone1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json new file mode 100644 index 000000000..c052661cc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json new file mode 100644 index 000000000..e9dd7f308 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone2", + "top": "botania:blocks/biomeStone2", + "side": "botania:blocks/biomeStone2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json new file mode 100644 index 000000000..ad8967e4c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone2" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json new file mode 100644 index 000000000..1ff94cdb9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone3", + "top": "botania:blocks/biomeStone3", + "side": "botania:blocks/biomeStone3" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json new file mode 100644 index 000000000..ae53dde27 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone3" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json new file mode 100644 index 000000000..d77ac77b1 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone4", + "top": "botania:blocks/biomeStone4", + "side": "botania:blocks/biomeStone4" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json new file mode 100644 index 000000000..3a02ee0f9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone4" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json new file mode 100644 index 000000000..7c2a4ddde --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone5", + "top": "botania:blocks/biomeStone5", + "side": "botania:blocks/biomeStone5" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json new file mode 100644 index 000000000..74e8a7dae --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone5" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json new file mode 100644 index 000000000..1a2d2d869 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone6", + "top": "botania:blocks/biomeStone6", + "side": "botania:blocks/biomeStone6" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json new file mode 100644 index 000000000..95cdc2830 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone6" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json new file mode 100644 index 000000000..cd57da54c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone7", + "top": "botania:blocks/biomeStone7", + "side": "botania:blocks/biomeStone7" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json new file mode 100644 index 000000000..6b89dbc07 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone7" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json new file mode 100644 index 000000000..5cc3c87d6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone8", + "top": "botania:blocks/biomeStone8", + "side": "botania:blocks/biomeStone8" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json new file mode 100644 index 000000000..b708579a9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone8" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json new file mode 100644 index 000000000..188d82abf --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone9", + "top": "botania:blocks/biomeStone9", + "side": "botania:blocks/biomeStone9" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json new file mode 100644 index 000000000..c853b5705 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone9" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB.json b/src/main/resources/assets/botania/blockstates/biomeStoneB.json new file mode 100644 index 000000000..facaa9134 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB.json @@ -0,0 +1,25 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant=forest": [{ "textures": { "all": "botania:blocks/biomeStone16" } }], + "variant=plains": [{ "textures": { "all": "botania:blocks/biomeStone17" } }], + "variant=mountain": [{ "textures": { "all": "botania:blocks/biomeStone18" } }], + "variant=fungal": [{ "textures": { "all": "botania:blocks/biomeStone19" } }], + "variant=swamp": [{ "textures": { "all": "botania:blocks/biomeStone20" } }], + "variant=desert": [{ "textures": { "all": "botania:blocks/biomeStone21" } }], + "variant=taiga": [{ "textures": { "all": "botania:blocks/biomeStone22" } }], + "variant=mesa": [{ "textures": { "all": "botania:blocks/biomeStone23" } }], + "variant=chiseled_forest": [{ "textures": { "all": "botania:blocks/biomeStone24" } }], + "variant=chiseled_plains": [{ "textures": { "all": "botania:blocks/biomeStone25" } }], + "variant=chiseled_mountain": [{ "textures": { "all": "botania:blocks/biomeStone26" } }], + "variant=chiseled_fungal": [{ "textures": { "all": "botania:blocks/biomeStone27" } }], + "variant=chiseled_swamp": [{ "textures": { "all": "botania:blocks/biomeStone28" } }], + "variant=chiseled_desert": [{ "textures": { "all": "botania:blocks/biomeStone29" } }], + "variant=chiseled_taiga": [{ "textures": { "all": "botania:blocks/biomeStone30" } }], + "variant=chiseled_mesa": [{ "textures": { "all": "botania:blocks/biomeStone31" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json new file mode 100644 index 000000000..37969ece4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone16", + "top": "botania:blocks/biomeStone16", + "side": "botania:blocks/biomeStone16" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json new file mode 100644 index 000000000..a5236f6d8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone16" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json new file mode 100644 index 000000000..1daf216ef --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone17", + "top": "botania:blocks/biomeStone17", + "side": "botania:blocks/biomeStone17" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json new file mode 100644 index 000000000..7612fa942 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone17" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json new file mode 100644 index 000000000..8a077688c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone18", + "top": "botania:blocks/biomeStone18", + "side": "botania:blocks/biomeStone18" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json new file mode 100644 index 000000000..4902a6e0c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone18" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json new file mode 100644 index 000000000..ade89b09b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone19", + "top": "botania:blocks/biomeStone19", + "side": "botania:blocks/biomeStone19" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json new file mode 100644 index 000000000..ad81a7910 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone19" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json new file mode 100644 index 000000000..c0dfa9c93 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone20", + "top": "botania:blocks/biomeStone20", + "side": "botania:blocks/biomeStone20" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json new file mode 100644 index 000000000..12a9d00da --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone20" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json new file mode 100644 index 000000000..068ce5beb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone21", + "top": "botania:blocks/biomeStone21", + "side": "botania:blocks/biomeStone21" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json new file mode 100644 index 000000000..00399c361 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone21" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json new file mode 100644 index 000000000..7da39aff8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone22", + "top": "botania:blocks/biomeStone22", + "side": "botania:blocks/biomeStone22" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json new file mode 100644 index 000000000..cd9d3f0e9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone22" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json new file mode 100644 index 000000000..dec2e4dbc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone23", + "top": "botania:blocks/biomeStone23", + "side": "botania:blocks/biomeStone23" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json new file mode 100644 index 000000000..9e7c19c2e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone23" } + }] + } +} \ 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..039acac9a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bubbell.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/bubbell" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..26771a891 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bubbellChibi.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/bubbellChibi" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..00a986196 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/clayconia.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/clayconia" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/clayconia" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json b/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json new file mode 100644 index 000000000..e3f933d06 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/conjurationCatalyst0", + "top": "botania:blocks/conjurationCatalyst1", + "side": "botania:blocks/conjurationCatalyst2" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick0Slab.json b/src/main/resources/assets/botania/blockstates/customBrick0Slab.json new file mode 100644 index 000000000..8831d3fe6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/customBrick0", + "top": "botania:blocks/customBrick0", + "side": "botania:blocks/customBrick0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick0SlabFull.json b/src/main/resources/assets/botania/blockstates/customBrick0SlabFull.json new file mode 100644 index 000000000..c7dd413b5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/customBrick0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick1Slab.json b/src/main/resources/assets/botania/blockstates/customBrick1Slab.json new file mode 100644 index 000000000..c4b1be5b2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/customBrick1", + "top": "botania:blocks/customBrick1", + "side": "botania:blocks/customBrick1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick1SlabFull.json b/src/main/resources/assets/botania/blockstates/customBrick1SlabFull.json new file mode 100644 index 000000000..e299f14db --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/customBrick1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick2Slab.json b/src/main/resources/assets/botania/blockstates/customBrick2Slab.json new file mode 100644 index 000000000..a5f1e51f5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/customBrick2", + "top": "botania:blocks/customBrick2", + "side": "botania:blocks/customBrick2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick2SlabFull.json b/src/main/resources/assets/botania/blockstates/customBrick2SlabFull.json new file mode 100644 index 000000000..dd5a23420 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/customBrick2" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick3Slab.json b/src/main/resources/assets/botania/blockstates/customBrick3Slab.json new file mode 100644 index 000000000..f91ff8793 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick3Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/customBrick3", + "top": "botania:blocks/customBrick3", + "side": "botania:blocks/customBrick3" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick3SlabFull.json b/src/main/resources/assets/botania/blockstates/customBrick3SlabFull.json new file mode 100644 index 000000000..cba4e7996 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick3SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/customBrick3" } + }] + } +} \ 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..fff602c34 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/daffomill.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/daffomill" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..4b6c71c69 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dandelifeon.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/dandelifeon" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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 new file mode 100644 index 000000000..81dc313b2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/daybloom.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/daybloom" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/daybloom" + } + }] + } +} \ No newline at end of file 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..4ec50a0e5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/daybloomDecor.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/daybloomDecor" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..80792cd90 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/daybloomPrime.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/daybloomPrime" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/daybloomPrime" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dirtPath.json b/src/main/resources/assets/botania/blockstates/dirtPath.json new file mode 100644 index 000000000..9d7444376 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dirtPath.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:minusone_all", + "textures": { + "all": "botania:blocks/dirtPath" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json b/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json new file mode 100644 index 000000000..609f3c254 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/dirtPath", + "top": "botania:blocks/dirtPath", + "side": "botania:blocks/dirtPath" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json b/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json new file mode 100644 index 000000000..c5205f908 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/dirtPath" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/distributor.json b/src/main/resources/assets/botania/blockstates/distributor.json new file mode 100644 index 000000000..3a39b6b79 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/distributor.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "top": "botania:blocks/distributor0", + "side": "botania:blocks/distributor1", + "bottom": "botania:blocks/livingrock0" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/doubleFlower1.json b/src/main/resources/assets/botania/blockstates/doubleFlower1.json new file mode 100644 index 000000000..7d171908a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/doubleFlower1.json @@ -0,0 +1,65 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cross" + }, + "variants": { + "half=lower,variant=white": [{ "textures": { "cross": "botania:blocks/flower0Tall0" } }], + "half=upper,variant=white": [{ "textures": { "cross": "botania:blocks/flower0Tall1" } }], + "half=lower,variant=orange": [{ "textures": { "cross": "botania:blocks/flower1Tall0" } }], + "half=upper,variant=orange": [{ "textures": { "cross": "botania:blocks/flower1Tall1" } }], + "half=lower,variant=magenta": [{ "textures": { "cross": "botania:blocks/flower2Tall0" } }], + "half=upper,variant=magenta": [{ "textures": { "cross": "botania:blocks/flower2Tall1" } }], + "half=lower,variant=light_blue": [{ "textures": { "cross": "botania:blocks/flower3Tall0" } }], + "half=upper,variant=light_blue": [{ "textures": { "cross": "botania:blocks/flower3Tall1" } }], + "half=lower,variant=yellow": [{ "textures": { "cross": "botania:blocks/flower4Tall0" } }], + "half=upper,variant=yellow": [{ "textures": { "cross": "botania:blocks/flower4Tall1" } }], + "half=lower,variant=lime": [{ "textures": { "cross": "botania:blocks/flower5Tall0" } }], + "half=upper,variant=lime": [{ "textures": { "cross": "botania:blocks/flower5Tall1" } }], + "half=lower,variant=pink": [{ "textures": { "cross": "botania:blocks/flower6Tall0" } }], + "half=upper,variant=pink": [{ "textures": { "cross": "botania:blocks/flower6Tall1" } }], + "half=lower,variant=gray": [{ "textures": { "cross": "botania:blocks/flower7Tall0" } }], + "half=upper,variant=gray": [{ "textures": { "cross": "botania:blocks/flower7Tall1" } }], + + "inventory_white": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower0Tall1" }, + "transform": "forge:default-item" + }], + "inventory_orange": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower1Tall1" }, + "transform": "forge:default-item" + }], + "inventory_magenta": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower2Tall1" }, + "transform": "forge:default-item" + }], + "inventory_light_blue": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower3Tall1" }, + "transform": "forge:default-item" + }], + "inventory_yellow": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower4Tall1" }, + "transform": "forge:default-item" + }], + "inventory_lime": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower5Tall1" }, + "transform": "forge:default-item" + }], + "inventory_pink": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower6Tall1" }, + "transform": "forge:default-item" + }], + "inventory_gray": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower7Tall1" }, + "transform": "forge:default-item" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/doubleFlower2.json b/src/main/resources/assets/botania/blockstates/doubleFlower2.json new file mode 100644 index 000000000..4bd2b54f4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/doubleFlower2.json @@ -0,0 +1,65 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cross" + }, + "variants": { + "half=lower,variant=silver": [{ "textures": { "cross": "botania:blocks/flower8Tall0" } }], + "half=upper,variant=silver": [{ "textures": { "cross": "botania:blocks/flower8Tall1" } }], + "half=lower,variant=cyan": [{ "textures": { "cross": "botania:blocks/flower9Tall0" } }], + "half=upper,variant=cyan": [{ "textures": { "cross": "botania:blocks/flower9Tall1" } }], + "half=lower,variant=purple": [{ "textures": { "cross": "botania:blocks/flower10Tall0" } }], + "half=upper,variant=purple": [{ "textures": { "cross": "botania:blocks/flower10Tall1" } }], + "half=lower,variant=blue": [{ "textures": { "cross": "botania:blocks/flower11Tall0" } }], + "half=upper,variant=blue": [{ "textures": { "cross": "botania:blocks/flower11Tall1" } }], + "half=lower,variant=brown": [{ "textures": { "cross": "botania:blocks/flower12Tall0" } }], + "half=upper,variant=brown": [{ "textures": { "cross": "botania:blocks/flower12Tall1" } }], + "half=lower,variant=green": [{ "textures": { "cross": "botania:blocks/flower13Tall0" } }], + "half=upper,variant=green": [{ "textures": { "cross": "botania:blocks/flower13Tall1" } }], + "half=lower,variant=red": [{ "textures": { "cross": "botania:blocks/flower14Tall0" } }], + "half=upper,variant=red": [{ "textures": { "cross": "botania:blocks/flower14Tall1" } }], + "half=lower,variant=black": [{ "textures": { "cross": "botania:blocks/flower15Tall0" } }], + "half=upper,variant=black": [{ "textures": { "cross": "botania:blocks/flower15Tall1" } }], + + "inventory_silver": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower8Tall1" }, + "transform": "forge:default-item" + }], + "inventory_cyan": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower9Tall1" }, + "transform": "forge:default-item" + }], + "inventory_purple": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower10Tall1" }, + "transform": "forge:default-item" + }], + "inventory_blue": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower11Tall1" }, + "transform": "forge:default-item" + }], + "inventory_brown": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower12Tall1" }, + "transform": "forge:default-item" + }], + "inventory_green": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower13Tall1" }, + "transform": "forge:default-item" + }], + "inventory_red": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower14Tall1" }, + "transform": "forge:default-item" + }], + "inventory_black": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower15Tall1" }, + "transform": "forge:default-item" + }] + } +} \ 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..5c1309347 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreadthorn.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/dreadthorn" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/dreadthorn" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood.json b/src/main/resources/assets/botania/blockstates/dreamwood.json new file mode 100644 index 000000000..fb6d48d06 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant=default": [{ "textures": { "all": "botania:blocks/dreamwood0" } }], + "variant=planks": [{ "textures": { "all": "botania:blocks/dreamwood1" } }], + "variant=mossy_planks": [{ "textures": { "all": "botania:blocks/dreamwood2" } }], + "variant=framed": [{ "textures": { "all": "botania:blocks/dreamwood3" } }], + "variant=pattern_framed": [{ "textures": { "all": "botania:blocks/dreamwood4" } }], + "variant=glimmering": [{ "textures": { "all": "botania:blocks/dreamwood5" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json b/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json new file mode 100644 index 000000000..bbbe129ed --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/dreamwood0", + "top": "botania:blocks/dreamwood0", + "side": "botania:blocks/dreamwood0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json b/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json new file mode 100644 index 000000000..40e378188 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/dreamwood0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json new file mode 100644 index 000000000..31863d217 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block", + "textures": { "wall": "botania:blocks/dreamwood0" } + }, + "variants": { + "east=false,north=true,south=true,up=false,west=false": { "model": null }, + "east=true,north=false,south=false,up=false,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "inventory": [{ + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json b/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json new file mode 100644 index 000000000..ff2fcf790 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/dreamwood1", + "top": "botania:blocks/dreamwood1", + "side": "botania:blocks/dreamwood1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json b/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json new file mode 100644 index 000000000..47873fc21 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/dreamwood1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick.json b/src/main/resources/assets/botania/blockstates/endStoneBrick.json new file mode 100644 index 000000000..890ba9ef8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant=end_stone_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick0" } }], + "variant=chiseled_end_stone_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick1" } }], + "variant=ender_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick2" } }], + "variant=pillar_ender_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick3" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json b/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json new file mode 100644 index 000000000..deb5a96ac --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/endStoneBrick0", + "top": "botania:blocks/endStoneBrick0", + "side": "botania:blocks/endStoneBrick0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick0SlabFull.json b/src/main/resources/assets/botania/blockstates/endStoneBrick0SlabFull.json new file mode 100644 index 000000000..b53fb4fba --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/endStoneBrick0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json b/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json new file mode 100644 index 000000000..26735e56f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/endStoneBrick2", + "top": "botania:blocks/endStoneBrick2", + "side": "botania:blocks/endStoneBrick2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick2SlabFull.json b/src/main/resources/assets/botania/blockstates/endStoneBrick2SlabFull.json new file mode 100644 index 000000000..d3d956779 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/endStoneBrick2" } + }] + } +} \ 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..1a83629e2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endoflame.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/endoflame" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..5c15e1a4a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/entropinnyum.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/entropinnyum" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..14c0f9e15 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/exoflame.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/exoflame" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..9dc163cc7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/fallenKanade.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/fallenKanade" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/fallenKanade" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/felPumpkin.json b/src/main/resources/assets/botania/blockstates/felPumpkin.json new file mode 100644 index 000000000..afb93a0bf --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/felPumpkin.json @@ -0,0 +1,22 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:orientable", + "textures": { + "top": "minecraft:blocks/pumpkin_top", + "front": "botania:blocks/felPumpkin", + "side": "minecraft:blocks/pumpkin_side" + } + }, + "variants": { + "facing": { + "north": {}, + "south": { "y": 180 }, + "west": { "y": 270 }, + "east": { "y": 90 } + }, + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/flower.json b/src/main/resources/assets/botania/blockstates/flower.json index 645d917ac..9ccfc702c 100644 --- a/src/main/resources/assets/botania/blockstates/flower.json +++ b/src/main/resources/assets/botania/blockstates/flower.json @@ -1,71 +1,41 @@ { "forge_marker": 1, + "defaults": { + "model": "minecraft:cross" + }, "variants": { - "color": { - "white": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower0" } - }, - "orange": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower1" } - }, - "magenta": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower2" } - }, - "light_blue": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower3" } - }, - "yellow": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower4" } - }, - "lime": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower5" } - }, - "pink": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower6" } - }, - "gray": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower7" } - }, - "silver": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower8" } - }, - "cyan": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower9" } - }, - "purple": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower10" } - }, - "blue": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower11" } - }, - "brown": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower12" } - }, - "green": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower13" } - }, - "red": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower14" } - }, - "black": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower15" } - } - } + "color=white": [{ "textures": { "cross": "botania:blocks/flower0" } }], + "color=orange": [{ "textures": { "cross": "botania:blocks/flower1" } }], + "color=magenta": [{ "textures": { "cross": "botania:blocks/flower2" } }], + "color=light_blue": [{ "textures": { "cross": "botania:blocks/flower3" } }], + "color=yellow": [{ "textures": { "cross": "botania:blocks/flower4" } }], + "color=lime": [{ "textures": { "cross": "botania:blocks/flower5" } }], + "color=pink": [{ "textures": { "cross": "botania:blocks/flower6" } }], + "color=gray": [{ "textures": { "cross": "botania:blocks/flower7" } }], + "color=silver": [{ "textures": { "cross": "botania:blocks/flower8" } }], + "color=cyan": [{ "textures": { "cross": "botania:blocks/flower9" } }], + "color=purple": [{ "textures": { "cross": "botania:blocks/flower10" } }], + "color=blue": [{ "textures": { "cross": "botania:blocks/flower11" } }], + "color=brown": [{ "textures": { "cross": "botania:blocks/flower12" } }], + "color=green": [{ "textures": { "cross": "botania:blocks/flower13" } }], + "color=red": [{ "textures": { "cross": "botania:blocks/flower14" } }], + "color=black": [{ "textures": { "cross": "botania:blocks/flower15" } }], + + "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower0" } }], + "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower1" } }], + "inventory_magenta": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower2" } }], + "inventory_light_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower3" } }], + "inventory_yellow": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower4" } }], + "inventory_lime": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower5" } }], + "inventory_pink": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower6" } }], + "inventory_gray": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower7" } }], + "inventory_silver": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower8" } }], + "inventory_cyan": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower9" } }], + "inventory_purple": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower10" } }], + "inventory_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower11" } }], + "inventory_brown": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower12" } }], + "inventory_green": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower13" } }], + "inventory_red": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower14" } }], + "inventory_black": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower15" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/forestDrum.json b/src/main/resources/assets/botania/blockstates/forestDrum.json new file mode 100644 index 000000000..a20f0ed41 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/forestDrum.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:drum", + "transform": "forge:default-block" + }, + "variants": { + "variant=wild": [{ "textures": { "top": "botania:blocks/forestDrum0", "side": "botania:blocks/forestDrum1" } }], + "variant=gathering": [{ "textures": { "top": "botania:blocks/forestDrum2", "side": "botania:blocks/forestDrum3" } }], + "variant=canopy": [{ "textures": { "top": "botania:blocks/forestDrum4", "side": "botania:blocks/forestDrum5" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/ghostRail.json b/src/main/resources/assets/botania/blockstates/ghostRail.json new file mode 100644 index 000000000..96631fbfc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/ghostRail.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "rail": "botania:blocks/ghostRail" + }, + "transform": "forge:default-item" + }, + "variants": { + "shape=north_south": { "model": "minecraft:rail_flat" }, + "shape=east_west": { "model": "minecraft:rail_flat", "y": 90 }, + "shape=ascending_east": { "model": "minecraft:rail_raised_ne", "y": 90 }, + "shape=ascending_west": { "model": "minecraft:rail_raised_sw", "y": 90 }, + "shape=ascending_north": { "model": "minecraft:rail_raised_ne" }, + "shape=ascending_south": { "model": "minecraft:rail_raised_sw" }, + "inventory": [{ + "model": "builtin/generated", + "textures": { + "layer0": "botania:blocks/ghostRail" + } + }] + } +} \ 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..4002fcdff --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/gourmaryllis.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/gourmaryllis" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..717513a65 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/heiseiDream.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/heiseiDream" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..d154cda9c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hopperhock.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/hopperhock" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..4c4f3f840 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hopperhockChibi.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/hopperhockChibi" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..ea8ff7336 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hyacidus.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/hyacidus" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..1d0db7d65 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hydroangeas.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/hydroangeas" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..7667397dc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/hydroangeasDecor" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..626df23f9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/jadedAmaranthus" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..4297c619d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/jiyuulia.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/jiyuulia" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..4f6f415a4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/kekimurus.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/kekimurus" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/kekimurus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock.json b/src/main/resources/assets/botania/blockstates/livingrock.json index ae0681bca..4893484b9 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock.json +++ b/src/main/resources/assets/botania/blockstates/livingrock.json @@ -1,19 +1,14 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, "variants": { - "variant=default": { - "model": "botania:livingrock_default" - }, - "variant=brick": { - "model": "botania:livingrock_brick" - }, - "variant=mossy_brick": { - "model": "botania:livingrock_mossy_brick" - }, - "variant=cracked_brick": { - "model": "botania:livingrock_cracked_brick" - }, - "variant=chiseled_brick": { - "model": "botania:livingrock_chiseled_brick" - } + "variant=default": [{ "textures": { "all": "botania:blocks/livingrock0" } }], + "variant=brick": [{ "textures": { "all": "botania:blocks/livingrock1" } }], + "variant=mossy_brick": [{ "textures": { "all": "botania:blocks/livingrock2" } }], + "variant=cracked_brick": [{ "textures": { "all": "botania:blocks/livingrock3" } }], + "variant=chiseled_brick": [{ "textures": { "all": "botania:blocks/livingrock4" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Slab.json b/src/main/resources/assets/botania/blockstates/livingrock0Slab.json new file mode 100644 index 000000000..190b2dc17 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/livingrock0", + "top": "botania:blocks/livingrock0", + "side": "botania:blocks/livingrock0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json b/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json new file mode 100644 index 000000000..9bc4eca76 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/livingrock0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Wall.json b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json new file mode 100644 index 000000000..6da2b10a5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block", + "textures": { "wall": "botania:blocks/livingrock0" } + }, + "variants": { + "east=false,north=true,south=true,up=false,west=false": { "model": null }, + "east=true,north=false,south=false,up=false,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "inventory": [{ + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock1Slab.json b/src/main/resources/assets/botania/blockstates/livingrock1Slab.json new file mode 100644 index 000000000..66937cf5d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/livingrock1", + "top": "botania:blocks/livingrock1", + "side": "botania:blocks/livingrock1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json b/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json new file mode 100644 index 000000000..edf8dd3ea --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/livingrock1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood.json b/src/main/resources/assets/botania/blockstates/livingwood.json index 87074e2b3..3f6c42938 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood.json +++ b/src/main/resources/assets/botania/blockstates/livingwood.json @@ -1,10 +1,15 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, "variants": { - "variant=default": { "model": "botania:livingwood_default" }, - "variant=planks": { "model": "botania:livingwood_planks" }, - "variant=mossy_planks": { "model": "botania:livingwood_mossy_planks" }, - "variant=framed": { "model": "botania:livingwood_framed" }, - "variant=pattern_framed": { "model": "botania:livingwood_pattern_framed" }, - "variant=glimmering": { "model": "botania:livingwood_glimmering" } + "variant=default": [{ "textures": { "all": "botania:blocks/livingwood0" } }], + "variant=planks": [{ "textures": { "all": "botania:blocks/livingwood1" } }], + "variant=mossy_planks": [{ "textures": { "all": "botania:blocks/livingwood2" } }], + "variant=framed": [{ "textures": { "all": "botania:blocks/livingwood3" } }], + "variant=pattern_framed": [{ "textures": { "all": "botania:blocks/livingwood4" } }], + "variant=glimmering": [{ "textures": { "all": "botania:blocks/livingwood5" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Slab.json b/src/main/resources/assets/botania/blockstates/livingwood0Slab.json new file mode 100644 index 000000000..4f185b5b8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/livingwood0", + "top": "botania:blocks/livingwood0", + "side": "botania:blocks/livingwood0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json b/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json new file mode 100644 index 000000000..41e2ca5c6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/livingwood0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Wall.json b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json new file mode 100644 index 000000000..a7dc154f6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block", + "textures": { "wall": "botania:blocks/livingwood0" } + }, + "variants": { + "east=false,north=true,south=true,up=false,west=false": { "model": null }, + "east=true,north=false,south=false,up=false,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "inventory": [{ + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood1Slab.json b/src/main/resources/assets/botania/blockstates/livingwood1Slab.json new file mode 100644 index 000000000..9dd7a8390 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/livingwood1", + "top": "botania:blocks/livingwood1", + "side": "botania:blocks/livingwood1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json b/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json new file mode 100644 index 000000000..a7063094e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/livingwood1" } + }] + } +} \ 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..35255a6e0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/loonium.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/loonium" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/loonium" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaBeacon.json b/src/main/resources/assets/botania/blockstates/manaBeacon.json new file mode 100644 index 000000000..08230c4fc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manaBeacon.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:miniblock_top", + "textures": { + "all": "botania:blocks/manaBeacon0", + "top": "botania:blocks/manaBeacon1" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaVoid.json b/src/main/resources/assets/botania/blockstates/manaVoid.json new file mode 100644 index 000000000..034836e67 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manaVoid.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/manaVoid0" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } + +} \ 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..316de14f6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manastar.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/manastar" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..9b8864318 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/marimorphosis.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/marimorphosis" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..54ce24860 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/marimorphosisChibi" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..8120698cd --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/medumone.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/medumone" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..8d9d7a3a7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/munchdew.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/munchdew" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/munchdew" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/mushroom.json b/src/main/resources/assets/botania/blockstates/mushroom.json index bdd1fc07a..cafdbfede 100644 --- a/src/main/resources/assets/botania/blockstates/mushroom.json +++ b/src/main/resources/assets/botania/blockstates/mushroom.json @@ -1,71 +1,41 @@ { "forge_marker": 1, + "defaults": { + "model": "minecraft:cross" + }, "variants": { - "color": { - "white": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom0" } - }, - "orange": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom1" } - }, - "magenta": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom2" } - }, - "light_blue": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom3" } - }, - "yellow": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom4" } - }, - "lime": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom5" } - }, - "pink": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom6" } - }, - "gray": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom7" } - }, - "silver": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom8" } - }, - "cyan": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom9" } - }, - "purple": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom10" } - }, - "blue": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom11" } - }, - "brown": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom12" } - }, - "green": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom13" } - }, - "red": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom14" } - }, - "black": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom15" } - } - } + "color=white": [{ "textures": { "cross": "botania:blocks/mushroom0" } }], + "color=orange": [{ "textures": { "cross": "botania:blocks/mushroom1" } }], + "color=magenta": [{ "textures": { "cross": "botania:blocks/mushroom2" } }], + "color=light_blue": [{ "textures": { "cross": "botania:blocks/mushroom3" } }], + "color=yellow": [{ "textures": { "cross": "botania:blocks/mushroom4" } }], + "color=lime": [{ "textures": { "cross": "botania:blocks/mushroom5" } }], + "color=pink": [{ "textures": { "cross": "botania:blocks/mushroom6" } }], + "color=gray": [{ "textures": { "cross": "botania:blocks/mushroom7" } }], + "color=silver": [{ "textures": { "cross": "botania:blocks/mushroom8" } }], + "color=cyan": [{ "textures": { "cross": "botania:blocks/mushroom9" } }], + "color=purple": [{ "textures": { "cross": "botania:blocks/mushroom10" } }], + "color=blue": [{ "textures": { "cross": "botania:blocks/mushroom11" } }], + "color=brown": [{ "textures": { "cross": "botania:blocks/mushroom12" } }], + "color=green": [{ "textures": { "cross": "botania:blocks/mushroom13" } }], + "color=red": [{ "textures": { "cross": "botania:blocks/mushroom14" } }], + "color=black": [{ "textures": { "cross": "botania:blocks/mushroom15" } }], + + "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom0" } }], + "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom1" } }], + "inventory_magenta": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom2" } }], + "inventory_light_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom3" } }], + "inventory_yellow": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom4" } }], + "inventory_lime": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom5" } }], + "inventory_pink": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom6" } }], + "inventory_gray": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom7" } }], + "inventory_silver": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom8" } }], + "inventory_cyan": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom9" } }], + "inventory_purple": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom10" } }], + "inventory_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom11" } }], + "inventory_brown": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom12" } }], + "inventory_green": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom13" } }], + "inventory_red": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom14" } }], + "inventory_black": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom15" } }] } } \ 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..143dab445 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/narslimmus.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/narslimmus" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..868ea45b8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/nightshade.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/nightshade" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..6da17dd9f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/nightshadeDecor.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/nightshadeDecor" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..22ce1d835 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/nightshadePrime.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/nightshadePrime" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..b9ed976ae --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/orechid.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/orechid" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..273b5e669 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/orechidIgnem.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/orechidIgnem" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/orechidIgnem" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement.json b/src/main/resources/assets/botania/blockstates/pavement.json new file mode 100644 index 000000000..baa9db28b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "color=white": [{ "textures": { "all": "botania:blocks/pavement0" } }], + "color=black": [{ "textures": { "all": "botania:blocks/pavement1" } }], + "color=blue": [{ "textures": { "all": "botania:blocks/pavement2" } }], + "color=red": [{ "textures": { "all": "botania:blocks/pavement3"} }], + "color=yellow": [{ "textures": { "all": "botania:blocks/pavement4"} }], + "color=green": [{ "textures": { "all": "botania:blocks/pavement5" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement0Slab.json b/src/main/resources/assets/botania/blockstates/pavement0Slab.json new file mode 100644 index 000000000..14b6c0b05 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement0", + "top": "botania:blocks/pavement0", + "side": "botania:blocks/pavement0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json new file mode 100644 index 000000000..dc17cad32 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement1Slab.json b/src/main/resources/assets/botania/blockstates/pavement1Slab.json new file mode 100644 index 000000000..3b757b046 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement1", + "top": "botania:blocks/pavement1", + "side": "botania:blocks/pavement1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json new file mode 100644 index 000000000..a35d6bb36 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement2Slab.json b/src/main/resources/assets/botania/blockstates/pavement2Slab.json new file mode 100644 index 000000000..2267776d9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement2", + "top": "botania:blocks/pavement2", + "side": "botania:blocks/pavement2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json new file mode 100644 index 000000000..60422e335 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement2" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement3Slab.json b/src/main/resources/assets/botania/blockstates/pavement3Slab.json new file mode 100644 index 000000000..fe1f093fd --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement3Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement3", + "top": "botania:blocks/pavement3", + "side": "botania:blocks/pavement3" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json new file mode 100644 index 000000000..a8fb061e5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement3" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement4Slab.json b/src/main/resources/assets/botania/blockstates/pavement4Slab.json new file mode 100644 index 000000000..77d541496 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement4Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement4", + "top": "botania:blocks/pavement4", + "side": "botania:blocks/pavement4" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json new file mode 100644 index 000000000..b3796d2e9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement4" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement5Slab.json b/src/main/resources/assets/botania/blockstates/pavement5Slab.json new file mode 100644 index 000000000..9e225f073 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement5Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement5", + "top": "botania:blocks/pavement5", + "side": "botania:blocks/pavement5" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json new file mode 100644 index 000000000..bdbf59766 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement5" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/petalBlock.json b/src/main/resources/assets/botania/blockstates/petalBlock.json new file mode 100644 index 000000000..4e6278648 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/petalBlock.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:cube_all_tinted", + "textures": { + "all": "botania:blocks/petalBlock" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pistonRelay.json b/src/main/resources/assets/botania/blockstates/pistonRelay.json new file mode 100644 index 000000000..fb1ccb55e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pistonRelay.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/pistonRelay" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ 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..b53aebd9b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pollidisiac.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/pollidisiac" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/pollidisiac" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Slab.json b/src/main/resources/assets/botania/blockstates/prismarine0Slab.json new file mode 100644 index 000000000..298f5d686 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/prismarine0", + "top": "botania:blocks/prismarine0", + "side": "botania:blocks/prismarine0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json b/src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json new file mode 100644 index 000000000..461c065a6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/prismarine0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Wall.json b/src/main/resources/assets/botania/blockstates/prismarine0Wall.json new file mode 100644 index 000000000..05ddceaee --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine0Wall.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block", + "textures": { "wall": "botania:blocks/prismarine0" } + }, + "variants": { + "east=false,north=true,south=true,up=false,west=false": { "model": null }, + "east=true,north=false,south=false,up=false,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "inventory": [{ + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine1Slab.json b/src/main/resources/assets/botania/blockstates/prismarine1Slab.json new file mode 100644 index 000000000..e26fcac06 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/prismarine1", + "top": "botania:blocks/prismarine1", + "side": "botania:blocks/prismarine1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json b/src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json new file mode 100644 index 000000000..6bf1e8c65 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/prismarine1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine2Slab.json b/src/main/resources/assets/botania/blockstates/prismarine2Slab.json new file mode 100644 index 000000000..29219a2ca --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/prismarine2", + "top": "botania:blocks/prismarine2", + "side": "botania:blocks/prismarine2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json b/src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json new file mode 100644 index 000000000..ed540022e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/prismarine2" } + }] + } +} \ 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..1ea981ff1 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/puredaisy.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/puredaisy" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/puredaisy" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json new file mode 100644 index 000000000..09b750c4e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockBlazeQuartz0", + "top": "botania:blocks/blockBlazeQuartz1", + "side": "botania:blocks/blockBlazeQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json new file mode 100644 index 000000000..7705bc87a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockBlazeQuartz0", + "top": "botania:blocks/blockBlazeQuartz1", + "side": "botania:blocks/blockBlazeQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json new file mode 100644 index 000000000..1b1039a18 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockDarkQuartz0", + "top": "botania:blocks/blockDarkQuartz1", + "side": "botania:blocks/blockDarkQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json new file mode 100644 index 000000000..8ca8be7bc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockDarkQuartz0", + "top": "botania:blocks/blockDarkQuartz1", + "side": "botania:blocks/blockDarkQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json new file mode 100644 index 000000000..a7172cc7b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockElfQuartz0", + "top": "botania:blocks/blockElfQuartz1", + "side": "botania:blocks/blockElfQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json new file mode 100644 index 000000000..d81a802f5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockElfQuartz0", + "top": "botania:blocks/blockElfQuartz1", + "side": "botania:blocks/blockElfQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json new file mode 100644 index 000000000..b1a53a9e4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockLavenderQuartz0", + "top": "botania:blocks/blockLavenderQuartz1", + "side": "botania:blocks/blockLavenderQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json new file mode 100644 index 000000000..56f856ee3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockLavenderQuartz0", + "top": "botania:blocks/blockLavenderQuartz1", + "side": "botania:blocks/blockLavenderQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json new file mode 100644 index 000000000..721c03133 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockManaQuartz0", + "top": "botania:blocks/blockManaQuartz1", + "side": "botania:blocks/blockManaQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json new file mode 100644 index 000000000..cceba9781 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockManaQuartz0", + "top": "botania:blocks/blockManaQuartz1", + "side": "botania:blocks/blockManaQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json new file mode 100644 index 000000000..a360f41ff --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockRedQuartz0", + "top": "botania:blocks/blockRedQuartz1", + "side": "botania:blocks/blockRedQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json new file mode 100644 index 000000000..7f7e3954c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockRedQuartz0", + "top": "botania:blocks/blockRedQuartz1", + "side": "botania:blocks/blockRedQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json new file mode 100644 index 000000000..30a9b079a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockSunnyQuartz0", + "top": "botania:blocks/blockSunnyQuartz1", + "side": "botania:blocks/blockSunnyQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json new file mode 100644 index 000000000..0a36b02be --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockSunnyQuartz0", + "top": "botania:blocks/blockSunnyQuartz1", + "side": "botania:blocks/blockSunnyQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ 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..e263bb769 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/rafflowsia.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/rafflowsia" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..4acadf424 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/rannuncarpus.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/rannuncarpus" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..8e385fd1d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/rannuncarpusChibi" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/rannuncarpusChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock.json b/src/main/resources/assets/botania/blockstates/reedBlock.json new file mode 100644 index 000000000..2eecb5a5d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/reedBlock.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/reedBlock1", + "top": "botania:blocks/reedBlock1", + "side": "botania:blocks/reedBlock0" + }, + "transform": "forge:default-block" + }, + "variants": { + "axis=x": [{ "x": 90, "y": 90 }], + "axis=y": [{}], + "axis=z": [{ "x": 90 }], + "inventory": [{}] + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json b/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json new file mode 100644 index 000000000..7eaf54181 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/reedBlock1", + "top": "botania:blocks/reedBlock1", + "side": "botania:blocks/reedBlock0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0SlabFull.json b/src/main/resources/assets/botania/blockstates/reedBlock0SlabFull.json new file mode 100644 index 000000000..3ddec2017 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/reedBlock0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { "bottom": "botania:blocks/reedBlock1", "top": "botania:blocks/reedBlock1", "side": "botania:blocks/reedBlock0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json b/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json index d86dfd521..b9d64984b 100644 --- a/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json @@ -2,8 +2,8 @@ "forge_marker": 1, "defaults": { "textures": { - "bottom": "botania:blocks/reedBlock0", - "top": "botania:blocks/reedBlock0", + "bottom": "botania:blocks/reedBlock1", + "top": "botania:blocks/reedBlock1", "side": "botania:blocks/reedBlock0" } }, diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json b/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json new file mode 100644 index 000000000..c6c6dfa19 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:wall_post_bottom_top", + "uvlock": true, + "transform": "forge:default-block", + "textures": { "side": "botania:blocks/reedBlock0", "top": "botania:blocks/reedBlock1", "bottom": "botania:blocks/reedBlock1" } + }, + "variants": { + "east=false,north=true,south=true,up=false,west=false": { "model": null }, + "east=true,north=false,south=false,up=false,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect_bottom_top" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect_bottom_top", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect_bottom_top", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect_bottom_top", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "inventory": [{ + "submodel": { "north": { "model": "botania:wall_connect_bottom_top" }, "south": { "model": "botania:wall_connect_bottom_top", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/runeAltar.json b/src/main/resources/assets/botania/blockstates/runeAltar.json new file mode 100644 index 000000000..fcff3d2dc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/runeAltar.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:biggerthanslab", + "textures": { + "top": "botania:blocks/runeAltar1", + "side": "botania:blocks/runeAltar2", + "bottom": "botania:blocks/runeAltar0" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock.json b/src/main/resources/assets/botania/blockstates/shimmerrock.json new file mode 100644 index 000000000..55193392b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerrock.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/shimmerrock" }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json b/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json new file mode 100644 index 000000000..77c9c3667 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/shimmerrock", + "top": "botania:blocks/shimmerrock", + "side": "botania:blocks/shimmerrock" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json b/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json new file mode 100644 index 000000000..7846bb4cb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/shimmerrock" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json new file mode 100644 index 000000000..c80cb83d3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/shimmerwoodPlanks" }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json new file mode 100644 index 000000000..0b94b90be --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/shimmerwoodPlanks", + "top": "botania:blocks/shimmerwoodPlanks", + "side": "botania:blocks/shimmerwoodPlanks" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json new file mode 100644 index 000000000..ee31766f3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/shimmerwoodPlanks" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shinyFlower.json b/src/main/resources/assets/botania/blockstates/shinyFlower.json index fd3edfa27..c08f56345 100644 --- a/src/main/resources/assets/botania/blockstates/shinyFlower.json +++ b/src/main/resources/assets/botania/blockstates/shinyFlower.json @@ -1,71 +1,41 @@ { "forge_marker": 1, + "defaults": { + "model": "minecraft:cross" + }, "variants": { - "color": { - "white": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering0" } - }, - "orange": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering1" } - }, - "magenta": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering2" } - }, - "light_blue": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering3" } - }, - "yellow": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering4" } - }, - "lime": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering5" } - }, - "pink": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering6" } - }, - "gray": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering7" } - }, - "silver": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering8" } - }, - "cyan": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering9" } - }, - "purple": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering10" } - }, - "blue": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering11" } - }, - "brown": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering12" } - }, - "green": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering13" } - }, - "red": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering14" } - }, - "black": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering15" } - } - } + "color=white": [{ "textures": { "cross": "botania:blocks/flowerGlimmering0" } }], + "color=orange": [{ "textures": { "cross": "botania:blocks/flowerGlimmering1" } }], + "color=magenta": [{ "textures": { "cross": "botania:blocks/flowerGlimmering2" } }], + "color=light_blue": [{ "textures": { "cross": "botania:blocks/flowerGlimmering3" } }], + "color=yellow": [{ "textures": { "cross": "botania:blocks/flowerGlimmering4" } }], + "color=lime": [{ "textures": { "cross": "botania:blocks/flowerGlimmering5" } }], + "color=pink": [{ "textures": { "cross": "botania:blocks/flowerGlimmering6" } }], + "color=gray": [{ "textures": { "cross": "botania:blocks/flowerGlimmering7" } }], + "color=silver": [{ "textures": { "cross": "botania:blocks/flowerGlimmering8" } }], + "color=cyan": [{ "textures": { "cross": "botania:blocks/flowerGlimmering9" } }], + "color=purple": [{ "textures": { "cross": "botania:blocks/flowerGlimmering10" } }], + "color=blue": [{ "textures": { "cross": "botania:blocks/flowerGlimmering11" } }], + "color=brown": [{ "textures": { "cross": "botania:blocks/flowerGlimmering12" } }], + "color=green": [{ "textures": { "cross": "botania:blocks/flowerGlimmering13" } }], + "color=red": [{ "textures": { "cross": "botania:blocks/flowerGlimmering14" } }], + "color=black": [{ "textures": { "cross": "botania:blocks/flowerGlimmering15" } }], + + "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering0" } }], + "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering1" } }], + "inventory_magenta": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering2" } }], + "inventory_light_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering3" } }], + "inventory_yellow": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering4" } }], + "inventory_lime": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering5" } }], + "inventory_pink": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering6" } }], + "inventory_gray": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering7" } }], + "inventory_silver": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering8" } }], + "inventory_cyan": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering9" } }], + "inventory_purple": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering10" } }], + "inventory_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering11" } }], + "inventory_brown": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering12" } }], + "inventory_green": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering13" } }], + "inventory_red": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering14" } }], + "inventory_black": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering15" } }] } } \ 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..a5173a435 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/solegnolia.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/solegnolia" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..71f1173eb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/solegnoliaChibi" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/solegnoliaChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/solidVine.json b/src/main/resources/assets/botania/blockstates/solidVine.json new file mode 100644 index 000000000..67ee020a5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/solidVine.json @@ -0,0 +1,36 @@ +{ + "variants": { + "east=false,north=false,south=false,up=false,west=false": { "model": "vine_1" }, + "east=false,north=false,south=true,up=false,west=false": { "model": "vine_1" }, + "east=false,north=false,south=false,up=false,west=true": { "model": "vine_1", "y": 90 }, + "east=false,north=true,south=false,up=false,west=false": { "model": "vine_1", "y": 180 }, + "east=true,north=false,south=false,up=false,west=false": { "model": "vine_1", "y": 270 }, + "east=true,north=true,south=false,up=false,west=false": { "model": "vine_2" }, + "east=true,north=false,south=true,up=false,west=false": { "model": "vine_2", "y": 90 }, + "east=false,north=false,south=true,up=false,west=true": { "model": "vine_2", "y": 180 }, + "east=false,north=true,south=false,up=false,west=true": { "model": "vine_2", "y": 270 }, + "east=true,north=false,south=false,up=false,west=true": { "model": "vine_2_opposite" }, + "east=false,north=true,south=true,up=false,west=false": { "model": "vine_2_opposite", "y": 90 }, + "east=true,north=true,south=true,up=false,west=false": { "model": "vine_3" }, + "east=true,north=false,south=true,up=false,west=true": { "model": "vine_3", "y": 90 }, + "east=false,north=true,south=true,up=false,west=true": { "model": "vine_3", "y": 180 }, + "east=true,north=true,south=false,up=false,west=true": { "model": "vine_3", "y": 270 }, + "east=true,north=true,south=true,up=false,west=true": { "model": "vine_4" }, + "east=false,north=false,south=false,up=true,west=false": { "model": "vine_u" }, + "east=false,north=false,south=true,up=true,west=false": { "model": "vine_1u" }, + "east=false,north=false,south=false,up=true,west=true": { "model": "vine_1u", "y": 90 }, + "east=false,north=true,south=false,up=true,west=false": { "model": "vine_1u", "y": 180 }, + "east=true,north=false,south=false,up=true,west=false": { "model": "vine_1u", "y": 270 }, + "east=true,north=true,south=false,up=true,west=false": { "model": "vine_2u" }, + "east=true,north=false,south=true,up=true,west=false": { "model": "vine_2u", "y": 90 }, + "east=false,north=false,south=true,up=true,west=true": { "model": "vine_2u", "y": 180 }, + "east=false,north=true,south=false,up=true,west=true": { "model": "vine_2u", "y": 270 }, + "east=true,north=false,south=false,up=true,west=true": { "model": "vine_2u_opposite" }, + "east=false,north=true,south=true,up=true,west=false": { "model": "vine_2u_opposite", "y": 90 }, + "east=true,north=true,south=true,up=true,west=false": { "model": "vine_3u" }, + "east=true,north=false,south=true,up=true,west=true": { "model": "vine_3u", "y": 90 }, + "east=false,north=true,south=true,up=true,west=true": { "model": "vine_3u", "y": 180 }, + "east=true,north=true,south=false,up=true,west=true": { "model": "vine_3u", "y": 270 }, + "east=true,north=true,south=true,up=true,west=true": { "model": "vine_4u" } + } +} diff --git a/src/main/resources/assets/botania/blockstates/specialFlower.json b/src/main/resources/assets/botania/blockstates/specialFlower.json new file mode 100644 index 000000000..8ed1128f1 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/specialFlower.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:specialFlower", + "transform": "forge:default-block" + }, + "variants": { + "normal": [{ + "custom": { "base": "minecraft:poppy" } + }], + "inventory": [{ + "custom": { "base": "minecraft:poppy" } + }] + } +} \ No newline at end of file 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..a9885c596 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/spectranthemum.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/spectranthemum" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..9c5a5fcda --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/spectrolus.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/spectrolus" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/spectrolus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/starfield.json b/src/main/resources/assets/botania/blockstates/starfield.json new file mode 100644 index 000000000..e37b30a21 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/starfield.json @@ -0,0 +1,29 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block" + }, + "variants": { + "normal": [{ + "model": "botania:thinnerthanslab", + "textures": { + "bottom": "botania:blocks/starfield0", + "top": "botania:blocks/starfield1", + "side": "botania:blocks/starfield2" + } + }], + "inventory": [{ + "model": "botania:thinnerthanslab", + "textures": { + "bottom": "botania:blocks/starfield0", + "top": "botania:blocks/starfield0", + "side": "botania:blocks/starfield2" + }, + "transform": { + "firstperson": { + "translation": [ 0, 0.125, 0 ] + } + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone.json b/src/main/resources/assets/botania/blockstates/stone.json new file mode 100644 index 000000000..249d618ba --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone.json @@ -0,0 +1,25 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant=andesite": [{ "textures": { "all": "botania:blocks/stone0" } }], + "variant=basalt": [{ "textures": { "all": "botania:blocks/stone1" } }], + "variant=diorite": [{ "textures": { "all": "botania:blocks/stone2" } }], + "variant=granite": [{ "textures": { "all": "botania:blocks/stone3" } }], + "variant=polished_andesite": [{ "textures": { "all": "botania:blocks/stone4" } }], + "variant=polished_basalt": [{ "textures": { "all": "botania:blocks/stone5" } }], + "variant=polished_diorite": [{ "textures": { "all": "botania:blocks/stone6" } }], + "variant=polished_granite": [{ "textures": { "all": "botania:blocks/stone7" } }], + "variant=andesite_brick": [{ "textures": { "all": "botania:blocks/stone8" } }], + "variant=basalt_brick": [{ "textures": { "all": "botania:blocks/stone9" } }], + "variant=diorite_brick": [{ "textures": { "all": "botania:blocks/stone10" } }], + "variant=granite_brick": [{ "textures": { "all": "botania:blocks/stone11" } }], + "variant=chiseled_andesite": [{ "textures": { "all": "botania:blocks/stone12" } }], + "variant=chiseled_basalt": [{ "textures": { "all": "botania:blocks/stone13" } }], + "variant=chiseled_diorite": [{ "textures": { "all": "botania:blocks/stone14" } }], + "variant=chiseled_granite": [{ "textures": { "all": "botania:blocks/stone15" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0Slab.json b/src/main/resources/assets/botania/blockstates/stone0Slab.json new file mode 100644 index 000000000..69bc192bc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone0", + "top": "botania:blocks/stone0", + "side": "botania:blocks/stone0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0SlabFull.json b/src/main/resources/assets/botania/blockstates/stone0SlabFull.json new file mode 100644 index 000000000..abf015306 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0Wall.json b/src/main/resources/assets/botania/blockstates/stone0Wall.json new file mode 100644 index 000000000..c77f3f3f8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone0Wall.json @@ -0,0 +1,62 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "east=false,north=true,south=true,up=false,variant=andesite,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=basalt,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=diorite,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=granite,west=false": { "model": null }, + + "east=true,north=false,south=false,up=false,variant=andesite,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=basalt,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=diorite,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=granite,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "variant": { + "andesite": { "textures": { "wall": "botania:blocks/stone0" } }, + "basalt": { "textures": { "wall": "botania:blocks/stone1" } }, + "diorite": { "textures": { "wall": "botania:blocks/stone2" } }, + "granite": { "textures": { "wall": "botania:blocks/stone3" } } + }, + "inventory_andesite": [{ + "textures": { "wall": "botania:blocks/stone0" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_basalt": [{ + "textures": { "wall": "botania:blocks/stone1" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_diorite": [{ + "textures": { "wall": "botania:blocks/stone2" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_granite": [{ + "textures": { "wall": "botania:blocks/stone3" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone10Slab.json b/src/main/resources/assets/botania/blockstates/stone10Slab.json new file mode 100644 index 000000000..e34591679 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone10Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone10", + "top": "botania:blocks/stone10", + "side": "botania:blocks/stone10" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone10SlabFull.json b/src/main/resources/assets/botania/blockstates/stone10SlabFull.json new file mode 100644 index 000000000..3c06d8495 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone10SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone10" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone11Slab.json b/src/main/resources/assets/botania/blockstates/stone11Slab.json new file mode 100644 index 000000000..d552b8011 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone11Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone11", + "top": "botania:blocks/stone11", + "side": "botania:blocks/stone11" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone11SlabFull.json b/src/main/resources/assets/botania/blockstates/stone11SlabFull.json new file mode 100644 index 000000000..c23b8fae1 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone11SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone11" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone1Slab.json b/src/main/resources/assets/botania/blockstates/stone1Slab.json new file mode 100644 index 000000000..4508c5ae4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone1", + "top": "botania:blocks/stone1", + "side": "botania:blocks/stone1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone1SlabFull.json b/src/main/resources/assets/botania/blockstates/stone1SlabFull.json new file mode 100644 index 000000000..f4aabbb94 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone2Slab.json b/src/main/resources/assets/botania/blockstates/stone2Slab.json new file mode 100644 index 000000000..fe8112611 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone2", + "top": "botania:blocks/stone2", + "side": "botania:blocks/stone2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone2SlabFull.json b/src/main/resources/assets/botania/blockstates/stone2SlabFull.json new file mode 100644 index 000000000..651f4de73 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone2" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone3Slab.json b/src/main/resources/assets/botania/blockstates/stone3Slab.json new file mode 100644 index 000000000..8cc0f549c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone3Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone3", + "top": "botania:blocks/stone3", + "side": "botania:blocks/stone3" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone3SlabFull.json b/src/main/resources/assets/botania/blockstates/stone3SlabFull.json new file mode 100644 index 000000000..f12af79cc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone3SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone3" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone8Slab.json b/src/main/resources/assets/botania/blockstates/stone8Slab.json new file mode 100644 index 000000000..1b98c7a73 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone8Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone8", + "top": "botania:blocks/stone8", + "side": "botania:blocks/stone8" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone8SlabFull.json b/src/main/resources/assets/botania/blockstates/stone8SlabFull.json new file mode 100644 index 000000000..b9418ced7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone8SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone8" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone9Slab.json b/src/main/resources/assets/botania/blockstates/stone9Slab.json new file mode 100644 index 000000000..3c15896c2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone9Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone9", + "top": "botania:blocks/stone9", + "side": "botania:blocks/stone9" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone9SlabFull.json b/src/main/resources/assets/botania/blockstates/stone9SlabFull.json new file mode 100644 index 000000000..17c878f1b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone9SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone9" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/storage.json b/src/main/resources/assets/botania/blockstates/storage.json index 8099a05fb..0b3e7899a 100644 --- a/src/main/resources/assets/botania/blockstates/storage.json +++ b/src/main/resources/assets/botania/blockstates/storage.json @@ -1,9 +1,14 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, "variants": { - "variant=manasteel": { "model": "botania:storage_manasteel" }, - "variant=terrasteel": { "model": "botania:storage_terrasteel" }, - "variant=elementium": { "model": "botania:storage_elementium" }, - "variant=mana_diamond": { "model": "botania:storage_mana_diamond" }, - "variant=dragonstone": { "model": "botania:storage_dragonstone" } + "variant=manasteel": [{ "textures": { "all": "botania:blocks/storage0" } }], + "variant=terrasteel": [{ "textures": { "all": "botania:blocks/storage1" } }], + "variant=elementium": [{ "textures": { "all": "botania:blocks/storage2" } }], + "variant=mana_diamond": [{ "textures": { "all": "botania:blocks/storage3" } }], + "variant=dragonstone": [{ "textures": { "all": "botania:blocks/storage4" } }] } } \ 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..77695bb45 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/tangleberrie.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/tangleberrie" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/tangleberrie" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thatch0Slab.json b/src/main/resources/assets/botania/blockstates/thatch0Slab.json new file mode 100644 index 000000000..d71cfd06a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/thatch0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/thatch", + "top": "botania:blocks/thatch", + "side": "botania:blocks/thatch" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thatch0SlabFull.json b/src/main/resources/assets/botania/blockstates/thatch0SlabFull.json new file mode 100644 index 000000000..427822d3b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/thatch0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/thatch" } + }] + } +} \ 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..760e52e70 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/thermalily.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/thermalily" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "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..8977cfe1c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/tigerseye.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/tigerseye" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/tigerseye" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/unstableBlock.json b/src/main/resources/assets/botania/blockstates/unstableBlock.json new file mode 100644 index 000000000..47a7be21f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/unstableBlock.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:microblock_all", + "textures": { + "all": "botania:blocks/unstableBlock" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ 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..dbdf9c15b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/vinculotus.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/vinculotus" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/vinculotus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_dry.json b/src/main/resources/assets/botania/models/block/altGrass_dry.json deleted file mode 100644 index dfb175331..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_dry.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass0", - "side": "botania:blocks/altGrass1", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_golden.json b/src/main/resources/assets/botania/models/block/altGrass_golden.json deleted file mode 100644 index 24668bae6..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_golden.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass2", - "side": "botania:blocks/altGrass3", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_infused.json b/src/main/resources/assets/botania/models/block/altGrass_infused.json deleted file mode 100644 index cba653bda..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_infused.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass8", - "side": "botania:blocks/altGrass9", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_mutated.json b/src/main/resources/assets/botania/models/block/altGrass_mutated.json deleted file mode 100644 index 33e9ce82b..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_mutated.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass10", - "side": "botania:blocks/altGrass11", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_scorched.json b/src/main/resources/assets/botania/models/block/altGrass_scorched.json deleted file mode 100644 index c79993e04..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_scorched.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass6", - "side": "botania:blocks/altGrass7", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_vivid.json b/src/main/resources/assets/botania/models/block/altGrass_vivid.json deleted file mode 100644 index f1226714e..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_vivid.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass4", - "side": "botania:blocks/altGrass5", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/biggerthanslab.json b/src/main/resources/assets/botania/models/block/biggerthanslab.json new file mode 100644 index 000000000..7c944c1fd --- /dev/null +++ b/src/main/resources/assets/botania/models/block/biggerthanslab.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 12, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} 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 } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/cube_all_tinted.json b/src/main/resources/assets/botania/models/block/cube_all_tinted.json new file mode 100644 index 000000000..bde99787b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/cube_all_tinted.json @@ -0,0 +1,18 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "texture": "#all", "cullface": "down", "tintindex": 0 }, + "up": { "texture": "#all", "cullface": "up", "tintindex": 0 }, + "north": { "texture": "#all", "cullface": "north", "tintindex": 0 }, + "south": { "texture": "#all", "cullface": "south", "tintindex": 0 }, + "west": { "texture": "#all", "cullface": "west", "tintindex": 0 }, + "east": { "texture": "#all", "cullface": "east", "tintindex": 0 } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/drum.json b/src/main/resources/assets/botania/models/block/drum.json new file mode 100644 index 000000000..f7c0d0dae --- /dev/null +++ b/src/main/resources/assets/botania/models/block/drum.json @@ -0,0 +1,18 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [{ + "name": "Drum", + "from": [ 3.0, 0.0, 3.0 ], + "to": [ 13.0, 14.0, 13.0 ], + "faces": { + "north": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, + "south": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, + "west": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, + "east": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, + "up": { "texture": "#top", "uv": [ 3, 3, 12, 12 ] }, + "down": { "texture": "#top", "uv": [ 3, 3, 12, 12 ], "cullface": "down" } + } + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_brick.json b/src/main/resources/assets/botania/models/block/livingrock_brick.json deleted file mode 100644 index c79412d70..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_brick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingrock1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json b/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json deleted file mode 100644 index 07ee851a4..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingrock4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json b/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json deleted file mode 100644 index 8b4cafa2c..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingrock3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_default.json b/src/main/resources/assets/botania/models/block/livingrock_default.json deleted file mode 100644 index 9a8786117..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_default.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingrock0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json b/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json deleted file mode 100644 index bd6a802c2..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingrock2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_default.json b/src/main/resources/assets/botania/models/block/livingwood_default.json deleted file mode 100644 index 0a8062fd9..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_default.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingwood0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_framed.json b/src/main/resources/assets/botania/models/block/livingwood_framed.json deleted file mode 100644 index 67ad48c5f..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_framed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingwood3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_glimmering.json b/src/main/resources/assets/botania/models/block/livingwood_glimmering.json deleted file mode 100644 index 3f76a6831..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_glimmering.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingwood5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json deleted file mode 100644 index 98ec94ac6..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "botania:blocks/livingwood0", - "top": "botania:blocks/livingwood0", - "side": "botania:blocks/livingwood0" - } -} diff --git a/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json b/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json deleted file mode 100644 index 88b9f8d3e..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingwood2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json b/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json deleted file mode 100644 index a3edcc34f..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingwood4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks.json b/src/main/resources/assets/botania/models/block/livingwood_planks.json deleted file mode 100644 index ff95b9ae9..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingwood1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/microblock_all.json b/src/main/resources/assets/botania/models/block/microblock_all.json new file mode 100644 index 000000000..9cd2d3fc0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/microblock_all.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "Cube", + "from": [ 4, 4, 4 ], + "to": [ 12, 12, 12 ], + "faces": { + "down": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 }, + "up": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 }, + "north": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 }, + "south": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 }, + "west": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 }, + "east": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/miniblock_top.json b/src/main/resources/assets/botania/models/block/miniblock_top.json new file mode 100644 index 000000000..9022ed180 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/miniblock_top.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "Cube", + "from": [ 3, 3, 3 ], + "to": [ 13, 13, 13 ], + "faces": { + "down": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "up": { "texture": "#top", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "north": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "south": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "west": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "east": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/minusone_all.json b/src/main/resources/assets/botania/models/block/minusone_all.json new file mode 100644 index 000000000..78896926e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/minusone_all.json @@ -0,0 +1,18 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 15, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all" }, + "north": { "uv": [ 0, 1, 16, 16 ], "texture": "#all", "cullface": "north" }, + "south": { "uv": [ 0, 1, 16, 16 ], "texture": "#all", "cullface": "south" }, + "west": { "uv": [ 0, 1, 16, 16 ], "texture": "#all", "cullface": "west" }, + "east": { "uv": [ 0, 1, 16, 16 ], "texture": "#all", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/storage_dragonstone.json b/src/main/resources/assets/botania/models/block/storage_dragonstone.json deleted file mode 100644 index 7d0c130d0..000000000 --- a/src/main/resources/assets/botania/models/block/storage_dragonstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/storage4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/storage_elementium.json b/src/main/resources/assets/botania/models/block/storage_elementium.json deleted file mode 100644 index a55282f38..000000000 --- a/src/main/resources/assets/botania/models/block/storage_elementium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/storage2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/storage_mana_diamond.json b/src/main/resources/assets/botania/models/block/storage_mana_diamond.json deleted file mode 100644 index 4a875189b..000000000 --- a/src/main/resources/assets/botania/models/block/storage_mana_diamond.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/storage3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/storage_manasteel.json b/src/main/resources/assets/botania/models/block/storage_manasteel.json deleted file mode 100644 index bdb8f0a68..000000000 --- a/src/main/resources/assets/botania/models/block/storage_manasteel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/storage0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/storage_terrasteel.json b/src/main/resources/assets/botania/models/block/storage_terrasteel.json deleted file mode 100644 index add746c6d..000000000 --- a/src/main/resources/assets/botania/models/block/storage_terrasteel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/storage1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/thinnerthanslab.json b/src/main/resources/assets/botania/models/block/thinnerthanslab.json new file mode 100644 index 000000000..3e9cc996a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/thinnerthanslab.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 4, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 12, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 12, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 12, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 12, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/wall_connect.json b/src/main/resources/assets/botania/models/block/wall_connect.json new file mode 100644 index 000000000..281d9a7b5 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/wall_connect.json @@ -0,0 +1,19 @@ +{ + "__comment": "Stolen from the Forge example/debug code", + "textures": { + "particle": "#wall" + }, + "elements": [ + { "from": [ 5, 0, 0 ], + "to": [ 11, 13, 8 ], + "faces": { + "down": { "uv": [ 5, 0, 11, 8 ], "texture": "#wall", "cullface": "down" }, + "up": { "uv": [ 5, 0, 11, 8 ], "texture": "#wall" }, + "north": { "uv": [ 5, 3, 11, 16 ], "texture": "#wall", "cullface": "north" }, + "west": { "uv": [ 0, 3, 8, 16 ], "texture": "#wall" }, + "east": { "uv": [ 0, 3, 8, 16 ], "texture": "#wall" } + }, + "__comment": "North wall" + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json new file mode 100644 index 000000000..3252c7e70 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json @@ -0,0 +1,20 @@ +{ + "__comment": "Stolen from the Forge example/debug code", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 5, 0, 0 ], + "to": [ 11, 13, 8 ], + "faces": { + "down": { "uv": [ 5, 0, 11, 8 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 5, 0, 11, 8 ], "texture": "#top" }, + "north": { "uv": [ 5, 3, 11, 16 ], "texture": "#side", "cullface": "north" }, + "west": { "uv": [ 0, 3, 8, 16 ], "texture": "#side" }, + "east": { "uv": [ 0, 3, 8, 16 ], "texture": "#side" } + }, + "__comment": "North wall" + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json new file mode 100644 index 000000000..c060e1ff3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [ + { "from": [ 4, 0, 4 ], + "to": [ 12, 16, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top", "cullface": "up" }, + "north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "west": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "east": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" } + }, + "__comment": "Center post" + } + ] +} diff --git a/src/main/resources/assets/botania/models/item/altGrass_dry.json b/src/main/resources/assets/botania/models/item/altGrass_dry.json deleted file mode 100644 index 6a70baf25..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_dry.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_dry", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_golden.json b/src/main/resources/assets/botania/models/item/altGrass_golden.json deleted file mode 100644 index 45751fb50..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_golden.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_golden", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_infused.json b/src/main/resources/assets/botania/models/item/altGrass_infused.json deleted file mode 100644 index d55365d64..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_infused.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_infused", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_mutated.json b/src/main/resources/assets/botania/models/item/altGrass_mutated.json deleted file mode 100644 index e4632a5c2..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_mutated.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_mutated", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_scorched.json b/src/main/resources/assets/botania/models/item/altGrass_scorched.json deleted file mode 100644 index d050bcd74..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_scorched.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_scorched", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_vivid.json b/src/main/resources/assets/botania/models/item/altGrass_vivid.json deleted file mode 100644 index 47d5b9a35..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_vivid.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_vivid", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_black.json b/src/main/resources/assets/botania/models/item/flower_black.json deleted file mode 100644 index 74be17232..000000000 --- a/src/main/resources/assets/botania/models/item/flower_black.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower15" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_blue.json b/src/main/resources/assets/botania/models/item/flower_blue.json deleted file mode 100644 index 08989cd7b..000000000 --- a/src/main/resources/assets/botania/models/item/flower_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower11" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_brown.json b/src/main/resources/assets/botania/models/item/flower_brown.json deleted file mode 100644 index 73c83d12c..000000000 --- a/src/main/resources/assets/botania/models/item/flower_brown.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower12" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_cyan.json b/src/main/resources/assets/botania/models/item/flower_cyan.json deleted file mode 100644 index ff1f1f9ec..000000000 --- a/src/main/resources/assets/botania/models/item/flower_cyan.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower9" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_gray.json b/src/main/resources/assets/botania/models/item/flower_gray.json deleted file mode 100644 index cff1cd61b..000000000 --- a/src/main/resources/assets/botania/models/item/flower_gray.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_green.json b/src/main/resources/assets/botania/models/item/flower_green.json deleted file mode 100644 index e4aedca11..000000000 --- a/src/main/resources/assets/botania/models/item/flower_green.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower13" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_light_blue.json b/src/main/resources/assets/botania/models/item/flower_light_blue.json deleted file mode 100644 index 0ff9e7bd0..000000000 --- a/src/main/resources/assets/botania/models/item/flower_light_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_lime.json b/src/main/resources/assets/botania/models/item/flower_lime.json deleted file mode 100644 index 16d27ccd3..000000000 --- a/src/main/resources/assets/botania/models/item/flower_lime.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_magenta.json b/src/main/resources/assets/botania/models/item/flower_magenta.json deleted file mode 100644 index 4018d6d6e..000000000 --- a/src/main/resources/assets/botania/models/item/flower_magenta.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_orange.json b/src/main/resources/assets/botania/models/item/flower_orange.json deleted file mode 100644 index 117a1ae96..000000000 --- a/src/main/resources/assets/botania/models/item/flower_orange.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_pink.json b/src/main/resources/assets/botania/models/item/flower_pink.json deleted file mode 100644 index 97aab6cfb..000000000 --- a/src/main/resources/assets/botania/models/item/flower_pink.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_purple.json b/src/main/resources/assets/botania/models/item/flower_purple.json deleted file mode 100644 index 422e008de..000000000 --- a/src/main/resources/assets/botania/models/item/flower_purple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower10" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_red.json b/src/main/resources/assets/botania/models/item/flower_red.json deleted file mode 100644 index 71adb35b7..000000000 --- a/src/main/resources/assets/botania/models/item/flower_red.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower14" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_silver.json b/src/main/resources/assets/botania/models/item/flower_silver.json deleted file mode 100644 index e7e1a7bad..000000000 --- a/src/main/resources/assets/botania/models/item/flower_silver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower8" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_white.json b/src/main/resources/assets/botania/models/item/flower_white.json deleted file mode 100644 index c72fbabed..000000000 --- a/src/main/resources/assets/botania/models/item/flower_white.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_yellow.json b/src/main/resources/assets/botania/models/item/flower_yellow.json deleted file mode 100644 index 1fd5e7d07..000000000 --- a/src/main/resources/assets/botania/models/item/flower_yellow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_brick.json b/src/main/resources/assets/botania/models/item/livingrock_brick.json deleted file mode 100644 index e7db2c9a4..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock_brick.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingrock_brick", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_chiseled_brick.json b/src/main/resources/assets/botania/models/item/livingrock_chiseled_brick.json deleted file mode 100644 index 82ca1f8a1..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock_chiseled_brick.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingrock_chiseled_brick", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_cracked_brick.json b/src/main/resources/assets/botania/models/item/livingrock_cracked_brick.json deleted file mode 100644 index b134b5b62..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock_cracked_brick.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingrock_cracked_brick", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_default.json b/src/main/resources/assets/botania/models/item/livingrock_default.json deleted file mode 100644 index b87480b27..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock_default.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingrock_default", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_mossy_brick.json b/src/main/resources/assets/botania/models/item/livingrock_mossy_brick.json deleted file mode 100644 index 972cf35c5..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock_mossy_brick.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingrock_mossy_brick", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_default.json b/src/main/resources/assets/botania/models/item/livingwood_default.json deleted file mode 100644 index 26fa10fad..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_default.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_default", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_framed.json b/src/main/resources/assets/botania/models/item/livingwood_framed.json deleted file mode 100644 index e9cee1d0f..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_framed.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_framed", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_glimmering.json b/src/main/resources/assets/botania/models/item/livingwood_glimmering.json deleted file mode 100644 index a5ce44ad5..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_glimmering.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_glimmering", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json b/src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json deleted file mode 100644 index 949174e54..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_mossy_planks", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json b/src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json deleted file mode 100644 index 6866a6652..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_pattern_framed", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_planks.json b/src/main/resources/assets/botania/models/item/livingwood_planks.json deleted file mode 100644 index 82cf0d370..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_planks.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_planks", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_black.json b/src/main/resources/assets/botania/models/item/mushroom_black.json deleted file mode 100644 index 02010cbda..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_black.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom15" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_blue.json b/src/main/resources/assets/botania/models/item/mushroom_blue.json deleted file mode 100644 index 0301bf3fd..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom11" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_brown.json b/src/main/resources/assets/botania/models/item/mushroom_brown.json deleted file mode 100644 index 39e744fee..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_brown.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom12" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_cyan.json b/src/main/resources/assets/botania/models/item/mushroom_cyan.json deleted file mode 100644 index d17557e19..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_cyan.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom9" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_gray.json b/src/main/resources/assets/botania/models/item/mushroom_gray.json deleted file mode 100644 index ba46fa3b6..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_gray.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_green.json b/src/main/resources/assets/botania/models/item/mushroom_green.json deleted file mode 100644 index aed8cc9ab..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_green.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom13" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_light_blue.json b/src/main/resources/assets/botania/models/item/mushroom_light_blue.json deleted file mode 100644 index 02569057b..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_light_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_lime.json b/src/main/resources/assets/botania/models/item/mushroom_lime.json deleted file mode 100644 index 60e3fd100..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_lime.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_magenta.json b/src/main/resources/assets/botania/models/item/mushroom_magenta.json deleted file mode 100644 index 617ad89ee..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_magenta.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_orange.json b/src/main/resources/assets/botania/models/item/mushroom_orange.json deleted file mode 100644 index 6e0e78438..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_orange.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_pink.json b/src/main/resources/assets/botania/models/item/mushroom_pink.json deleted file mode 100644 index 562925c0b..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_pink.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_purple.json b/src/main/resources/assets/botania/models/item/mushroom_purple.json deleted file mode 100644 index d7874c8ba..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_purple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom10" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_red.json b/src/main/resources/assets/botania/models/item/mushroom_red.json deleted file mode 100644 index 43d756c6a..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_red.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom14" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_silver.json b/src/main/resources/assets/botania/models/item/mushroom_silver.json deleted file mode 100644 index edb1409dc..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_silver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom8" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_white.json b/src/main/resources/assets/botania/models/item/mushroom_white.json deleted file mode 100644 index 4f6d7d848..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_white.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_yellow.json b/src/main/resources/assets/botania/models/item/mushroom_yellow.json deleted file mode 100644 index 7c1555c74..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_yellow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_black.json b/src/main/resources/assets/botania/models/item/shinyFlower_black.json deleted file mode 100644 index 9e32d4ab4..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_black.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering15" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_blue.json b/src/main/resources/assets/botania/models/item/shinyFlower_blue.json deleted file mode 100644 index 584a504b3..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering11" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_brown.json b/src/main/resources/assets/botania/models/item/shinyFlower_brown.json deleted file mode 100644 index babb9d96a..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_brown.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering12" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_cyan.json b/src/main/resources/assets/botania/models/item/shinyFlower_cyan.json deleted file mode 100644 index 23cfb282b..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_cyan.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering9" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_gray.json b/src/main/resources/assets/botania/models/item/shinyFlower_gray.json deleted file mode 100644 index 0bacb5d9b..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_gray.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_green.json b/src/main/resources/assets/botania/models/item/shinyFlower_green.json deleted file mode 100644 index eb8516159..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_green.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering13" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_light_blue.json b/src/main/resources/assets/botania/models/item/shinyFlower_light_blue.json deleted file mode 100644 index 65e9a89c0..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_light_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_lime.json b/src/main/resources/assets/botania/models/item/shinyFlower_lime.json deleted file mode 100644 index 3b6026e2b..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_lime.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_magenta.json b/src/main/resources/assets/botania/models/item/shinyFlower_magenta.json deleted file mode 100644 index 111119d77..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_magenta.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_orange.json b/src/main/resources/assets/botania/models/item/shinyFlower_orange.json deleted file mode 100644 index e1354029b..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_orange.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_pink.json b/src/main/resources/assets/botania/models/item/shinyFlower_pink.json deleted file mode 100644 index 4d1005a14..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_pink.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_purple.json b/src/main/resources/assets/botania/models/item/shinyFlower_purple.json deleted file mode 100644 index fbc39c447..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_purple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering10" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_red.json b/src/main/resources/assets/botania/models/item/shinyFlower_red.json deleted file mode 100644 index b03af685f..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_red.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering14" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_silver.json b/src/main/resources/assets/botania/models/item/shinyFlower_silver.json deleted file mode 100644 index 0bacb5d9b..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_silver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_white.json b/src/main/resources/assets/botania/models/item/shinyFlower_white.json deleted file mode 100644 index e80b16af8..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_white.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_yellow.json b/src/main/resources/assets/botania/models/item/shinyFlower_yellow.json deleted file mode 100644 index ff3082d61..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_yellow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/storage_dragonstone.json b/src/main/resources/assets/botania/models/item/storage_dragonstone.json deleted file mode 100644 index bd06a4a3c..000000000 --- a/src/main/resources/assets/botania/models/item/storage_dragonstone.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/storage_dragonstone", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/storage_elementium.json b/src/main/resources/assets/botania/models/item/storage_elementium.json deleted file mode 100644 index 882bed65b..000000000 --- a/src/main/resources/assets/botania/models/item/storage_elementium.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/storage_elementium", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/storage_mana_diamond.json b/src/main/resources/assets/botania/models/item/storage_mana_diamond.json deleted file mode 100644 index 5d0e79f83..000000000 --- a/src/main/resources/assets/botania/models/item/storage_mana_diamond.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/storage_mana_diamond", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/storage_manasteel.json b/src/main/resources/assets/botania/models/item/storage_manasteel.json deleted file mode 100644 index 3a90a8b51..000000000 --- a/src/main/resources/assets/botania/models/item/storage_manasteel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/storage_manasteel", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/storage_terrasteel.json b/src/main/resources/assets/botania/models/item/storage_terrasteel.json deleted file mode 100644 index a507f6606..000000000 --- a/src/main/resources/assets/botania/models/item/storage_terrasteel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/storage_terrasteel", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/twigWand.json b/src/main/resources/assets/botania/models/item/twigWand.json new file mode 100644 index 000000000..c46913af5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/twigWand.json @@ -0,0 +1,9 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/twigWand0", + "layer1": "botania:items/twigWand1", + "layer2": "botania:items/twigWand2", + "layer3": "botania:items/twigWand3" + } +} \ No newline at end of file