From 233bc705b03f7a8dc281f79c4127e33409be4ce4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 16:39:05 -0500 Subject: [PATCH] More model cleanup --- .../client/core/handler/ModelHandler.java | 4 +-- .../assets/botania/blockstates/openCrate.json | 25 +++++++++---------- .../assets/botania/blockstates/runeAltar.json | 16 +++--------- .../botania/blockstates/spawnerClaw.json | 12 +++------ .../models/block/cube_bottom_other.json | 12 --------- .../botania/models/block/life_imbuer.json | 6 +++++ .../botania/models/block/runic_altar.json | 8 ++++++ .../models/block/{ => shapes}/claw.json | 0 .../botania/models/block/shapes/note.txt | 2 ++ .../twelve_high_bottom_top.json} | 3 ++- .../models/item/itemblock/life_imbuer.json | 3 +++ .../models/item/itemblock/runic_altar.json | 3 +++ 12 files changed, 44 insertions(+), 50 deletions(-) delete mode 100644 src/main/resources/assets/botania/models/block/cube_bottom_other.json create mode 100644 src/main/resources/assets/botania/models/block/life_imbuer.json create mode 100644 src/main/resources/assets/botania/models/block/runic_altar.json rename src/main/resources/assets/botania/models/block/{ => shapes}/claw.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/shapes/note.txt rename src/main/resources/assets/botania/models/block/{biggerthanslab.json => shapes/twelve_high_bottom_top.json} (91%) create mode 100644 src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/runic_altar.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 adb5e268c..cd2b8f128 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -318,11 +318,11 @@ public final class ModelHandler { registerItemModel(ModBlocks.redStringRelay); registerItemModel(ModBlocks.rfGenerator); registerItemModel(ModBlocks.root); - registerItemModel(ModBlocks.runeAltar); + registerBlock(ModBlocks.runeAltar, "runic_altar"); registerItemModel(ModBlocks.shimmerrock); registerItemModel(ModBlocks.shimmerwoodPlanks); registerItemModel(ModBlocks.sparkChanger); - registerItemModel(ModBlocks.spawnerClaw); + registerBlock(ModBlocks.spawnerClaw, "life_imbuer"); registerItemModel(ModBlocks.specialFlower); registerItemModel(ModBlocks.starfield); registerItemModel(ModBlocks.terraPlate); diff --git a/src/main/resources/assets/botania/blockstates/openCrate.json b/src/main/resources/assets/botania/blockstates/openCrate.json index 35e3f6aae..9cde21a91 100644 --- a/src/main/resources/assets/botania/blockstates/openCrate.json +++ b/src/main/resources/assets/botania/blockstates/openCrate.json @@ -1,26 +1,25 @@ { "forge_marker": 1, "defaults": { - "model": "botania:cube_bottom_other", + "model": "minecraft:orientable_vertical", "transform": "forge:default-block" }, "variants": { "pattern": { "none": {}, - "crafty_1_1": { "textures": { "other": "botania:blocks/ocPattern0" } }, - "crafty_2_2": { "textures": { "other": "botania:blocks/ocPattern1" } }, - "crafty_1_2": { "textures": { "other": "botania:blocks/ocPattern2" } }, - "crafty_2_1": { "textures": { "other": "botania:blocks/ocPattern3" } }, - "crafty_1_3": { "textures": { "other": "botania:blocks/ocPattern4" } }, - "crafty_3_1": { "textures": { "other": "botania:blocks/ocPattern5" } }, - "crafty_2_3": { "textures": { "other": "botania:blocks/ocPattern6" } }, - "crafty_3_2": { "textures": { "other": "botania:blocks/ocPattern7" } }, - "crafty_donut": { "textures": { "other": "botania:blocks/ocPattern8" } } + "crafty_1_1": { "textures": { "side": "botania:blocks/ocPattern0" } }, + "crafty_2_2": { "textures": { "side": "botania:blocks/ocPattern1" } }, + "crafty_1_2": { "textures": { "side": "botania:blocks/ocPattern2" } }, + "crafty_2_1": { "textures": { "side": "botania:blocks/ocPattern3" } }, + "crafty_1_3": { "textures": { "side": "botania:blocks/ocPattern4" } }, + "crafty_3_1": { "textures": { "side": "botania:blocks/ocPattern5" } }, + "crafty_2_3": { "textures": { "side": "botania:blocks/ocPattern6" } }, + "crafty_3_2": { "textures": { "side": "botania:blocks/ocPattern7" } }, + "crafty_donut": { "textures": { "side": "botania:blocks/ocPattern8" } } }, "variant": { - "open": { "textures": { "bottom": "botania:blocks/openCrate1", "other": "botania:blocks/openCrate0" } }, - "crafty": { "textures": { "bottom": "botania:blocks/openCrate3", "other": "botania:blocks/openCrate2" } } + "open": { "x": 180, "textures": { "front": "botania:blocks/openCrate1", "side": "botania:blocks/openCrate0" } }, + "crafty": { "x": 180, "textures": { "front": "botania:blocks/openCrate3", "side": "botania:blocks/openCrate2" } } } - } } \ 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 index fcff3d2dc..cc64d8632 100644 --- a/src/main/resources/assets/botania/blockstates/runeAltar.json +++ b/src/main/resources/assets/botania/blockstates/runeAltar.json @@ -1,17 +1,7 @@ { - "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" - }] + "normal": { + "model": "botania:runic_altar" + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spawnerClaw.json b/src/main/resources/assets/botania/blockstates/spawnerClaw.json index fa9ccbbb5..8c9da4cac 100644 --- a/src/main/resources/assets/botania/blockstates/spawnerClaw.json +++ b/src/main/resources/assets/botania/blockstates/spawnerClaw.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:claw", - "textures": { - "all": "botania:model/spawnerClaw" - } - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { + "model": "botania:life_imbuer" + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cube_bottom_other.json b/src/main/resources/assets/botania/models/block/cube_bottom_other.json deleted file mode 100644 index 8c2629967..000000000 --- a/src/main/resources/assets/botania/models/block/cube_bottom_other.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "down": "#bottom", - "up": "#other", - "north": "#other", - "south": "#other", - "west": "#other", - "east": "#other", - "particle": "#other" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/life_imbuer.json b/src/main/resources/assets/botania/models/block/life_imbuer.json new file mode 100644 index 000000000..83a5becdc --- /dev/null +++ b/src/main/resources/assets/botania/models/block/life_imbuer.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/claw", + "textures": { + "all": "botania:model/spawnerClaw" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/runic_altar.json b/src/main/resources/assets/botania/models/block/runic_altar.json new file mode 100644 index 000000000..bb055b11d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/runic_altar.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/twelve_high_bottom_top", + "textures": { + "top": "botania:blocks/runeAltar1", + "side": "botania:blocks/runeAltar2", + "bottom": "botania:blocks/runeAltar0" + } +} diff --git a/src/main/resources/assets/botania/models/block/claw.json b/src/main/resources/assets/botania/models/block/shapes/claw.json similarity index 100% rename from src/main/resources/assets/botania/models/block/claw.json rename to src/main/resources/assets/botania/models/block/shapes/claw.json diff --git a/src/main/resources/assets/botania/models/block/shapes/note.txt b/src/main/resources/assets/botania/models/block/shapes/note.txt new file mode 100644 index 000000000..18061f888 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/shapes/note.txt @@ -0,0 +1,2 @@ +This folder is for "abstract" models, that only define shapes and not textures. +Textured models for actual blocks goes in the root folder (one level up). \ 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/shapes/twelve_high_bottom_top.json similarity index 91% rename from src/main/resources/assets/botania/models/block/biggerthanslab.json rename to src/main/resources/assets/botania/models/block/shapes/twelve_high_bottom_top.json index 7c944c1fd..d27a32522 100644 --- a/src/main/resources/assets/botania/models/block/biggerthanslab.json +++ b/src/main/resources/assets/botania/models/block/shapes/twelve_high_bottom_top.json @@ -1,6 +1,7 @@ { + "parent": "minecraft:block/block", "textures": { - "particle": "#side" + "particle": "#top" }, "elements": [ { diff --git a/src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json b/src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json new file mode 100644 index 000000000..06e94f1b1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/life_imbuer" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/runic_altar.json b/src/main/resources/assets/botania/models/item/itemblock/runic_altar.json new file mode 100644 index 000000000..942906288 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/runic_altar.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/runic_altar" +} \ No newline at end of file