From 69710476f32cf3bf70f929f3ad32965bf71a1195 Mon Sep 17 00:00:00 2001 From: blryface <124838505+blryface@users.noreply.github.com> Date: Fri, 13 Sep 2024 23:46:54 -0300 Subject: [PATCH] Fix queer candle model --- .../assets/joy/blockstates/queer_candle.json | 28 +++++++++++++++++++ .../joy/blockstates/queer_candle_cake.json | 10 +++++++ .../joy/models/block/queer_candle_cake.json | 10 +++++++ .../models/block/queer_candle_cake_lit.json | 10 +++++++ .../block/queer_candle_four_candles.json | 7 +++++ .../block/queer_candle_four_candles_lit.json | 7 +++++ .../models/block/queer_candle_one_candle.json | 7 +++++ .../block/queer_candle_one_candle_lit.json | 7 +++++ .../block/queer_candle_three_candles.json | 7 +++++ .../block/queer_candle_three_candles_lit.json | 7 +++++ .../block/queer_candle_two_candles.json | 7 +++++ .../block/queer_candle_two_candles_lit.json | 7 +++++ .../assets/joy/models/item/queer_candle.json | 6 ++++ .../joy/models/item/queer_candle_cake.json | 3 ++ .../minecraft/tags/block/candle_cakes.json | 1 + .../data/minecraft/tags/block/candles.json | 1 + 16 files changed, 125 insertions(+) create mode 100644 src/main/generated/assets/joy/blockstates/queer_candle.json create mode 100644 src/main/generated/assets/joy/blockstates/queer_candle_cake.json create mode 100644 src/main/generated/assets/joy/models/block/queer_candle_cake.json create mode 100644 src/main/generated/assets/joy/models/block/queer_candle_cake_lit.json create mode 100644 src/main/generated/assets/joy/models/block/queer_candle_four_candles.json create mode 100644 src/main/generated/assets/joy/models/block/queer_candle_four_candles_lit.json create mode 100644 src/main/generated/assets/joy/models/block/queer_candle_one_candle.json create mode 100644 src/main/generated/assets/joy/models/block/queer_candle_one_candle_lit.json create mode 100644 src/main/generated/assets/joy/models/block/queer_candle_three_candles.json create mode 100644 src/main/generated/assets/joy/models/block/queer_candle_three_candles_lit.json create mode 100644 src/main/generated/assets/joy/models/block/queer_candle_two_candles.json create mode 100644 src/main/generated/assets/joy/models/block/queer_candle_two_candles_lit.json create mode 100644 src/main/generated/assets/joy/models/item/queer_candle.json create mode 100644 src/main/generated/assets/joy/models/item/queer_candle_cake.json diff --git a/src/main/generated/assets/joy/blockstates/queer_candle.json b/src/main/generated/assets/joy/blockstates/queer_candle.json new file mode 100644 index 0000000..45e2b1a --- /dev/null +++ b/src/main/generated/assets/joy/blockstates/queer_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,lit=false": { + "model": "joy:block/queer_candle_one_candle" + }, + "candles=1,lit=true": { + "model": "joy:block/queer_candle_one_candle_lit" + }, + "candles=2,lit=false": { + "model": "joy:block/queer_candle_two_candles" + }, + "candles=2,lit=true": { + "model": "joy:block/queer_candle_two_candles_lit" + }, + "candles=3,lit=false": { + "model": "joy:block/queer_candle_three_candles" + }, + "candles=3,lit=true": { + "model": "joy:block/queer_candle_three_candles_lit" + }, + "candles=4,lit=false": { + "model": "joy:block/queer_candle_four_candles" + }, + "candles=4,lit=true": { + "model": "joy:block/queer_candle_four_candles_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/joy/blockstates/queer_candle_cake.json b/src/main/generated/assets/joy/blockstates/queer_candle_cake.json new file mode 100644 index 0000000..db126f2 --- /dev/null +++ b/src/main/generated/assets/joy/blockstates/queer_candle_cake.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "joy:block/queer_candle_cake" + }, + "lit=true": { + "model": "joy:block/queer_candle_cake_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/block/queer_candle_cake.json b/src/main/generated/assets/joy/models/block/queer_candle_cake.json new file mode 100644 index 0000000..1057643 --- /dev/null +++ b/src/main/generated/assets/joy/models/block/queer_candle_cake.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "minecraft:block/cake_bottom", + "candle": "joy:block/queer_candle", + "particle": "minecraft:block/cake_side", + "side": "minecraft:block/cake_side", + "top": "minecraft:block/cake_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/block/queer_candle_cake_lit.json b/src/main/generated/assets/joy/models/block/queer_candle_cake_lit.json new file mode 100644 index 0000000..2f74542 --- /dev/null +++ b/src/main/generated/assets/joy/models/block/queer_candle_cake_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "minecraft:block/cake_bottom", + "candle": "joy:block/queer_candle_lit", + "particle": "minecraft:block/cake_side", + "side": "minecraft:block/cake_side", + "top": "minecraft:block/cake_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/block/queer_candle_four_candles.json b/src/main/generated/assets/joy/models/block/queer_candle_four_candles.json new file mode 100644 index 0000000..cc11a8c --- /dev/null +++ b/src/main/generated/assets/joy/models/block/queer_candle_four_candles.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_four_candles", + "textures": { + "all": "joy:block/queer_candle", + "particle": "joy:block/queer_candle" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/block/queer_candle_four_candles_lit.json b/src/main/generated/assets/joy/models/block/queer_candle_four_candles_lit.json new file mode 100644 index 0000000..0fec858 --- /dev/null +++ b/src/main/generated/assets/joy/models/block/queer_candle_four_candles_lit.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_four_candles", + "textures": { + "all": "joy:block/queer_candle_lit", + "particle": "joy:block/queer_candle_lit" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/block/queer_candle_one_candle.json b/src/main/generated/assets/joy/models/block/queer_candle_one_candle.json new file mode 100644 index 0000000..de93339 --- /dev/null +++ b/src/main/generated/assets/joy/models/block/queer_candle_one_candle.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_candle", + "textures": { + "all": "joy:block/queer_candle", + "particle": "joy:block/queer_candle" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/block/queer_candle_one_candle_lit.json b/src/main/generated/assets/joy/models/block/queer_candle_one_candle_lit.json new file mode 100644 index 0000000..7107e56 --- /dev/null +++ b/src/main/generated/assets/joy/models/block/queer_candle_one_candle_lit.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_candle", + "textures": { + "all": "joy:block/queer_candle_lit", + "particle": "joy:block/queer_candle_lit" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/block/queer_candle_three_candles.json b/src/main/generated/assets/joy/models/block/queer_candle_three_candles.json new file mode 100644 index 0000000..06c3cd8 --- /dev/null +++ b/src/main/generated/assets/joy/models/block/queer_candle_three_candles.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_three_candles", + "textures": { + "all": "joy:block/queer_candle", + "particle": "joy:block/queer_candle" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/block/queer_candle_three_candles_lit.json b/src/main/generated/assets/joy/models/block/queer_candle_three_candles_lit.json new file mode 100644 index 0000000..fe609d9 --- /dev/null +++ b/src/main/generated/assets/joy/models/block/queer_candle_three_candles_lit.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_three_candles", + "textures": { + "all": "joy:block/queer_candle_lit", + "particle": "joy:block/queer_candle_lit" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/block/queer_candle_two_candles.json b/src/main/generated/assets/joy/models/block/queer_candle_two_candles.json new file mode 100644 index 0000000..a6598d2 --- /dev/null +++ b/src/main/generated/assets/joy/models/block/queer_candle_two_candles.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_two_candles", + "textures": { + "all": "joy:block/queer_candle", + "particle": "joy:block/queer_candle" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/block/queer_candle_two_candles_lit.json b/src/main/generated/assets/joy/models/block/queer_candle_two_candles_lit.json new file mode 100644 index 0000000..d118a72 --- /dev/null +++ b/src/main/generated/assets/joy/models/block/queer_candle_two_candles_lit.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_two_candles", + "textures": { + "all": "joy:block/queer_candle_lit", + "particle": "joy:block/queer_candle_lit" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/item/queer_candle.json b/src/main/generated/assets/joy/models/item/queer_candle.json new file mode 100644 index 0000000..be15f71 --- /dev/null +++ b/src/main/generated/assets/joy/models/item/queer_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "joy:item/queer_candle" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/item/queer_candle_cake.json b/src/main/generated/assets/joy/models/item/queer_candle_cake.json new file mode 100644 index 0000000..e7a88b5 --- /dev/null +++ b/src/main/generated/assets/joy/models/item/queer_candle_cake.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/queer_candle_cake" +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/candle_cakes.json b/src/main/generated/data/minecraft/tags/block/candle_cakes.json index 130677f..6da3739 100644 --- a/src/main/generated/data/minecraft/tags/block/candle_cakes.json +++ b/src/main/generated/data/minecraft/tags/block/candle_cakes.json @@ -1,5 +1,6 @@ { "values": [ + "joy:queer_candle_cake", "joy:gay_candle_cake", "joy:enby_candle_cake", "joy:intersex_candle_cake", diff --git a/src/main/generated/data/minecraft/tags/block/candles.json b/src/main/generated/data/minecraft/tags/block/candles.json index a1c447d..18aff40 100644 --- a/src/main/generated/data/minecraft/tags/block/candles.json +++ b/src/main/generated/data/minecraft/tags/block/candles.json @@ -1,5 +1,6 @@ { "values": [ + "joy:queer_candle", "joy:gay_candle", "joy:enby_candle", "joy:intersex_candle",