From 01a913c96cedb28321ca3a25b409fce68721d031 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 17:49:00 -0500 Subject: [PATCH] More model cleanup --- .../client/core/handler/ModelHandler.java | 4 ++-- .../assets/botania/blockstates/forestDrum.json | 13 +++---------- .../botania/blockstates/lightLauncher.json | 17 ++--------------- .../assets/botania/blockstates/starfield.json | 17 ++--------------- .../botania/models/block/drum_canopy.json | 7 +++++++ .../botania/models/block/drum_gathering.json | 7 +++++++ .../assets/botania/models/block/drum_wild.json | 7 +++++++ .../models/block/luminizer_launcher.json | 8 ++++++++ .../botania/models/block/{ => shapes}/drum.json | 1 + .../four_high_bottom_top.json} | 1 + .../botania/models/block/starfield_creator.json | 8 ++++++++ .../models/item/itemblock/drum_canopy.json | 3 +++ .../models/item/itemblock/drum_gathering.json | 3 +++ .../models/item/itemblock/drum_wild.json | 3 +++ .../item/itemblock/luminizer_launcher.json | 3 +++ .../item/itemblock/starfield_creator.json | 3 +++ 16 files changed, 63 insertions(+), 42 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/drum_canopy.json create mode 100644 src/main/resources/assets/botania/models/block/drum_gathering.json create mode 100644 src/main/resources/assets/botania/models/block/drum_wild.json create mode 100644 src/main/resources/assets/botania/models/block/luminizer_launcher.json rename src/main/resources/assets/botania/models/block/{ => shapes}/drum.json (93%) rename src/main/resources/assets/botania/models/block/{fourhigh.json => shapes/four_high_bottom_top.json} (94%) create mode 100644 src/main/resources/assets/botania/models/block/starfield_creator.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/drum_wild.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/starfield_creator.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 3513d18f9..90392f52b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -304,7 +304,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.forestEye); registerItemModel(ModBlocks.ghostRail); registerItemModel(ModBlocks.incensePlate); - registerItemModel(ModBlocks.lightLauncher); + registerBlock(ModBlocks.lightLauncher, "luminizer_launcher"); registerItemModel(ModBlocks.manaBomb); registerItemModel(ModBlocks.manaDetector); registerItemModel(ModBlocks.manaGlass); @@ -326,7 +326,7 @@ public final class ModelHandler { registerBlock(ModBlocks.sparkChanger, "spark_tinkerer"); registerBlock(ModBlocks.spawnerClaw, "life_imbuer"); registerItemModel(ModBlocks.specialFlower); - registerItemModel(ModBlocks.starfield); + registerBlock(ModBlocks.starfield, "starfield_creator"); registerBlock(ModBlocks.terraPlate, "terra_plate"); registerItemModel(ModBlocks.tinyPlanet); registerItemModel(ModBlocks.tinyPotato); diff --git a/src/main/resources/assets/botania/blockstates/forestDrum.json b/src/main/resources/assets/botania/blockstates/forestDrum.json index 41c22e65e..a7f73aba4 100644 --- a/src/main/resources/assets/botania/blockstates/forestDrum.json +++ b/src/main/resources/assets/botania/blockstates/forestDrum.json @@ -1,14 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:drum", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "wild": { "textures": { "top": "botania:blocks/forestDrum0", "side": "botania:blocks/forestDrum1" } }, - "gathering": { "textures": { "top": "botania:blocks/forestDrum2", "side": "botania:blocks/forestDrum3" } }, - "canopy": { "textures": { "top": "botania:blocks/forestDrum4", "side": "botania:blocks/forestDrum5" } } - } + "variant=wild": { "model": "botania:drum_wild" }, + "variant=gathering": { "model": "botania:drum_gathering" }, + "variant=canopy": { "model": "botania:drum_canopy" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/lightLauncher.json b/src/main/resources/assets/botania/blockstates/lightLauncher.json index 96cde7753..bd135fbef 100644 --- a/src/main/resources/assets/botania/blockstates/lightLauncher.json +++ b/src/main/resources/assets/botania/blockstates/lightLauncher.json @@ -1,19 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:fourhigh", - "textures": { - "bottom": "botania:blocks/lightLauncher", - "top": "botania:blocks/lightLauncher", - "side": "botania:blocks/lightLauncher" - }, - "transform": "forge:default-block" - }, "variants": { - "powered": { - "true": {}, - "false": {} - }, - "inventory": [{}] + "powered=true": { "model": "botania:luminizer_launcher" }, + "powered=false": { "model": "botania:luminizer_launcher" } } } \ 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 index ffec0652f..998b2c14e 100644 --- a/src/main/resources/assets/botania/blockstates/starfield.json +++ b/src/main/resources/assets/botania/blockstates/starfield.json @@ -1,19 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:fourhigh", - "textures": { - "bottom": "botania:blocks/starfield0", - "top": "botania:blocks/starfield1", - "side": "botania:blocks/starfield2" - }, - "transform": "forge:default-block" - }, "variants": { - "powered": { - "true": {}, - "false": {} - }, - "inventory": [{}] + "powered=true": { "model": "botania:starfield_creator" }, + "powered=false": { "model": "botania:starfield_creator" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_canopy.json b/src/main/resources/assets/botania/models/block/drum_canopy.json new file mode 100644 index 000000000..24d215ac8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/drum_canopy.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/drum", + "textures": { + "top": "botania:blocks/forestDrum4", + "side": "botania:blocks/forestDrum5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_gathering.json b/src/main/resources/assets/botania/models/block/drum_gathering.json new file mode 100644 index 000000000..59c45b760 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/drum_gathering.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/drum", + "textures": { + "top": "botania:blocks/forestDrum2", + "side": "botania:blocks/forestDrum3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_wild.json b/src/main/resources/assets/botania/models/block/drum_wild.json new file mode 100644 index 000000000..14f676eb8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/drum_wild.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/drum", + "textures": { + "top": "botania:blocks/forestDrum0", + "side": "botania:blocks/forestDrum1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/luminizer_launcher.json b/src/main/resources/assets/botania/models/block/luminizer_launcher.json new file mode 100644 index 000000000..9d87e408b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/luminizer_launcher.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/four_high_bottom_top", + "textures": { + "bottom": "botania:blocks/lightLauncher", + "top": "botania:blocks/lightLauncher", + "side": "botania:blocks/lightLauncher" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum.json b/src/main/resources/assets/botania/models/block/shapes/drum.json similarity index 93% rename from src/main/resources/assets/botania/models/block/drum.json rename to src/main/resources/assets/botania/models/block/shapes/drum.json index f7c0d0dae..7968b80e7 100644 --- a/src/main/resources/assets/botania/models/block/drum.json +++ b/src/main/resources/assets/botania/models/block/shapes/drum.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#side" }, diff --git a/src/main/resources/assets/botania/models/block/fourhigh.json b/src/main/resources/assets/botania/models/block/shapes/four_high_bottom_top.json similarity index 94% rename from src/main/resources/assets/botania/models/block/fourhigh.json rename to src/main/resources/assets/botania/models/block/shapes/four_high_bottom_top.json index 3e9cc996a..8344c3415 100644 --- a/src/main/resources/assets/botania/models/block/fourhigh.json +++ b/src/main/resources/assets/botania/models/block/shapes/four_high_bottom_top.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#side" }, diff --git a/src/main/resources/assets/botania/models/block/starfield_creator.json b/src/main/resources/assets/botania/models/block/starfield_creator.json new file mode 100644 index 000000000..f2e797e20 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/starfield_creator.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/four_high_bottom_top", + "textures": { + "bottom": "botania:blocks/starfield0", + "top": "botania:blocks/starfield1", + "side": "botania:blocks/starfield2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json b/src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json new file mode 100644 index 000000000..58385e894 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/drum_canopy" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json b/src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json new file mode 100644 index 000000000..b18a74edb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/drum_gathering" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/drum_wild.json b/src/main/resources/assets/botania/models/item/itemblock/drum_wild.json new file mode 100644 index 000000000..3ec534da6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/drum_wild.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/drum_wild" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json b/src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json new file mode 100644 index 000000000..fc2612afc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/luminizer_launcher" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/starfield_creator.json b/src/main/resources/assets/botania/models/item/itemblock/starfield_creator.json new file mode 100644 index 000000000..64ac9b949 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/starfield_creator.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/starfield_creator" +} \ No newline at end of file