From 663d08639f1e9634cbe2a38934010ae6a12fc6a2 Mon Sep 17 00:00:00 2001 From: itsmeow Date: Mon, 16 Nov 2020 06:10:51 -0500 Subject: [PATCH] Remove junk model jsons from datagen, add tags for ghost lights and lanterns, add recipe to craft lanterns --- .../models/junk/wisp_lantern_bluehanging.json | 3 - .../junk/wisp_lantern_bluehanging2.json | 85 ------------------- .../models/junk/wisp_lantern_bluesitting.json | 3 - .../junk/wisp_lantern_bluesitting2.json | 85 ------------------- .../models/junk/wisp_lantern_bluewall.json | 3 - .../models/junk/wisp_lantern_bluewall2.json | 85 ------------------- .../junk/wisp_lantern_greenhanging.json | 3 - .../junk/wisp_lantern_greenhanging2.json | 85 ------------------- .../junk/wisp_lantern_greensitting.json | 3 - .../junk/wisp_lantern_greensitting2.json | 85 ------------------- .../models/junk/wisp_lantern_greenwall.json | 3 - .../models/junk/wisp_lantern_greenwall2.json | 85 ------------------- .../junk/wisp_lantern_orangehanging.json | 3 - .../junk/wisp_lantern_orangehanging2.json | 85 ------------------- .../junk/wisp_lantern_orangesitting.json | 3 - .../junk/wisp_lantern_orangesitting2.json | 85 ------------------- .../models/junk/wisp_lantern_orangewall.json | 3 - .../models/junk/wisp_lantern_orangewall2.json | 85 ------------------- .../junk/wisp_lantern_purplehanging.json | 3 - .../junk/wisp_lantern_purplehanging2.json | 85 ------------------- .../junk/wisp_lantern_purplesitting.json | 3 - .../junk/wisp_lantern_purplesitting2.json | 85 ------------------- .../models/junk/wisp_lantern_purplewall.json | 3 - .../models/junk/wisp_lantern_purplewall2.json | 85 ------------------- .../junk/wisp_lantern_yellowhanging.json | 3 - .../junk/wisp_lantern_yellowhanging2.json | 85 ------------------- .../junk/wisp_lantern_yellowsitting.json | 3 - .../junk/wisp_lantern_yellowsitting2.json | 85 ------------------- .../models/junk/wisp_lantern_yellowwall.json | 3 - .../models/junk/wisp_lantern_yellowwall2.json | 85 ------------------- .../whisperwoods/wisp_lantern_blue.json | 32 +++++++ .../whisperwoods/wisp_lantern_green.json | 32 +++++++ .../whisperwoods/wisp_lantern_orange.json | 32 +++++++ .../whisperwoods/wisp_lantern_purple.json | 32 +++++++ .../whisperwoods/wisp_lantern_yellow.json | 32 +++++++ .../recipes/wisp_lantern_blue.json | 19 +++++ .../recipes/wisp_lantern_green.json | 19 +++++ .../recipes/wisp_lantern_orange.json | 19 +++++ .../recipes/wisp_lantern_purple.json | 19 +++++ .../recipes/wisp_lantern_yellow.json | 19 +++++ .../whisperwoods/tags/blocks/ghost_light.json | 10 +++ .../tags/blocks/wisp_lantern.json | 10 +++ .../whisperwoods/tags/items/ghost_light.json | 10 +++ .../whisperwoods/tags/items/wisp_lantern.json | 10 +++ .../itsmeow/whisperwoods/init/ModDataGen.java | 71 +++++++++++++++- .../itsmeow/whisperwoods/init/ModTags.java | 30 +++++++ 46 files changed, 393 insertions(+), 1323 deletions(-) delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluehanging.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluehanging2.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluesitting.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluesitting2.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluewall.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluewall2.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenhanging.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenhanging2.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greensitting.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greensitting2.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenwall.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenwall2.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangehanging.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangehanging2.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangesitting.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangesitting2.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangewall.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangewall2.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplehanging.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplehanging2.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplesitting.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplesitting2.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplewall.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplewall2.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowhanging.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowhanging2.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowsitting.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowsitting2.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowwall.json delete mode 100644 src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowwall2.json create mode 100644 src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_blue.json create mode 100644 src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_green.json create mode 100644 src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_orange.json create mode 100644 src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_purple.json create mode 100644 src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_yellow.json create mode 100644 src/generated/resources/data/whisperwoods/recipes/wisp_lantern_blue.json create mode 100644 src/generated/resources/data/whisperwoods/recipes/wisp_lantern_green.json create mode 100644 src/generated/resources/data/whisperwoods/recipes/wisp_lantern_orange.json create mode 100644 src/generated/resources/data/whisperwoods/recipes/wisp_lantern_purple.json create mode 100644 src/generated/resources/data/whisperwoods/recipes/wisp_lantern_yellow.json create mode 100644 src/generated/resources/data/whisperwoods/tags/blocks/ghost_light.json create mode 100644 src/generated/resources/data/whisperwoods/tags/blocks/wisp_lantern.json create mode 100644 src/generated/resources/data/whisperwoods/tags/items/ghost_light.json create mode 100644 src/generated/resources/data/whisperwoods/tags/items/wisp_lantern.json create mode 100644 src/main/java/dev/itsmeow/whisperwoods/init/ModTags.java diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluehanging.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluehanging.json deleted file mode 100644 index 8a51d11..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluehanging.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "whisperwoods:block/wisp_lantern_hanging" -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluehanging2.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluehanging2.json deleted file mode 100644 index f7746ef..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluehanging2.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "lens": "whisperwoods:blocks/wisp_lantern_lens_blue" - }, - "elements": [ - { - "from": [ - 5, - 2, - 3.8 - ], - "to": [ - 11, - 8, - 4.8 - ], - "rotation": { - "origin": [ - 0, - 8, - 0 - ], - "axis": "z", - "angle": 0.0 - }, - "faces": { - "down": { - "texture": "#lens", - "uv": [ - 6.5, - 12.0, - 3.5, - 12.5 - ] - }, - "up": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 0.5, - 12.0 - ] - }, - "north": { - "texture": "#lens", - "uv": [ - 0.5, - 12.5, - 3.5, - 15.5 - ] - }, - "south": { - "texture": "#lens", - "uv": [ - 4.0, - 12.5, - 7.0, - 15.5 - ] - }, - "west": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 4.0, - 15.5 - ] - }, - "east": { - "texture": "#lens", - "uv": [ - 0.0, - 12.5, - 0.5, - 15.5 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluesitting.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluesitting.json deleted file mode 100644 index c3f7b6b..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluesitting.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "whisperwoods:block/wisp_lantern_sitting" -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluesitting2.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluesitting2.json deleted file mode 100644 index f7746ef..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluesitting2.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "lens": "whisperwoods:blocks/wisp_lantern_lens_blue" - }, - "elements": [ - { - "from": [ - 5, - 2, - 3.8 - ], - "to": [ - 11, - 8, - 4.8 - ], - "rotation": { - "origin": [ - 0, - 8, - 0 - ], - "axis": "z", - "angle": 0.0 - }, - "faces": { - "down": { - "texture": "#lens", - "uv": [ - 6.5, - 12.0, - 3.5, - 12.5 - ] - }, - "up": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 0.5, - 12.0 - ] - }, - "north": { - "texture": "#lens", - "uv": [ - 0.5, - 12.5, - 3.5, - 15.5 - ] - }, - "south": { - "texture": "#lens", - "uv": [ - 4.0, - 12.5, - 7.0, - 15.5 - ] - }, - "west": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 4.0, - 15.5 - ] - }, - "east": { - "texture": "#lens", - "uv": [ - 0.0, - 12.5, - 0.5, - 15.5 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluewall.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluewall.json deleted file mode 100644 index 4f82818..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluewall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "whisperwoods:block/wisp_lantern_wall" -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluewall2.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluewall2.json deleted file mode 100644 index f600a20..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_bluewall2.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "lens": "whisperwoods:blocks/wisp_lantern_lens_blue" - }, - "elements": [ - { - "from": [ - 5, - 2, - 7.8 - ], - "to": [ - 11, - 8, - 8.8 - ], - "rotation": { - "origin": [ - 0, - 8, - 0 - ], - "axis": "z", - "angle": 0.0 - }, - "faces": { - "down": { - "texture": "#lens", - "uv": [ - 6.5, - 12.0, - 3.5, - 12.5 - ] - }, - "up": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 0.5, - 12.0 - ] - }, - "north": { - "texture": "#lens", - "uv": [ - 0.5, - 12.5, - 3.5, - 15.5 - ] - }, - "south": { - "texture": "#lens", - "uv": [ - 4.0, - 12.5, - 7.0, - 15.5 - ] - }, - "west": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 4.0, - 15.5 - ] - }, - "east": { - "texture": "#lens", - "uv": [ - 0.0, - 12.5, - 0.5, - 15.5 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenhanging.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenhanging.json deleted file mode 100644 index 8a51d11..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenhanging.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "whisperwoods:block/wisp_lantern_hanging" -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenhanging2.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenhanging2.json deleted file mode 100644 index d38f723..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenhanging2.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "lens": "whisperwoods:blocks/wisp_lantern_lens_green" - }, - "elements": [ - { - "from": [ - 5, - 2, - 3.8 - ], - "to": [ - 11, - 8, - 4.8 - ], - "rotation": { - "origin": [ - 0, - 8, - 0 - ], - "axis": "z", - "angle": 0.0 - }, - "faces": { - "down": { - "texture": "#lens", - "uv": [ - 6.5, - 12.0, - 3.5, - 12.5 - ] - }, - "up": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 0.5, - 12.0 - ] - }, - "north": { - "texture": "#lens", - "uv": [ - 0.5, - 12.5, - 3.5, - 15.5 - ] - }, - "south": { - "texture": "#lens", - "uv": [ - 4.0, - 12.5, - 7.0, - 15.5 - ] - }, - "west": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 4.0, - 15.5 - ] - }, - "east": { - "texture": "#lens", - "uv": [ - 0.0, - 12.5, - 0.5, - 15.5 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greensitting.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greensitting.json deleted file mode 100644 index c3f7b6b..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greensitting.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "whisperwoods:block/wisp_lantern_sitting" -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greensitting2.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greensitting2.json deleted file mode 100644 index d38f723..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greensitting2.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "lens": "whisperwoods:blocks/wisp_lantern_lens_green" - }, - "elements": [ - { - "from": [ - 5, - 2, - 3.8 - ], - "to": [ - 11, - 8, - 4.8 - ], - "rotation": { - "origin": [ - 0, - 8, - 0 - ], - "axis": "z", - "angle": 0.0 - }, - "faces": { - "down": { - "texture": "#lens", - "uv": [ - 6.5, - 12.0, - 3.5, - 12.5 - ] - }, - "up": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 0.5, - 12.0 - ] - }, - "north": { - "texture": "#lens", - "uv": [ - 0.5, - 12.5, - 3.5, - 15.5 - ] - }, - "south": { - "texture": "#lens", - "uv": [ - 4.0, - 12.5, - 7.0, - 15.5 - ] - }, - "west": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 4.0, - 15.5 - ] - }, - "east": { - "texture": "#lens", - "uv": [ - 0.0, - 12.5, - 0.5, - 15.5 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenwall.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenwall.json deleted file mode 100644 index 4f82818..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenwall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "whisperwoods:block/wisp_lantern_wall" -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenwall2.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenwall2.json deleted file mode 100644 index 0ed900f..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_greenwall2.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "lens": "whisperwoods:blocks/wisp_lantern_lens_green" - }, - "elements": [ - { - "from": [ - 5, - 2, - 7.8 - ], - "to": [ - 11, - 8, - 8.8 - ], - "rotation": { - "origin": [ - 0, - 8, - 0 - ], - "axis": "z", - "angle": 0.0 - }, - "faces": { - "down": { - "texture": "#lens", - "uv": [ - 6.5, - 12.0, - 3.5, - 12.5 - ] - }, - "up": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 0.5, - 12.0 - ] - }, - "north": { - "texture": "#lens", - "uv": [ - 0.5, - 12.5, - 3.5, - 15.5 - ] - }, - "south": { - "texture": "#lens", - "uv": [ - 4.0, - 12.5, - 7.0, - 15.5 - ] - }, - "west": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 4.0, - 15.5 - ] - }, - "east": { - "texture": "#lens", - "uv": [ - 0.0, - 12.5, - 0.5, - 15.5 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangehanging.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangehanging.json deleted file mode 100644 index 8a51d11..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangehanging.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "whisperwoods:block/wisp_lantern_hanging" -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangehanging2.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangehanging2.json deleted file mode 100644 index 9f666d0..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangehanging2.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "lens": "whisperwoods:blocks/wisp_lantern_lens_orange" - }, - "elements": [ - { - "from": [ - 5, - 2, - 3.8 - ], - "to": [ - 11, - 8, - 4.8 - ], - "rotation": { - "origin": [ - 0, - 8, - 0 - ], - "axis": "z", - "angle": 0.0 - }, - "faces": { - "down": { - "texture": "#lens", - "uv": [ - 6.5, - 12.0, - 3.5, - 12.5 - ] - }, - "up": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 0.5, - 12.0 - ] - }, - "north": { - "texture": "#lens", - "uv": [ - 0.5, - 12.5, - 3.5, - 15.5 - ] - }, - "south": { - "texture": "#lens", - "uv": [ - 4.0, - 12.5, - 7.0, - 15.5 - ] - }, - "west": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 4.0, - 15.5 - ] - }, - "east": { - "texture": "#lens", - "uv": [ - 0.0, - 12.5, - 0.5, - 15.5 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangesitting.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangesitting.json deleted file mode 100644 index c3f7b6b..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangesitting.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "whisperwoods:block/wisp_lantern_sitting" -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangesitting2.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangesitting2.json deleted file mode 100644 index 9f666d0..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangesitting2.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "lens": "whisperwoods:blocks/wisp_lantern_lens_orange" - }, - "elements": [ - { - "from": [ - 5, - 2, - 3.8 - ], - "to": [ - 11, - 8, - 4.8 - ], - "rotation": { - "origin": [ - 0, - 8, - 0 - ], - "axis": "z", - "angle": 0.0 - }, - "faces": { - "down": { - "texture": "#lens", - "uv": [ - 6.5, - 12.0, - 3.5, - 12.5 - ] - }, - "up": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 0.5, - 12.0 - ] - }, - "north": { - "texture": "#lens", - "uv": [ - 0.5, - 12.5, - 3.5, - 15.5 - ] - }, - "south": { - "texture": "#lens", - "uv": [ - 4.0, - 12.5, - 7.0, - 15.5 - ] - }, - "west": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 4.0, - 15.5 - ] - }, - "east": { - "texture": "#lens", - "uv": [ - 0.0, - 12.5, - 0.5, - 15.5 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangewall.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangewall.json deleted file mode 100644 index 4f82818..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangewall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "whisperwoods:block/wisp_lantern_wall" -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangewall2.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangewall2.json deleted file mode 100644 index c80794a..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_orangewall2.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "lens": "whisperwoods:blocks/wisp_lantern_lens_orange" - }, - "elements": [ - { - "from": [ - 5, - 2, - 7.8 - ], - "to": [ - 11, - 8, - 8.8 - ], - "rotation": { - "origin": [ - 0, - 8, - 0 - ], - "axis": "z", - "angle": 0.0 - }, - "faces": { - "down": { - "texture": "#lens", - "uv": [ - 6.5, - 12.0, - 3.5, - 12.5 - ] - }, - "up": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 0.5, - 12.0 - ] - }, - "north": { - "texture": "#lens", - "uv": [ - 0.5, - 12.5, - 3.5, - 15.5 - ] - }, - "south": { - "texture": "#lens", - "uv": [ - 4.0, - 12.5, - 7.0, - 15.5 - ] - }, - "west": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 4.0, - 15.5 - ] - }, - "east": { - "texture": "#lens", - "uv": [ - 0.0, - 12.5, - 0.5, - 15.5 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplehanging.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplehanging.json deleted file mode 100644 index 8a51d11..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplehanging.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "whisperwoods:block/wisp_lantern_hanging" -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplehanging2.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplehanging2.json deleted file mode 100644 index 076b7e1..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplehanging2.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "lens": "whisperwoods:blocks/wisp_lantern_lens_purple" - }, - "elements": [ - { - "from": [ - 5, - 2, - 3.8 - ], - "to": [ - 11, - 8, - 4.8 - ], - "rotation": { - "origin": [ - 0, - 8, - 0 - ], - "axis": "z", - "angle": 0.0 - }, - "faces": { - "down": { - "texture": "#lens", - "uv": [ - 6.5, - 12.0, - 3.5, - 12.5 - ] - }, - "up": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 0.5, - 12.0 - ] - }, - "north": { - "texture": "#lens", - "uv": [ - 0.5, - 12.5, - 3.5, - 15.5 - ] - }, - "south": { - "texture": "#lens", - "uv": [ - 4.0, - 12.5, - 7.0, - 15.5 - ] - }, - "west": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 4.0, - 15.5 - ] - }, - "east": { - "texture": "#lens", - "uv": [ - 0.0, - 12.5, - 0.5, - 15.5 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplesitting.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplesitting.json deleted file mode 100644 index c3f7b6b..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplesitting.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "whisperwoods:block/wisp_lantern_sitting" -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplesitting2.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplesitting2.json deleted file mode 100644 index 076b7e1..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplesitting2.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "lens": "whisperwoods:blocks/wisp_lantern_lens_purple" - }, - "elements": [ - { - "from": [ - 5, - 2, - 3.8 - ], - "to": [ - 11, - 8, - 4.8 - ], - "rotation": { - "origin": [ - 0, - 8, - 0 - ], - "axis": "z", - "angle": 0.0 - }, - "faces": { - "down": { - "texture": "#lens", - "uv": [ - 6.5, - 12.0, - 3.5, - 12.5 - ] - }, - "up": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 0.5, - 12.0 - ] - }, - "north": { - "texture": "#lens", - "uv": [ - 0.5, - 12.5, - 3.5, - 15.5 - ] - }, - "south": { - "texture": "#lens", - "uv": [ - 4.0, - 12.5, - 7.0, - 15.5 - ] - }, - "west": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 4.0, - 15.5 - ] - }, - "east": { - "texture": "#lens", - "uv": [ - 0.0, - 12.5, - 0.5, - 15.5 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplewall.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplewall.json deleted file mode 100644 index 4f82818..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplewall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "whisperwoods:block/wisp_lantern_wall" -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplewall2.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplewall2.json deleted file mode 100644 index 7f973d8..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_purplewall2.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "lens": "whisperwoods:blocks/wisp_lantern_lens_purple" - }, - "elements": [ - { - "from": [ - 5, - 2, - 7.8 - ], - "to": [ - 11, - 8, - 8.8 - ], - "rotation": { - "origin": [ - 0, - 8, - 0 - ], - "axis": "z", - "angle": 0.0 - }, - "faces": { - "down": { - "texture": "#lens", - "uv": [ - 6.5, - 12.0, - 3.5, - 12.5 - ] - }, - "up": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 0.5, - 12.0 - ] - }, - "north": { - "texture": "#lens", - "uv": [ - 0.5, - 12.5, - 3.5, - 15.5 - ] - }, - "south": { - "texture": "#lens", - "uv": [ - 4.0, - 12.5, - 7.0, - 15.5 - ] - }, - "west": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 4.0, - 15.5 - ] - }, - "east": { - "texture": "#lens", - "uv": [ - 0.0, - 12.5, - 0.5, - 15.5 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowhanging.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowhanging.json deleted file mode 100644 index 8a51d11..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowhanging.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "whisperwoods:block/wisp_lantern_hanging" -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowhanging2.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowhanging2.json deleted file mode 100644 index f78b605..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowhanging2.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "lens": "whisperwoods:blocks/wisp_lantern_lens_yellow" - }, - "elements": [ - { - "from": [ - 5, - 2, - 3.8 - ], - "to": [ - 11, - 8, - 4.8 - ], - "rotation": { - "origin": [ - 0, - 8, - 0 - ], - "axis": "z", - "angle": 0.0 - }, - "faces": { - "down": { - "texture": "#lens", - "uv": [ - 6.5, - 12.0, - 3.5, - 12.5 - ] - }, - "up": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 0.5, - 12.0 - ] - }, - "north": { - "texture": "#lens", - "uv": [ - 0.5, - 12.5, - 3.5, - 15.5 - ] - }, - "south": { - "texture": "#lens", - "uv": [ - 4.0, - 12.5, - 7.0, - 15.5 - ] - }, - "west": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 4.0, - 15.5 - ] - }, - "east": { - "texture": "#lens", - "uv": [ - 0.0, - 12.5, - 0.5, - 15.5 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowsitting.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowsitting.json deleted file mode 100644 index c3f7b6b..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowsitting.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "whisperwoods:block/wisp_lantern_sitting" -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowsitting2.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowsitting2.json deleted file mode 100644 index f78b605..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowsitting2.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "lens": "whisperwoods:blocks/wisp_lantern_lens_yellow" - }, - "elements": [ - { - "from": [ - 5, - 2, - 3.8 - ], - "to": [ - 11, - 8, - 4.8 - ], - "rotation": { - "origin": [ - 0, - 8, - 0 - ], - "axis": "z", - "angle": 0.0 - }, - "faces": { - "down": { - "texture": "#lens", - "uv": [ - 6.5, - 12.0, - 3.5, - 12.5 - ] - }, - "up": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 0.5, - 12.0 - ] - }, - "north": { - "texture": "#lens", - "uv": [ - 0.5, - 12.5, - 3.5, - 15.5 - ] - }, - "south": { - "texture": "#lens", - "uv": [ - 4.0, - 12.5, - 7.0, - 15.5 - ] - }, - "west": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 4.0, - 15.5 - ] - }, - "east": { - "texture": "#lens", - "uv": [ - 0.0, - 12.5, - 0.5, - 15.5 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowwall.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowwall.json deleted file mode 100644 index 4f82818..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowwall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "whisperwoods:block/wisp_lantern_wall" -} \ No newline at end of file diff --git a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowwall2.json b/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowwall2.json deleted file mode 100644 index 2fb3a08..0000000 --- a/src/generated/resources/assets/whisperwoods/models/junk/wisp_lantern_yellowwall2.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "lens": "whisperwoods:blocks/wisp_lantern_lens_yellow" - }, - "elements": [ - { - "from": [ - 5, - 2, - 7.8 - ], - "to": [ - 11, - 8, - 8.8 - ], - "rotation": { - "origin": [ - 0, - 8, - 0 - ], - "axis": "z", - "angle": 0.0 - }, - "faces": { - "down": { - "texture": "#lens", - "uv": [ - 6.5, - 12.0, - 3.5, - 12.5 - ] - }, - "up": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 0.5, - 12.0 - ] - }, - "north": { - "texture": "#lens", - "uv": [ - 0.5, - 12.5, - 3.5, - 15.5 - ] - }, - "south": { - "texture": "#lens", - "uv": [ - 4.0, - 12.5, - 7.0, - 15.5 - ] - }, - "west": { - "texture": "#lens", - "uv": [ - 3.5, - 12.5, - 4.0, - 15.5 - ] - }, - "east": { - "texture": "#lens", - "uv": [ - 0.0, - 12.5, - 0.5, - 15.5 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_blue.json b/src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_blue.json new file mode 100644 index 0000000..c50ed01 --- /dev/null +++ b/src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_blue.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "whisperwoods:wisp_lantern_blue" + ] + }, + "criteria": { + "has_ghost_light": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "whisperwoods:ghost_light" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "whisperwoods:wisp_lantern_blue" + } + } + }, + "requirements": [ + [ + "has_ghost_light", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_green.json b/src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_green.json new file mode 100644 index 0000000..21fdfce --- /dev/null +++ b/src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_green.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "whisperwoods:wisp_lantern_green" + ] + }, + "criteria": { + "has_ghost_light": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "whisperwoods:ghost_light" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "whisperwoods:wisp_lantern_green" + } + } + }, + "requirements": [ + [ + "has_ghost_light", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_orange.json b/src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_orange.json new file mode 100644 index 0000000..698a466 --- /dev/null +++ b/src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_orange.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "whisperwoods:wisp_lantern_orange" + ] + }, + "criteria": { + "has_ghost_light": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "whisperwoods:ghost_light" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "whisperwoods:wisp_lantern_orange" + } + } + }, + "requirements": [ + [ + "has_ghost_light", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_purple.json b/src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_purple.json new file mode 100644 index 0000000..2aa4956 --- /dev/null +++ b/src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_purple.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "whisperwoods:wisp_lantern_purple" + ] + }, + "criteria": { + "has_ghost_light": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "whisperwoods:ghost_light" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "whisperwoods:wisp_lantern_purple" + } + } + }, + "requirements": [ + [ + "has_ghost_light", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_yellow.json b/src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_yellow.json new file mode 100644 index 0000000..38d5f06 --- /dev/null +++ b/src/generated/resources/data/whisperwoods/advancements/recipes/whisperwoods/wisp_lantern_yellow.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "whisperwoods:wisp_lantern_yellow" + ] + }, + "criteria": { + "has_ghost_light": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "whisperwoods:ghost_light" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "whisperwoods:wisp_lantern_yellow" + } + } + }, + "requirements": [ + [ + "has_ghost_light", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/whisperwoods/recipes/wisp_lantern_blue.json b/src/generated/resources/data/whisperwoods/recipes/wisp_lantern_blue.json new file mode 100644 index 0000000..80cf271 --- /dev/null +++ b/src/generated/resources/data/whisperwoods/recipes/wisp_lantern_blue.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "nnn", + "nln", + "nnn" + ], + "key": { + "l": { + "item": "whisperwoods:ghost_light_electric_blue" + }, + "n": { + "tag": "forge:nuggets/iron" + } + }, + "result": { + "item": "whisperwoods:wisp_lantern_blue" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/whisperwoods/recipes/wisp_lantern_green.json b/src/generated/resources/data/whisperwoods/recipes/wisp_lantern_green.json new file mode 100644 index 0000000..6ed9c2b --- /dev/null +++ b/src/generated/resources/data/whisperwoods/recipes/wisp_lantern_green.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "nnn", + "nln", + "nnn" + ], + "key": { + "l": { + "item": "whisperwoods:ghost_light_toxic_green" + }, + "n": { + "tag": "forge:nuggets/iron" + } + }, + "result": { + "item": "whisperwoods:wisp_lantern_green" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/whisperwoods/recipes/wisp_lantern_orange.json b/src/generated/resources/data/whisperwoods/recipes/wisp_lantern_orange.json new file mode 100644 index 0000000..b7ce140 --- /dev/null +++ b/src/generated/resources/data/whisperwoods/recipes/wisp_lantern_orange.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "nnn", + "nln", + "nnn" + ], + "key": { + "l": { + "item": "whisperwoods:ghost_light_fiery_orange" + }, + "n": { + "tag": "forge:nuggets/iron" + } + }, + "result": { + "item": "whisperwoods:wisp_lantern_orange" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/whisperwoods/recipes/wisp_lantern_purple.json b/src/generated/resources/data/whisperwoods/recipes/wisp_lantern_purple.json new file mode 100644 index 0000000..47910fc --- /dev/null +++ b/src/generated/resources/data/whisperwoods/recipes/wisp_lantern_purple.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "nnn", + "nln", + "nnn" + ], + "key": { + "l": { + "item": "whisperwoods:ghost_light_magic_purple" + }, + "n": { + "tag": "forge:nuggets/iron" + } + }, + "result": { + "item": "whisperwoods:wisp_lantern_purple" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/whisperwoods/recipes/wisp_lantern_yellow.json b/src/generated/resources/data/whisperwoods/recipes/wisp_lantern_yellow.json new file mode 100644 index 0000000..5d44566 --- /dev/null +++ b/src/generated/resources/data/whisperwoods/recipes/wisp_lantern_yellow.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "nnn", + "nln", + "nnn" + ], + "key": { + "l": { + "item": "whisperwoods:ghost_light_gold" + }, + "n": { + "tag": "forge:nuggets/iron" + } + }, + "result": { + "item": "whisperwoods:wisp_lantern_yellow" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/whisperwoods/tags/blocks/ghost_light.json b/src/generated/resources/data/whisperwoods/tags/blocks/ghost_light.json new file mode 100644 index 0000000..24d6686 --- /dev/null +++ b/src/generated/resources/data/whisperwoods/tags/blocks/ghost_light.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "whisperwoods:ghost_light_electric_blue", + "whisperwoods:ghost_light_fiery_orange", + "whisperwoods:ghost_light_gold", + "whisperwoods:ghost_light_magic_purple", + "whisperwoods:ghost_light_toxic_green" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/whisperwoods/tags/blocks/wisp_lantern.json b/src/generated/resources/data/whisperwoods/tags/blocks/wisp_lantern.json new file mode 100644 index 0000000..72155d4 --- /dev/null +++ b/src/generated/resources/data/whisperwoods/tags/blocks/wisp_lantern.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "whisperwoods:wisp_lantern_blue", + "whisperwoods:wisp_lantern_orange", + "whisperwoods:wisp_lantern_yellow", + "whisperwoods:wisp_lantern_purple", + "whisperwoods:wisp_lantern_green" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/whisperwoods/tags/items/ghost_light.json b/src/generated/resources/data/whisperwoods/tags/items/ghost_light.json new file mode 100644 index 0000000..24d6686 --- /dev/null +++ b/src/generated/resources/data/whisperwoods/tags/items/ghost_light.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "whisperwoods:ghost_light_electric_blue", + "whisperwoods:ghost_light_fiery_orange", + "whisperwoods:ghost_light_gold", + "whisperwoods:ghost_light_magic_purple", + "whisperwoods:ghost_light_toxic_green" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/whisperwoods/tags/items/wisp_lantern.json b/src/generated/resources/data/whisperwoods/tags/items/wisp_lantern.json new file mode 100644 index 0000000..72155d4 --- /dev/null +++ b/src/generated/resources/data/whisperwoods/tags/items/wisp_lantern.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "whisperwoods:wisp_lantern_blue", + "whisperwoods:wisp_lantern_orange", + "whisperwoods:wisp_lantern_yellow", + "whisperwoods:wisp_lantern_purple", + "whisperwoods:wisp_lantern_green" + ] +} \ No newline at end of file diff --git a/src/main/java/dev/itsmeow/whisperwoods/init/ModDataGen.java b/src/main/java/dev/itsmeow/whisperwoods/init/ModDataGen.java index 4c0f6f8..eea94d9 100644 --- a/src/main/java/dev/itsmeow/whisperwoods/init/ModDataGen.java +++ b/src/main/java/dev/itsmeow/whisperwoods/init/ModDataGen.java @@ -13,13 +13,18 @@ import dev.itsmeow.whisperwoods.WhisperwoodsMod; import dev.itsmeow.whisperwoods.block.BlockWispLantern; +import dev.itsmeow.whisperwoods.util.WispColors; +import dev.itsmeow.whisperwoods.util.WispColors.WispColor; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.client.renderer.RenderType; +import net.minecraft.data.BlockTagsProvider; import net.minecraft.data.DataGenerator; import net.minecraft.data.IFinishedRecipe; +import net.minecraft.data.ItemTagsProvider; import net.minecraft.data.LootTableProvider; import net.minecraft.data.RecipeProvider; +import net.minecraft.data.ShapedRecipeBuilder; import net.minecraft.data.loot.BlockLootTables; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; @@ -39,6 +44,7 @@ import net.minecraftforge.client.model.generators.ModelBuilder.Perspective; import net.minecraftforge.client.model.generators.ModelFile.ExistingModelFile; import net.minecraftforge.client.model.generators.loaders.MultiLayerModelBuilder; +import net.minecraftforge.common.Tags; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.RegistryObject; @@ -50,6 +56,9 @@ public class ModDataGen { @SubscribeEvent public static void gatherData(GatherDataEvent event) { + WWBlockTagsProvider blockTags = new WWBlockTagsProvider(event.getGenerator(), event.getExistingFileHelper()); + event.getGenerator().addProvider(blockTags); + event.getGenerator().addProvider(new WWItemTagsProvider(event.getGenerator(), blockTags, event.getExistingFileHelper())); event.getGenerator().addProvider(new WWBlockStateProvider(event.getGenerator(), event.getExistingFileHelper())); event.getGenerator().addProvider(new WWItemModelProvider(event.getGenerator(), event.getExistingFileHelper())); event.getGenerator().addProvider(new WWLootTableProvider(event.getGenerator())); @@ -57,6 +66,46 @@ public static void gatherData(GatherDataEvent event) { ModEntities.H.gatherData(event.getGenerator(), event.getExistingFileHelper()); } + public static class WWBlockTagsProvider extends BlockTagsProvider { + + public WWBlockTagsProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { + super(generator, WhisperwoodsMod.MODID, existingFileHelper); + } + + @Override + public String getName() { + return WhisperwoodsMod.MODID + "_block_tags"; + } + + @Override + protected void registerTags() { + Builder ghostLights = this.getOrCreateBuilder(ModTags.Blocks.GHOST_LIGHT); + Builder wispLanterns = this.getOrCreateBuilder(ModTags.Blocks.WISP_LANTERN); + for(WispColor color : WispColors.values()) { + ghostLights.add(color.getGhostLight().get()); + wispLanterns.add(color.getLantern().get()); + } + } + } + + public static class WWItemTagsProvider extends ItemTagsProvider { + + public WWItemTagsProvider(DataGenerator generator, WWBlockTagsProvider blockTagProvider, ExistingFileHelper existingFileHelper) { + super(generator, blockTagProvider, WhisperwoodsMod.MODID, existingFileHelper); + } + + @Override + public String getName() { + return WhisperwoodsMod.MODID + "_item_tags"; + } + + @Override + protected void registerTags() { + this.copy(ModTags.Blocks.GHOST_LIGHT, ModTags.Items.GHOST_LIGHT); + this.copy(ModTags.Blocks.WISP_LANTERN, ModTags.Items.WISP_LANTERN); + } + } + public static class WWItemModelProvider extends ItemModelProvider { public WWItemModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { @@ -93,7 +142,16 @@ public String getName() { @Override protected void registerRecipes(Consumer consumer) { + ModBlocks.getBlocks().forEach(blockEntry -> { + Block block = blockEntry.get(); + if(block instanceof BlockWispLantern) { + this.makeLanternRecipe(consumer, (BlockWispLantern) block); + } + }); + } + protected void makeLanternRecipe(Consumer consumer, BlockWispLantern block) { + ShapedRecipeBuilder.shapedRecipe(block.asItem()).key('l', WispColors.byColor(block.getColor()).getGhostLight().get()).key('n', Tags.Items.NUGGETS_IRON).patternLine("nnn").patternLine("nln").patternLine("nnn").addCriterion("has_ghost_light", hasItem(ModTags.Items.GHOST_LIGHT)).build(consumer); } } @@ -146,7 +204,6 @@ protected void buildWispLanternState(Block block) { } protected BlockModelBuilder wispLanternModel(Block block, String ext) { - String uniquePrefix = "junk/" + block.getRegistryName().getPath().toString() + ext; String lensName = block.getRegistryName().getPath().replace("wisp_lantern", "wisp_lantern_lens"); ResourceLocation parent = rl("block/wisp_lantern_" + ext); final Map uvs = new HashMap(); @@ -171,8 +228,8 @@ protected BlockModelBuilder wispLanternModel(Block block, String ext) { .end() .end() .customLoader(MultiLayerModelBuilder::begin) - .submodel(RenderType.getSolid(), this.models().withExistingParent(uniquePrefix, parent)) - .submodel(RenderType.getTranslucent(), this.models().withExistingParent(uniquePrefix + "2", "minecraft:block/block") + .submodel(RenderType.getSolid(), nestedParent(parent)) + .submodel(RenderType.getTranslucent(), nestedParent("minecraft:block/block") .element() .from(5, 2, ext.equals("wall") ? 7.8F : 3.8F) .to(11, 8, ext.equals("wall") ? 8.8F : 4.8F) @@ -190,6 +247,14 @@ protected ExistingModelFile blockModelExt(Block block, String ext) { protected ResourceLocation blockModelExtRL(Block block, String ext) { return rl("block/" + block.getRegistryName().getPath() + "_" + ext); } + + protected BlockModelBuilder nestedParent(String parent) { + return nestedParent(new ResourceLocation(parent)); + } + + protected BlockModelBuilder nestedParent(ResourceLocation parent) { + return this.models().nested().parent(this.models().getExistingFile(parent)); + } protected static ResourceLocation rl(String text) { return new ResourceLocation(WhisperwoodsMod.MODID, text); diff --git a/src/main/java/dev/itsmeow/whisperwoods/init/ModTags.java b/src/main/java/dev/itsmeow/whisperwoods/init/ModTags.java new file mode 100644 index 0000000..85d4d1f --- /dev/null +++ b/src/main/java/dev/itsmeow/whisperwoods/init/ModTags.java @@ -0,0 +1,30 @@ +package dev.itsmeow.whisperwoods.init; + +import dev.itsmeow.whisperwoods.WhisperwoodsMod; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.Tags.IOptionalNamedTag; + +public class ModTags { + + public static final class Blocks { + public static final IOptionalNamedTag GHOST_LIGHT = tag("ghost_light"); + public static final IOptionalNamedTag WISP_LANTERN = tag("wisp_lantern"); + + private static IOptionalNamedTag tag(String name) { + return BlockTags.createOptional(new ResourceLocation(WhisperwoodsMod.MODID, name)); + } + } + + public static final class Items { + public static final IOptionalNamedTag GHOST_LIGHT = tag("ghost_light"); + public static final IOptionalNamedTag WISP_LANTERN = tag("wisp_lantern"); + + private static IOptionalNamedTag tag(String name) { + return ItemTags.createOptional(new ResourceLocation(WhisperwoodsMod.MODID, name)); + } + } +}