From 9e6a19218f268ced4d1518b4e67bfc66d175edea Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 26 Mar 2019 22:54:14 -0500 Subject: [PATCH] Fix more blocks, fix shaders --- .../client/core/handler/ModelHandler.java | 2 - .../client/core/helper/ShaderHelper.java | 46 +++++++++---------- .../client/core/proxy/ClientProxy.java | 1 + .../botania/client/lib/LibResources.java | 2 +- .../blockstates/black_double_flower.json | 6 +++ .../blockstates/blue_double_flower.json | 6 +++ .../blockstates/brown_double_flower.json | 6 +++ .../botania/blockstates/crafty_crate.json | 27 ++++------- .../blockstates/cyan_double_flower.json | 6 +++ .../botania/blockstates/doubleflower1.json | 24 ---------- .../botania/blockstates/doubleflower2.json | 24 ---------- .../blockstates/gray_double_flower.json | 6 +++ .../blockstates/green_double_flower.json | 6 +++ .../blockstates/light_blue_double_flower.json | 6 +++ .../blockstates/light_gray_double_flower.json | 6 +++ .../blockstates/lime_double_flower.json | 6 +++ .../blockstates/magenta_double_flower.json | 6 +++ .../botania/blockstates/open_crate.json | 7 +-- .../blockstates/orange_double_flower.json | 6 +++ .../blockstates/pink_double_flower.json | 6 +++ .../blockstates/purple_double_flower.json | 6 +++ .../blockstates/red_double_flower.json | 6 +++ .../botania/blockstates/teru_teru_bozu.json | 2 +- .../blockstates/white_double_flower.json | 6 +++ .../blockstates/yellow_double_flower.json | 6 +++ .../botania/models/block/crafty_crate.json | 7 +++ .../models/block/crafty_crate_1_1.json | 7 +++ .../models/block/crafty_crate_1_2.json | 7 +++ .../models/block/crafty_crate_1_3.json | 7 +++ .../models/block/crafty_crate_2_1.json | 7 +++ .../models/block/crafty_crate_2_2.json | 7 +++ .../models/block/crafty_crate_2_3.json | 7 +++ .../models/block/crafty_crate_3_1.json | 7 +++ .../models/block/crafty_crate_3_2.json | 7 +++ .../models/block/crafty_crate_donut.json | 7 +++ .../assets/botania/models/block/crate.json | 16 ------- .../botania/models/block/open_crate.json | 7 +++ .../block/plants/black_double_flower.json | 6 +++ .../block/plants/black_double_flower_top.json | 6 +++ .../block/plants/blue_double_flower.json | 6 +++ .../block/plants/blue_double_flower_top.json | 6 +++ .../block/plants/brown_double_flower.json | 6 +++ .../block/plants/brown_double_flower_top.json | 6 +++ .../block/plants/cyan_double_flower.json | 6 +++ .../block/plants/cyan_double_flower_top.json | 6 +++ .../block/plants/gray_double_flower.json | 6 +++ .../block/plants/gray_double_flower_top.json | 6 +++ .../block/plants/green_double_flower.json | 6 +++ .../block/plants/green_double_flower_top.json | 6 +++ .../plants/light_blue_double_flower.json | 6 +++ .../plants/light_blue_double_flower_top.json | 6 +++ .../plants/light_gray_double_flower.json | 6 +++ .../plants/light_gray_double_flower_top.json | 6 +++ .../block/plants/lime_double_flower.json | 6 +++ .../block/plants/lime_double_flower_top.json | 6 +++ .../block/plants/magenta_double_flower.json | 6 +++ .../plants/magenta_double_flower_top.json | 6 +++ .../block/plants/orange_double_flower.json | 6 +++ .../plants/orange_double_flower_top.json | 6 +++ .../block/plants/pink_double_flower.json | 6 +++ .../block/plants/pink_double_flower_top.json | 6 +++ .../block/plants/purple_double_flower.json | 6 +++ .../plants/purple_double_flower_top.json | 6 +++ .../block/plants/red_double_flower.json | 6 +++ .../block/plants/red_double_flower_top.json | 6 +++ .../block/plants/white_double_flower.json | 6 +++ .../block/plants/white_double_flower_top.json | 6 +++ .../block/plants/yellow_double_flower.json | 6 +++ .../plants/yellow_double_flower_top.json | 6 +++ .../botania/models/block/shapes/crate.json | 12 +++++ 70 files changed, 414 insertions(+), 114 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/black_double_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/blue_double_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/brown_double_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/cyan_double_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/doubleflower1.json delete mode 100644 src/main/resources/assets/botania/blockstates/doubleflower2.json create mode 100644 src/main/resources/assets/botania/blockstates/gray_double_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/green_double_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/light_blue_double_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/light_gray_double_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/lime_double_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/magenta_double_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/orange_double_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/pink_double_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/purple_double_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/red_double_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/white_double_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/yellow_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/crafty_crate.json create mode 100644 src/main/resources/assets/botania/models/block/crafty_crate_1_1.json create mode 100644 src/main/resources/assets/botania/models/block/crafty_crate_1_2.json create mode 100644 src/main/resources/assets/botania/models/block/crafty_crate_1_3.json create mode 100644 src/main/resources/assets/botania/models/block/crafty_crate_2_1.json create mode 100644 src/main/resources/assets/botania/models/block/crafty_crate_2_2.json create mode 100644 src/main/resources/assets/botania/models/block/crafty_crate_2_3.json create mode 100644 src/main/resources/assets/botania/models/block/crafty_crate_3_1.json create mode 100644 src/main/resources/assets/botania/models/block/crafty_crate_3_2.json create mode 100644 src/main/resources/assets/botania/models/block/crafty_crate_donut.json delete mode 100644 src/main/resources/assets/botania/models/block/crate.json create mode 100644 src/main/resources/assets/botania/models/block/open_crate.json create mode 100644 src/main/resources/assets/botania/models/block/plants/black_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/black_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/plants/blue_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/blue_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/plants/brown_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/brown_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/plants/cyan_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/cyan_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/plants/gray_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/gray_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/plants/green_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/green_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/plants/light_blue_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/light_blue_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/plants/light_gray_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/light_gray_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/plants/lime_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/lime_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/plants/magenta_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/magenta_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/plants/orange_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/orange_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/plants/pink_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/pink_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/plants/purple_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/purple_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/plants/red_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/red_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/plants/white_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/white_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/plants/yellow_double_flower.json create mode 100644 src/main/resources/assets/botania/models/block/plants/yellow_double_flower_top.json create mode 100644 src/main/resources/assets/botania/models/block/shapes/crate.json 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 8aaf1fbba..f68db1198 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -135,8 +135,6 @@ public final class ModelHandler { RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, renderManager -> new RenderSprite<>(renderManager, ModItems.vineBall, Minecraft.getInstance().getItemRenderer())); RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSprite<>(renderManager, ModItems.enderAirBottle, Minecraft.getInstance().getItemRenderer())); - ShaderHelper.initShaders(); - IMultiblockRenderHook.renderHooks.put(ModBlocks.manaPylon, renderTilePylon); IMultiblockRenderHook.renderHooks.put(ModBlocks.naturaPylon, renderTilePylon); IMultiblockRenderHook.renderHooks.put(ModBlocks.gaiaPylon, renderTilePylon); diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index 0f22034c1..5154c3f73 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -14,7 +14,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.resources.IResourceManager; import net.minecraft.resources.SimpleReloadableResourceManager; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.ModList; import org.lwjgl.opengl.ARBFragmentShader; import org.lwjgl.opengl.ARBShaderObjects; @@ -25,6 +27,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.lib.LibMisc; import java.io.BufferedReader; import java.io.InputStream; @@ -73,26 +76,26 @@ public final class ShaderHelper { deleteShader(categoryButton); categoryButton = 0; deleteShader(alpha); alpha = 0; - loadShaders(); + loadShaders(manager); }); } } - private static void loadShaders() { + private static void loadShaders(IResourceManager manager) { if(!useShaders()) return; - pylonGlow = createProgram(null, LibResources.SHADER_PYLON_GLOW_FRAG); - enchanterRune = createProgram(null, LibResources.SHADER_ENCHANTER_RUNE_FRAG); - manaPool = createProgram(null, LibResources.SHADER_MANA_POOL_FRAG); - doppleganger = createProgram(LibResources.SHADER_DOPLLEGANGER_VERT, LibResources.SHADER_DOPLLEGANGER_FRAG); - halo = createProgram(null, LibResources.SHADER_HALO_FRAG); - dopplegangerBar = createProgram(null, LibResources.SHADER_DOPLLEGANGER_BAR_FRAG); - terraPlateRune = createProgram(null, LibResources.SHADER_TERRA_PLATE_RUNE_FRAG); - filmGrain = createProgram(null, LibResources.SHADER_FILM_GRAIN_FRAG); - gold = createProgram(null, LibResources.SHADER_GOLD_FRAG); - categoryButton = createProgram(null, LibResources.SHADER_CATEGORY_BUTTON_FRAG); - alpha = createProgram(LibResources.SHADER_ALPHA_VERT, LibResources.SHADER_ALPHA_FRAG); + pylonGlow = createProgram(manager, null, LibResources.SHADER_PYLON_GLOW_FRAG); + enchanterRune = createProgram(manager, null, LibResources.SHADER_ENCHANTER_RUNE_FRAG); + manaPool = createProgram(manager, null, LibResources.SHADER_MANA_POOL_FRAG); + doppleganger = createProgram(manager, LibResources.SHADER_DOPLLEGANGER_VERT, LibResources.SHADER_DOPLLEGANGER_FRAG); + halo = createProgram(manager, null, LibResources.SHADER_HALO_FRAG); + dopplegangerBar = createProgram(manager, null, LibResources.SHADER_DOPLLEGANGER_BAR_FRAG); + terraPlateRune = createProgram(manager, null, LibResources.SHADER_TERRA_PLATE_RUNE_FRAG); + filmGrain = createProgram(manager, null, LibResources.SHADER_FILM_GRAIN_FRAG); + gold = createProgram(manager, null, LibResources.SHADER_GOLD_FRAG); + categoryButton = createProgram(manager, null, LibResources.SHADER_CATEGORY_BUTTON_FRAG); + alpha = createProgram(manager, LibResources.SHADER_ALPHA_VERT, LibResources.SHADER_ALPHA_FRAG); } public static void useShader(int shader, ShaderCallback callback) { @@ -139,12 +142,12 @@ public final class ShaderHelper { // Most of the code taken from the LWJGL wiki // http://lwjgl.org/wiki/index.php?title=GLSL_Shaders_with_LWJGL - private static int createProgram(String vert, String frag) { + private static int createProgram(IResourceManager manager, String vert, String frag) { int vertId = 0, fragId = 0, program; if(vert != null) - vertId = createShader(vert, VERT); + vertId = createShader(manager, vert, VERT); if(frag != null) - fragId = createShader(frag, FRAG); + fragId = createShader(manager, frag, FRAG); program = ARBShaderObjects.glCreateProgramObjectARB(); if(program == 0) @@ -170,7 +173,7 @@ public final class ShaderHelper { return program; } - private static int createShader(String filename, int shaderType){ + private static int createShader(IResourceManager manager, String filename, int shaderType){ int shader = 0; try { shader = ARBShaderObjects.glCreateShaderObjectARB(shaderType); @@ -178,7 +181,7 @@ public final class ShaderHelper { if(shader == 0) return 0; - ARBShaderObjects.glShaderSourceARB(shader, readFileAsString(filename)); + ARBShaderObjects.glShaderSourceARB(shader, readFileAsString(manager, filename)); ARBShaderObjects.glCompileShaderARB(shader); if (ARBShaderObjects.glGetObjectParameteriARB(shader, ARBShaderObjects.GL_OBJECT_COMPILE_STATUS_ARB) == GL11.GL_FALSE) @@ -197,11 +200,8 @@ public final class ShaderHelper { return ARBShaderObjects.glGetInfoLogARB(obj, ARBShaderObjects.glGetObjectParameteriARB(obj, ARBShaderObjects.GL_OBJECT_INFO_LOG_LENGTH_ARB)); } - private static String readFileAsString(String filename) throws Exception { - InputStream in = ShaderHelper.class.getResourceAsStream(filename); - - if(in == null) - return ""; + private static String readFileAsString(IResourceManager manager, String filename) throws Exception { + InputStream in = manager.getResource(new ResourceLocation(LibMisc.MOD_ID, filename)).getInputStream(); try (BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8"))) { return reader.lines().collect(Collectors.joining("\n")); 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 115950af3..cb51fe64d 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -174,6 +174,7 @@ public class ClientProxy implements IProxy { private void loadComplete(FMLLoadCompleteEvent event) { DeferredWorkQueue.runLater(() -> { + ShaderHelper.initShaders(); initAuxiliaryRender(); ColorHandler.init(); }); diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index cb0e70d97..20c76c719 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -17,7 +17,7 @@ public final class LibResources { public static final String PREFIX_MOD = LibMisc.MOD_ID + ":"; public static final String PREFIX_LANG = "/assets/botania/lang/"; - public static final String PREFIX_SHADER = "/assets/botania/shader/"; + public static final String PREFIX_SHADER = "shader/"; public static final String PREFIX_GUI = PREFIX_MOD + "textures/gui/"; public static final String PREFIX_ENTRIES = PREFIX_GUI + "entries/"; diff --git a/src/main/resources/assets/botania/blockstates/black_double_flower.json b/src/main/resources/assets/botania/blockstates/black_double_flower.json new file mode 100644 index 000000000..f2980ca9e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/black_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/black_double_flower" }, + "half=upper": { "model": "botania:block/plants/black_double_flower_top" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/blue_double_flower.json b/src/main/resources/assets/botania/blockstates/blue_double_flower.json new file mode 100644 index 000000000..349004995 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/blue_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/blue_double_flower" }, + "half=upper": { "model": "botania:block/plants/blue_double_flower_top" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/brown_double_flower.json b/src/main/resources/assets/botania/blockstates/brown_double_flower.json new file mode 100644 index 000000000..16cbc4428 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/brown_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/brown_double_flower" }, + "half=upper": { "model": "botania:block/plants/brown_double_flower_top" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/crafty_crate.json b/src/main/resources/assets/botania/blockstates/crafty_crate.json index c5f9739d9..432db7c20 100644 --- a/src/main/resources/assets/botania/blockstates/crafty_crate.json +++ b/src/main/resources/assets/botania/blockstates/crafty_crate.json @@ -1,21 +1,14 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:block/crate", - "textures": { "bottom": "botania:blocks/crate_crafty_bottom", "side": "botania:blocks/crate_crafty", "particle": "botania:blocks/crate_crafty" } - }, "variants": { - "pattern": { - "none": {}, - "crafty_1_1": { "textures": { "side": "botania:blocks/crate_crafty_pattern_0" } }, - "crafty_2_2": { "textures": { "side": "botania:blocks/crate_crafty_pattern_1" } }, - "crafty_1_2": { "textures": { "side": "botania:blocks/crate_crafty_pattern_2" } }, - "crafty_2_1": { "textures": { "side": "botania:blocks/crate_crafty_pattern_3" } }, - "crafty_1_3": { "textures": { "side": "botania:blocks/crate_crafty_pattern_4" } }, - "crafty_3_1": { "textures": { "side": "botania:blocks/crate_crafty_pattern_5" } }, - "crafty_2_3": { "textures": { "side": "botania:blocks/crate_crafty_pattern_6" } }, - "crafty_3_2": { "textures": { "side": "botania:blocks/crate_crafty_pattern_7" } }, - "crafty_donut": { "textures": { "side": "botania:blocks/crate_crafty_pattern_8" } } - } + "pattern=none": { "model": "botania:block/crafty_crate" }, + "pattern=crafty_1_1": { "model": "botania:block/crafty_crate_1_1" }, + "pattern=crafty_2_2": { "model": "botania:block/crafty_crate_2_2" }, + "pattern=crafty_1_2": { "model": "botania:block/crafty_crate_1_2" }, + "pattern=crafty_2_1": { "model": "botania:block/crafty_crate_2_1" }, + "pattern=crafty_1_3": { "model": "botania:block/crafty_crate_1_3" }, + "pattern=crafty_3_1": { "model": "botania:block/crafty_crate_3_1" }, + "pattern=crafty_2_3": { "model": "botania:block/crafty_crate_2_3" }, + "pattern=crafty_3_2": { "model": "botania:block/crafty_crate_3_2" }, + "pattern=crafty_donut": { "model": "botania:block/crafty_crate_donut" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/cyan_double_flower.json b/src/main/resources/assets/botania/blockstates/cyan_double_flower.json new file mode 100644 index 000000000..30f215b13 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/cyan_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/cyan_double_flower" }, + "half=upper": { "model": "botania:block/plants/cyan_double_flower_top" } + } +} \ 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 deleted file mode 100644 index 42f5e68ee..000000000 --- a/src/main/resources/assets/botania/blockstates/doubleflower1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cross" - }, - "variants": { - "df_variant=white,half=lower": [{ "textures": { "cross": "botania:blocks/flower0tall0" } }], - "df_variant=white,half=upper": [{ "textures": { "cross": "botania:blocks/flower0tall1" } }], - "df_variant=orange,half=lower": [{ "textures": { "cross": "botania:blocks/flower1tall0" } }], - "df_variant=orange,half=upper": [{ "textures": { "cross": "botania:blocks/flower1tall1" } }], - "df_variant=magenta,half=lower": [{ "textures": { "cross": "botania:blocks/flower2tall0" } }], - "df_variant=magenta,half=upper": [{ "textures": { "cross": "botania:blocks/flower2tall1" } }], - "df_variant=light_blue,half=lower": [{ "textures": { "cross": "botania:blocks/flower3tall0" } }], - "df_variant=light_blue,half=upper": [{ "textures": { "cross": "botania:blocks/flower3tall1" } }], - "df_variant=yellow,half=lower": [{ "textures": { "cross": "botania:blocks/flower4tall0" } }], - "df_variant=yellow,half=upper": [{ "textures": { "cross": "botania:blocks/flower4tall1" } }], - "df_variant=lime,half=lower": [{ "textures": { "cross": "botania:blocks/flower5tall0" } }], - "df_variant=lime,half=upper": [{ "textures": { "cross": "botania:blocks/flower5tall1" } }], - "df_variant=pink,half=lower": [{ "textures": { "cross": "botania:blocks/flower6tall0" } }], - "df_variant=pink,half=upper": [{ "textures": { "cross": "botania:blocks/flower6tall1" } }], - "df_variant=gray,half=lower": [{ "textures": { "cross": "botania:blocks/flower7tall0" } }], - "df_variant=gray,half=upper": [{ "textures": { "cross": "botania:blocks/flower7tall1" } }] - } -} \ 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 deleted file mode 100644 index 65ed8f92a..000000000 --- a/src/main/resources/assets/botania/blockstates/doubleflower2.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cross" - }, - "variants": { - "df_variant=silver,half=lower": [{ "textures": { "cross": "botania:blocks/flower8tall0" } }], - "df_variant=silver,half=upper": [{ "textures": { "cross": "botania:blocks/flower8tall1" } }], - "df_variant=cyan,half=lower": [{ "textures": { "cross": "botania:blocks/flower9tall0" } }], - "df_variant=cyan,half=upper": [{ "textures": { "cross": "botania:blocks/flower9tall1" } }], - "df_variant=purple,half=lower": [{ "textures": { "cross": "botania:blocks/flower10tall0" } }], - "df_variant=purple,half=upper": [{ "textures": { "cross": "botania:blocks/flower10tall1" } }], - "df_variant=blue,half=lower": [{ "textures": { "cross": "botania:blocks/flower11tall0" } }], - "df_variant=blue,half=upper": [{ "textures": { "cross": "botania:blocks/flower11tall1" } }], - "df_variant=brown,half=lower": [{ "textures": { "cross": "botania:blocks/flower12tall0" } }], - "df_variant=brown,half=upper": [{ "textures": { "cross": "botania:blocks/flower12tall1" } }], - "df_variant=green,half=lower": [{ "textures": { "cross": "botania:blocks/flower13tall0" } }], - "df_variant=green,half=upper": [{ "textures": { "cross": "botania:blocks/flower13tall1" } }], - "df_variant=red,half=lower": [{ "textures": { "cross": "botania:blocks/flower14tall0" } }], - "df_variant=red,half=upper": [{ "textures": { "cross": "botania:blocks/flower14tall1" } }], - "df_variant=black,half=lower": [{ "textures": { "cross": "botania:blocks/flower15tall0" } }], - "df_variant=black,half=upper": [{ "textures": { "cross": "botania:blocks/flower15tall1" } }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/gray_double_flower.json b/src/main/resources/assets/botania/blockstates/gray_double_flower.json new file mode 100644 index 000000000..77b9863b0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/gray_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/gray_double_flower" }, + "half=upper": { "model": "botania:block/plants/gray_double_flower_top" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/green_double_flower.json b/src/main/resources/assets/botania/blockstates/green_double_flower.json new file mode 100644 index 000000000..df86e10b8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/green_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/green_double_flower" }, + "half=upper": { "model": "botania:block/plants/green_double_flower_top" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/light_blue_double_flower.json b/src/main/resources/assets/botania/blockstates/light_blue_double_flower.json new file mode 100644 index 000000000..0d1c8906f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/light_blue_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/light_blue_double_flower" }, + "half=upper": { "model": "botania:block/plants/light_blue_double_flower_top" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/light_gray_double_flower.json b/src/main/resources/assets/botania/blockstates/light_gray_double_flower.json new file mode 100644 index 000000000..5d922fba5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/light_gray_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/light_gray_double_flower" }, + "half=upper": { "model": "botania:block/plants/light_gray_double_flower_top" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/lime_double_flower.json b/src/main/resources/assets/botania/blockstates/lime_double_flower.json new file mode 100644 index 000000000..5fe712225 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/lime_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/lime_double_flower" }, + "half=upper": { "model": "botania:block/plants/lime_double_flower_top" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/magenta_double_flower.json b/src/main/resources/assets/botania/blockstates/magenta_double_flower.json new file mode 100644 index 000000000..8b8c84b8e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/magenta_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/magenta_double_flower" }, + "half=upper": { "model": "botania:block/plants/magenta_double_flower_top" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/open_crate.json b/src/main/resources/assets/botania/blockstates/open_crate.json index b14fc6acb..f33f58039 100644 --- a/src/main/resources/assets/botania/blockstates/open_crate.json +++ b/src/main/resources/assets/botania/blockstates/open_crate.json @@ -1,10 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:block/crate", - "textures": { "bottom": "botania:blocks/crate_open_bottom", "side": "botania:blocks/crate_open", "particle": "botania:blocks/crate_open" } - }, "variants": { - "": [{}] + "": { "model": "botania:block/open_crate" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/orange_double_flower.json b/src/main/resources/assets/botania/blockstates/orange_double_flower.json new file mode 100644 index 000000000..ba4ffca73 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/orange_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/orange_double_flower" }, + "half=upper": { "model": "botania:block/plants/orange_double_flower_top" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pink_double_flower.json b/src/main/resources/assets/botania/blockstates/pink_double_flower.json new file mode 100644 index 000000000..ee44292c0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pink_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/pink_double_flower" }, + "half=upper": { "model": "botania:block/plants/pink_double_flower_top" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/purple_double_flower.json b/src/main/resources/assets/botania/blockstates/purple_double_flower.json new file mode 100644 index 000000000..c2c0a7799 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/purple_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/purple_double_flower" }, + "half=upper": { "model": "botania:block/plants/purple_double_flower_top" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/red_double_flower.json b/src/main/resources/assets/botania/blockstates/red_double_flower.json new file mode 100644 index 000000000..85eef2063 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/red_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/red_double_flower" }, + "half=upper": { "model": "botania:block/plants/red_double_flower_top" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/teru_teru_bozu.json b/src/main/resources/assets/botania/blockstates/teru_teru_bozu.json index f5ec19d15..6041f7482 100644 --- a/src/main/resources/assets/botania/blockstates/teru_teru_bozu.json +++ b/src/main/resources/assets/botania/blockstates/teru_teru_bozu.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:teru_teru_bozu" } + "": { "model": "botania:block/teru_teru_bozu" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/white_double_flower.json b/src/main/resources/assets/botania/blockstates/white_double_flower.json new file mode 100644 index 000000000..fc1a42ab5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/white_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/white_double_flower" }, + "half=upper": { "model": "botania:block/plants/white_double_flower_top" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/yellow_double_flower.json b/src/main/resources/assets/botania/blockstates/yellow_double_flower.json new file mode 100644 index 000000000..68f4c5cc2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/yellow_double_flower.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "botania:block/plants/yellow_double_flower" }, + "half=upper": { "model": "botania:block/plants/yellow_double_flower_top" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crafty_crate.json b/src/main/resources/assets/botania/models/block/crafty_crate.json new file mode 100644 index 000000000..d7bf7a4af --- /dev/null +++ b/src/main/resources/assets/botania/models/block/crafty_crate.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:blocks/crate_crafty_bottom", + "side": "botania:blocks/crate_crafty" + } +} diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_1_1.json b/src/main/resources/assets/botania/models/block/crafty_crate_1_1.json new file mode 100644 index 000000000..1c7c32939 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/crafty_crate_1_1.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:blocks/crate_crafty_bottom", + "side": "botania:blocks/crate_crafty_pattern_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_1_2.json b/src/main/resources/assets/botania/models/block/crafty_crate_1_2.json new file mode 100644 index 000000000..789b371d9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/crafty_crate_1_2.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:blocks/crate_crafty_bottom", + "side": "botania:blocks/crate_crafty_pattern_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_1_3.json b/src/main/resources/assets/botania/models/block/crafty_crate_1_3.json new file mode 100644 index 000000000..bccbb3f8c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/crafty_crate_1_3.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:blocks/crate_crafty_bottom", + "side": "botania:blocks/crate_crafty_pattern_4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_2_1.json b/src/main/resources/assets/botania/models/block/crafty_crate_2_1.json new file mode 100644 index 000000000..4d6d75c9e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/crafty_crate_2_1.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:blocks/crate_crafty_bottom", + "side": "botania:blocks/crate_crafty_pattern_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_2_2.json b/src/main/resources/assets/botania/models/block/crafty_crate_2_2.json new file mode 100644 index 000000000..4ae5d671a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/crafty_crate_2_2.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:blocks/crate_crafty_bottom", + "side": "botania:blocks/crate_crafty_pattern_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_2_3.json b/src/main/resources/assets/botania/models/block/crafty_crate_2_3.json new file mode 100644 index 000000000..941946d11 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/crafty_crate_2_3.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:blocks/crate_crafty_bottom", + "side": "botania:blocks/crate_crafty_pattern_6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_3_1.json b/src/main/resources/assets/botania/models/block/crafty_crate_3_1.json new file mode 100644 index 000000000..3fe1a25df --- /dev/null +++ b/src/main/resources/assets/botania/models/block/crafty_crate_3_1.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:blocks/crate_crafty_bottom", + "side": "botania:blocks/crate_crafty_pattern_5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_3_2.json b/src/main/resources/assets/botania/models/block/crafty_crate_3_2.json new file mode 100644 index 000000000..9c56a378f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/crafty_crate_3_2.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:blocks/crate_crafty_bottom", + "side": "botania:blocks/crate_crafty_pattern_7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crafty_crate_donut.json b/src/main/resources/assets/botania/models/block/crafty_crate_donut.json new file mode 100644 index 000000000..fd342ddb3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/crafty_crate_donut.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:blocks/crate_crafty_bottom", + "side": "botania:blocks/crate_crafty_pattern_8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crate.json b/src/main/resources/assets/botania/models/block/crate.json deleted file mode 100644 index 880b2cf21..000000000 --- a/src/main/resources/assets/botania/models/block/crate.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "parent": "minecraft:block/block", - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down" }, - "up": { "texture": "#side", "cullface": "up" }, - "north": { "texture": "#side", "cullface": "north" }, - "south": { "texture": "#side", "cullface": "south" }, - "west": { "texture": "#side", "cullface": "west" }, - "east": { "texture": "#side", "cullface": "east" } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/open_crate.json b/src/main/resources/assets/botania/models/block/open_crate.json new file mode 100644 index 000000000..c267dd882 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/open_crate.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/crate", + "textures": { + "bottom": "botania:blocks/crate_open_bottom", + "side": "botania:blocks/crate_open" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/black_double_flower.json b/src/main/resources/assets/botania/models/block/plants/black_double_flower.json new file mode 100644 index 000000000..1a9187d5f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/black_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower15tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/black_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/black_double_flower_top.json new file mode 100644 index 000000000..9f9c3b268 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/black_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower15tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/blue_double_flower.json b/src/main/resources/assets/botania/models/block/plants/blue_double_flower.json new file mode 100644 index 000000000..33e28dfa8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/blue_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower11tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/blue_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/blue_double_flower_top.json new file mode 100644 index 000000000..c6531ae88 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/blue_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower11tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/brown_double_flower.json b/src/main/resources/assets/botania/models/block/plants/brown_double_flower.json new file mode 100644 index 000000000..5d7066912 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/brown_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower12tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/brown_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/brown_double_flower_top.json new file mode 100644 index 000000000..16f4eef17 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/brown_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower12tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/cyan_double_flower.json b/src/main/resources/assets/botania/models/block/plants/cyan_double_flower.json new file mode 100644 index 000000000..7dc85c8a4 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/cyan_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower9tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/cyan_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/cyan_double_flower_top.json new file mode 100644 index 000000000..3de05bfec --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/cyan_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower9tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/gray_double_flower.json b/src/main/resources/assets/botania/models/block/plants/gray_double_flower.json new file mode 100644 index 000000000..9c179b88b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/gray_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower7tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/gray_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/gray_double_flower_top.json new file mode 100644 index 000000000..7d974573f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/gray_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower7tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/green_double_flower.json b/src/main/resources/assets/botania/models/block/plants/green_double_flower.json new file mode 100644 index 000000000..237a509d9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/green_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower13tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/green_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/green_double_flower_top.json new file mode 100644 index 000000000..1e866a4ef --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/green_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower13tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/light_blue_double_flower.json b/src/main/resources/assets/botania/models/block/plants/light_blue_double_flower.json new file mode 100644 index 000000000..24ca6566b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/light_blue_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower3tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/light_blue_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/light_blue_double_flower_top.json new file mode 100644 index 000000000..f7be3ebcb --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/light_blue_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower3tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/light_gray_double_flower.json b/src/main/resources/assets/botania/models/block/plants/light_gray_double_flower.json new file mode 100644 index 000000000..2a93d5c84 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/light_gray_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower8tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/light_gray_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/light_gray_double_flower_top.json new file mode 100644 index 000000000..fc82c10d5 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/light_gray_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower8tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/lime_double_flower.json b/src/main/resources/assets/botania/models/block/plants/lime_double_flower.json new file mode 100644 index 000000000..c5bc24f9d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/lime_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower5tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/lime_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/lime_double_flower_top.json new file mode 100644 index 000000000..482f4e25c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/lime_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower5tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/magenta_double_flower.json b/src/main/resources/assets/botania/models/block/plants/magenta_double_flower.json new file mode 100644 index 000000000..fe1994c2e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/magenta_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower2tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/magenta_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/magenta_double_flower_top.json new file mode 100644 index 000000000..5760a2c5a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/magenta_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower2tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/orange_double_flower.json b/src/main/resources/assets/botania/models/block/plants/orange_double_flower.json new file mode 100644 index 000000000..53bf9d138 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/orange_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower1tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/orange_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/orange_double_flower_top.json new file mode 100644 index 000000000..7d8f92f50 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/orange_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower1tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/pink_double_flower.json b/src/main/resources/assets/botania/models/block/plants/pink_double_flower.json new file mode 100644 index 000000000..14c7433cd --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/pink_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower6tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/pink_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/pink_double_flower_top.json new file mode 100644 index 000000000..b91d16238 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/pink_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower6tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/purple_double_flower.json b/src/main/resources/assets/botania/models/block/plants/purple_double_flower.json new file mode 100644 index 000000000..d7cd94902 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/purple_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower10tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/purple_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/purple_double_flower_top.json new file mode 100644 index 000000000..3feae4712 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/purple_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower10tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/red_double_flower.json b/src/main/resources/assets/botania/models/block/plants/red_double_flower.json new file mode 100644 index 000000000..8d314178f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/red_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower14tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/red_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/red_double_flower_top.json new file mode 100644 index 000000000..a065bc030 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/red_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower14tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/white_double_flower.json b/src/main/resources/assets/botania/models/block/plants/white_double_flower.json new file mode 100644 index 000000000..482e7ed2c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/white_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower0tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/white_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/white_double_flower_top.json new file mode 100644 index 000000000..bc37d36e0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/white_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower0tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/yellow_double_flower.json b/src/main/resources/assets/botania/models/block/plants/yellow_double_flower.json new file mode 100644 index 000000000..f29871c13 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/yellow_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower4tall0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/yellow_double_flower_top.json b/src/main/resources/assets/botania/models/block/plants/yellow_double_flower_top.json new file mode 100644 index 000000000..18ea8c63c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plants/yellow_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower4tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/shapes/crate.json b/src/main/resources/assets/botania/models/block/shapes/crate.json new file mode 100644 index 000000000..cec3ea3d6 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/shapes/crate.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "#bottom", + "up": "#side", + "north": "#side", + "south": "#side", + "west": "#side", + "east": "#side", + "particle": "#side" + } +} \ No newline at end of file