diff --git a/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java b/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java index 740ed56..20b868f 100644 --- a/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java +++ b/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java @@ -6,6 +6,7 @@ import gay.pridecraft.joy.block.BlahajBlocks; import gay.pridecraft.joy.registry.JoyItems; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; import net.minecraft.block.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.registry.Registries; @@ -13,6 +14,8 @@ import net.minecraft.registry.Registry; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import static gay.pridecraft.joy.block.BlahajBlocks.*; + public class ModItemGroups { public static final ItemGroup JOY_BEDS = Registry.register(Registries.ITEM_GROUP, Identifier.of(Joy.MOD_ID, "joy"),FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joy_beds_group")) @@ -73,6 +76,13 @@ public class ModItemGroups { entries.add(JoyItems.SNIFFER_SPAWN_EGG); }).build()); + +// public static final List PRIDE_NAMES = List.of( +// "ace", "agender", "aro", "aroace", "bi", "demiboy", "demigirl", +// "demi_r", "demi_s", "enby", "gay", "genderfluid", "genderqueer", "greyrose", +// "grey_r", "grey_s", "intersex", "lesbian", "pan", "poly", "pride", "trans" +// ).stream().distinct().toList(); + public static final ItemGroup HAJS = Registry.register(Registries.ITEM_GROUP, Identifier.of(Joy.MOD_ID, "hajs"),FabricItemGroup.builder().displayName(Text.translatable("itemgroup.hajs_group")) .icon(() -> new ItemStack(BlahajBlocks.BLAHAJ_BLOCK)).entries((displayContext, entries) -> { @@ -83,9 +93,10 @@ public class ModItemGroups { entries.add(BlahajBlocks.BREAD_ITEM); entries.add(BlahajBlocks.BROWN_BEAR_ITEM); - /*for (Item item : PRIDE_ITEMS) { - entries.add(BlahajBlocks.item); To anyone who feels like figuring this out, pls do i give up - } */ + for (Item item : PRIDE_ITEMS) { + entries.add(new ItemStack(item)); + } + }).build()); diff --git a/src/main/resources/assets/joy/blockstates/ace_shark.json b/src/main/resources/assets/joy/blockstates/ace_shark.json new file mode 100644 index 0000000..5c937b6 --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/ace_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/ace_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/ace_shark" + }, + "facing=south": { + "model": "joy:block/ace_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/ace_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/agender_shark.json b/src/main/resources/assets/joy/blockstates/agender_shark.json new file mode 100644 index 0000000..34450f2 --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/agender_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/agender_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/agender_shark" + }, + "facing=south": { + "model": "joy:block/agender_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/agender_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/aro_shark.json b/src/main/resources/assets/joy/blockstates/aro_shark.json new file mode 100644 index 0000000..5bedf1f --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/aro_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/aro_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/aro_shark" + }, + "facing=south": { + "model": "joy:block/aro_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/aro_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/aroace_shark.json b/src/main/resources/assets/joy/blockstates/aroace_shark.json new file mode 100644 index 0000000..6ab063c --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/aroace_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/aroace_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/aroace_shark" + }, + "facing=south": { + "model": "joy:block/aroace_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/aroace_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/bi_shark.json b/src/main/resources/assets/joy/blockstates/bi_shark.json new file mode 100644 index 0000000..3ec8b25 --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/bi_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/bi_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/bi_shark" + }, + "facing=south": { + "model": "joy:block/bi_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/bi_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/brown_bear.json b/src/main/resources/assets/joy/blockstates/brown_bear.json new file mode 100644 index 0000000..07ed7c6 --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/brown_bear.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/brown_bear", + "y": 90 + }, + "facing=north": { + "model": "joy:block/brown_bear" + }, + "facing=south": { + "model": "joy:block/brown_bear", + "y": 180 + }, + "facing=west": { + "model": "joy:block/brown_bear", + "y": 270 + } + } +} diff --git a/src/main/resources/assets/joy/blockstates/demi_r_shark.json b/src/main/resources/assets/joy/blockstates/demi_r_shark.json new file mode 100644 index 0000000..682c7d0 --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/demi_r_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/demi_r_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/demi_r_shark" + }, + "facing=south": { + "model": "joy:block/demi_r_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/demi_r_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/demi_s_shark.json b/src/main/resources/assets/joy/blockstates/demi_s_shark.json new file mode 100644 index 0000000..fbf78e3 --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/demi_s_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/demi_s_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/demi_s_shark" + }, + "facing=south": { + "model": "joy:block/demi_s_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/demi_s_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/demiboy_shark.json b/src/main/resources/assets/joy/blockstates/demiboy_shark.json new file mode 100644 index 0000000..3edf942 --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/demiboy_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/demiboy_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/demiboy_shark" + }, + "facing=south": { + "model": "joy:block/demiboy_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/demiboy_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/demigirl_shark.json b/src/main/resources/assets/joy/blockstates/demigirl_shark.json new file mode 100644 index 0000000..1494dbf --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/demigirl_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/demigirl_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/demigirl_shark" + }, + "facing=south": { + "model": "joy:block/demigirl_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/demigirl_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/enby_shark.json b/src/main/resources/assets/joy/blockstates/enby_shark.json new file mode 100644 index 0000000..32478b0 --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/enby_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/enby_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/enby_shark" + }, + "facing=south": { + "model": "joy:block/enby_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/enby_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/gay_shark.json b/src/main/resources/assets/joy/blockstates/gay_shark.json new file mode 100644 index 0000000..b512849 --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/gay_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/gay_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/gay_shark" + }, + "facing=south": { + "model": "joy:block/gay_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/gay_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/genderfluid_shark.json b/src/main/resources/assets/joy/blockstates/genderfluid_shark.json new file mode 100644 index 0000000..702718a --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/genderfluid_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/genderfluid_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/genderfluid_shark" + }, + "facing=south": { + "model": "joy:block/genderfluid_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/genderfluid_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/genderqueer_shark.json b/src/main/resources/assets/joy/blockstates/genderqueer_shark.json new file mode 100644 index 0000000..f59cd64 --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/genderqueer_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/genderqueer_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/genderqueer_shark" + }, + "facing=south": { + "model": "joy:block/genderqueer_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/genderqueer_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/grey_r_shark.json b/src/main/resources/assets/joy/blockstates/grey_r_shark.json new file mode 100644 index 0000000..6dbe032 --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/grey_r_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/grey_r_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/grey_r_shark" + }, + "facing=south": { + "model": "joy:block/grey_r_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/grey_r_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/grey_s_shark.json b/src/main/resources/assets/joy/blockstates/grey_s_shark.json new file mode 100644 index 0000000..b7444fa --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/grey_s_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/grey_s_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/grey_s_shark" + }, + "facing=south": { + "model": "joy:block/grey_s_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/grey_s_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/greyrose_shark.json b/src/main/resources/assets/joy/blockstates/greyrose_shark.json new file mode 100644 index 0000000..c9f7855 --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/greyrose_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/greyrose_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/greyrose_shark" + }, + "facing=south": { + "model": "joy:block/greyrose_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/greyrose_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/intersex_shark.json b/src/main/resources/assets/joy/blockstates/intersex_shark.json new file mode 100644 index 0000000..f58d39d --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/intersex_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/intersex_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/intersex_shark" + }, + "facing=south": { + "model": "joy:block/intersex_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/intersex_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/lesbian_shark.json b/src/main/resources/assets/joy/blockstates/lesbian_shark.json new file mode 100644 index 0000000..b0bfc7c --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/lesbian_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/lesbian_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/lesbian_shark" + }, + "facing=south": { + "model": "joy:block/lesbian_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/lesbian_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/pan_shark.json b/src/main/resources/assets/joy/blockstates/pan_shark.json new file mode 100644 index 0000000..954bf7a --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/pan_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/pan_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/pan_shark" + }, + "facing=south": { + "model": "joy:block/pan_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/pan_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/poly_shark.json b/src/main/resources/assets/joy/blockstates/poly_shark.json new file mode 100644 index 0000000..1b4a35f --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/poly_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/poly_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/poly_shark" + }, + "facing=south": { + "model": "joy:block/poly_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/poly_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/pride_shark.json b/src/main/resources/assets/joy/blockstates/pride_shark.json new file mode 100644 index 0000000..a0aff0c --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/pride_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/pride_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/pride_shark" + }, + "facing=south": { + "model": "joy:block/pride_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/pride_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/blockstates/trans_shark.json b/src/main/resources/assets/joy/blockstates/trans_shark.json new file mode 100644 index 0000000..d686a8a --- /dev/null +++ b/src/main/resources/assets/joy/blockstates/trans_shark.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "joy:block/trans_shark", + "y": 90 + }, + "facing=north": { + "model": "joy:block/trans_shark" + }, + "facing=south": { + "model": "joy:block/trans_shark", + "y": 180 + }, + "facing=west": { + "model": "joy:block/trans_shark", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/models/block/ace_shark.json b/src/main/resources/assets/joy/models/block/ace_shark.json new file mode 100644 index 0000000..9ba2878 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/ace_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/ace" + } +} diff --git a/src/main/resources/assets/joy/models/block/agender_shark.json b/src/main/resources/assets/joy/models/block/agender_shark.json new file mode 100644 index 0000000..9a1d442 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/agender_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/agender" + } +} diff --git a/src/main/resources/assets/joy/models/block/aro_shark.json b/src/main/resources/assets/joy/models/block/aro_shark.json new file mode 100644 index 0000000..2dfd812 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/aro_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/aro" + } +} diff --git a/src/main/resources/assets/joy/models/block/aroace_shark.json b/src/main/resources/assets/joy/models/block/aroace_shark.json new file mode 100644 index 0000000..0059fa4 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/aroace_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/aroace" + } +} diff --git a/src/main/resources/assets/joy/models/block/bi_shark.json b/src/main/resources/assets/joy/models/block/bi_shark.json new file mode 100644 index 0000000..d86f303 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/bi_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/bi" + } +} diff --git a/src/main/resources/assets/joy/models/block/blue_shark.json b/src/main/resources/assets/joy/models/block/blue_shark.json index 9467ce8..27ee325 100644 --- a/src/main/resources/assets/joy/models/block/blue_shark.json +++ b/src/main/resources/assets/joy/models/block/blue_shark.json @@ -1,5 +1,5 @@ { - "credit": "original model by hibii, changes made by musicalskele", + "credit": "original model by hibii, changes made by musicalskele", "texture_size": [32, 32], "textures": { "0": "joy:block/blue_shark", @@ -7,18 +7,10 @@ }, "elements": [ { - "name": "shork", + "name": "shork", "from": [6, 0, 0], "to": [10, 4, 9], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 0, - -6, - 0 - ] - }, + "rotation": {"angle": 0, "axis": "y", "origin": [0, -6, 0]}, "faces": { "north": {"uv": [4.5, 4.5, 6.5, 6.5], "texture": "#0"}, "east": {"uv": [0, 4.5, 4.5, 6.5], "texture": "#0"}, @@ -32,15 +24,7 @@ "name": "tail", "from": [7, 1, 9], "to": [9, 3, 16], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 2, - 15.5 - ] - }, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 2, 15.5]}, "faces": { "north": {"uv": [3.5, 10, 4.5, 11], "texture": "#0"}, "east": {"uv": [0, 10, 3.5, 11], "texture": "#0"}, @@ -54,15 +38,7 @@ "name": "tail base", "from": [6.5, 0.5, 9], "to": [9.5, 3.5, 11], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 0, - -6, - 0 - ] - }, + "rotation": {"angle": 0, "axis": "y", "origin": [0, -6, 0]}, "faces": { "north": {"uv": [1, 12, 2.5, 13.5], "texture": "#0"}, "east": {"uv": [0, 12, 1, 13.5], "texture": "#0"}, @@ -76,15 +52,7 @@ "name": "tail stabilizer", "from": [7.5, 2, 14], "to": [8.5, 6, 16], - "rotation": { - "angle": 22.5, - "axis": "x", - "origin": [ - 8, - 3, - 14 - ] - }, + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 3, 14]}, "faces": { "north": {"uv": [1, 1, 1.5, 3], "texture": "#0"}, "east": {"uv": [0, 1, 1, 3], "texture": "#0"}, @@ -95,262 +63,24 @@ } }, { - "name": "tail stabilizer", - "from": [ - 7.5, - 0, - 13 - ], - "to": [ - 8.5, - 3, - 15 - ], - "rotation": { - "angle": -45, - "axis": "x", - "origin": [ - 8, - 3, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 8, - 2, - 9.5 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 0.5, - 8, - 1.5, - 9.5 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 3, - 8, - 3.5, - 9.5 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 2, - 8, - 3, - 9.5 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 2, - 8, - 1.5, - 7 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 2.5, - 7, - 2, - 8 - ], - "texture": "#0" - } - } - }, - { - "name": "left wing", - "from": [ - 2, - 8, - 4 - ], - "to": [ - 7, - 8, - 10 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 11, - 6, - 9 - ] - }, - "faces": { - "north": { - "uv": [ - 16, - 0, - 16, - 0 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 16, - 0, - 16, - 0 - ], - "rotation": 270, - "texture": "#0" - }, - "south": { - "uv": [ - 16, - 0, - 16, - 0 - ], - "rotation": 180, - "texture": "#0" - }, - "west": { - "uv": [ - 16, - 0, - 16, - 0 - ], - "rotation": 90, - "texture": "#0" - }, - "up": { - "uv": [ - 13, - 4, - 16, - 6.5 - ], - "rotation": 180, - "texture": "#0" - }, - "down": { - "uv": [ - 13, - 4, - 16, - 6.5 - ], - "rotation": 270, - "texture": "#0" - } - } - }, - { - "name": "right wing", - "from": [ - 9, - 8, - 4 - ], - "to": [ - 14, - 8, - 10 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 5, - 6, - 9 - ] - }, - "faces": { - "north": { - "uv": [ - 16, - 0, - 16, - 0 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 16, - 0, - 16, - 0 - ], - "rotation": 90, - "texture": "#0" - }, - "south": { - "uv": [ - 16, - 0, - 16, - 0 - ], - "rotation": 180, - "texture": "#0" - }, - "west": { - "uv": [ - 16, - 0, - 16, - 0 - ], - "rotation": 270, - "texture": "#0" - }, - "up": { - "uv": [ - 16, - 4, - 13, - 6.5 - ], - "rotation": 180, - "texture": "#0" - }, - "down": { - "uv": [ - 13, - 6.5, - 16, - 4 - ], - "rotation": 270, - "texture": "#0" - } - } - }, - { + "name": "tail stabilizer", + "from": [7.5, 0, 13], + "to": [8.5, 3, 15], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 3, 15]}, + "faces": { + "north": {"uv": [1.5, 8, 2, 9.5], "texture": "#0"}, + "east": {"uv": [0.5, 8, 1.5, 9.5], "texture": "#0"}, + "south": {"uv": [3, 8, 3.5, 9.5], "texture": "#0"}, + "west": {"uv": [2, 8, 3, 9.5], "texture": "#0"}, + "up": {"uv": [2, 8, 1.5, 7], "texture": "#0"}, + "down": {"uv": [2.5, 7, 2, 8], "texture": "#0"} + } + }, + { "name": "left pectoral", "from": [5, -1, 6], "to": [6, 1, 10], - "rotation": { - "angle": 22.5, - "axis": "x", - "origin": [ - 6, - 1, - 7 - ] - }, + "rotation": {"angle": 22.5, "axis": "x", "origin": [6, 1, 7]}, "faces": { "north": {"uv": [7.5, 8.5, 8, 9.5], "texture": "#0"}, "east": {"uv": [5.5, 8.5, 7.5, 9.5], "texture": "#0"}, @@ -365,15 +95,7 @@ "from": [10, -1, 6], "to": [11, 1, 10], "shade": false, - "rotation": { - "angle": 22.5, - "axis": "x", - "origin": [ - 10, - 1, - 7 - ] - }, + "rotation": {"angle": 22.5, "axis": "x", "origin": [10, 1, 7]}, "faces": { "north": {"uv": [8, 8.5, 7.5, 9.5], "texture": "#0"}, "east": {"uv": [10, 8.5, 8, 9.5], "texture": "#0"}, @@ -386,57 +108,13 @@ { "name": "dorsal fin", "from": [7, 3, 5], - "to": [ - 9, - 7, - 8 - ], - "rotation": { - "angle": 22.5, - "axis": "x", - "origin": [ - 8, - 4, - 7 - ] - }, + "to": [9, 7, 8], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 4, 7]}, "faces": { - "north": { - "uv": [ - 10, - 1.5, - 11, - 3.5 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 8.5, - 1.5, - 10, - 3.5 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 12.5, - 1.5, - 13.5, - 3.5 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 11, - 1.5, - 12.5, - 3.5 - ], - "texture": "#0" - }, + "north": {"uv": [10, 1.5, 11, 3.5], "texture": "#0"}, + "east": {"uv": [8.5, 1.5, 10, 3.5], "texture": "#0"}, + "south": {"uv": [12.5, 1.5, 13.5, 3.5], "texture": "#0"}, + "west": {"uv": [11, 1.5, 12.5, 3.5], "texture": "#0"}, "up": {"uv": [11, 1.5, 10, 0], "texture": "#0"}, "down": {"uv": [12, 0, 11, 1.5], "texture": "#0"} } @@ -445,15 +123,7 @@ "name": "back dorsal", "from": [7.5, 2.5, 12], "to": [8.5, 3.5, 13], - "rotation": { - "angle": -22.5, - "axis": "x", - "origin": [ - 8, - 3, - 12.5 - ] - }, + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 3, 12.5]}, "faces": { "north": {"uv": [2.5, 0.5, 3, 1], "texture": "#0"}, "east": {"uv": [2, 0.5, 2.5, 1], "texture": "#0"}, @@ -467,15 +137,7 @@ "name": "mouf back", "from": [6, 0, 1], "to": [10, 1, 1], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 0, - -6, - 0 - ] - }, + "rotation": {"angle": 0, "axis": "y", "origin": [0, -6, 0]}, "faces": { "north": {"uv": [0, 3.5, 2, 4], "texture": "#0"}, "east": {"uv": [0, 3.5, 0, 4], "texture": "#0"}, @@ -489,15 +151,7 @@ "name": "mouf top", "from": [6, 1, 0], "to": [10, 1, 1], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 0, - -6, - 0 - ] - }, + "rotation": {"angle": 0, "axis": "y", "origin": [0, -6, 0]}, "faces": { "north": {"uv": [0.5, 3.5, 2.5, 3.5], "texture": "#0"}, "east": {"uv": [0, 3.5, 0.5, 3.5], "texture": "#0"}, @@ -508,122 +162,42 @@ } } ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 140, - -60, - 105 - ], - "translation": [ - -8, - 3.75, - 6.25 - ], - "scale": [ - 1.15, - 1.15, - 1.15 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 140, - -60, - 105 - ], - "translation": [ - -8, - 1.5, - 6 - ], - "scale": [ - 1.15, - 1.15, - 1.15 - ] - }, - "firstperson_righthand": { - "rotation": [ - 70, - -55, - 60 - ], - "translation": [ - -3.25, - 5, - 1 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 70, - -55, - 60 - ], - "translation": [ - -3.25, - 5, - 1 - ] - }, - "ground": { - "rotation": [ - 0, - 90, - 0 - ], - "translation": [ - 0, - 2.25, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "gui": { - "rotation": [ - 30, - 135, - 0 - ], - "translation": [ - 0.19, - 5, - 0 - ], - "scale": [ - 1.15, - 1.15, - 1.15 - ] - }, - "head": { - "translation": [ - 0, - 16, - 0 - ], - "scale": [ - 1.25, - 1.25, - 1.25 - ] - }, - "fixed": { - "rotation": [ - 0, - -90, - 0 - ], - "translation": [ - 0, - 5, - -3 - ] - } - } -} + "display": { + "thirdperson_righthand": { + "rotation": [140, -60, 105], + "translation": [-8, 3.75, 6.25], + "scale": [1.15, 1.15, 1.15] + }, + "thirdperson_lefthand": { + "rotation": [140, -60, 105], + "translation": [-8, 1.5, 6], + "scale": [1.15, 1.15, 1.15] + }, + "firstperson_righthand": { + "rotation": [70, -55, 60], + "translation": [-3.25, 5, 1] + }, + "firstperson_lefthand": { + "rotation": [70, -55, 60], + "translation": [-3.25, 5, 1] + }, + "ground": { + "rotation": [0, 90, 0], + "translation": [0, 2.25, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 135, 0], + "translation": [0.19, 5, 0], + "scale": [1.15, 1.15, 1.15] + }, + "head": { + "translation": [0, 16, 0], + "scale": [1.25, 1.25, 1.25] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [0, 5, -3] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joy/models/block/brown_bear.json b/src/main/resources/assets/joy/models/block/brown_bear.json new file mode 100644 index 0000000..ed948d7 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/brown_bear.json @@ -0,0 +1,811 @@ +{ + "credit": "SpookyEna", + "texture_size": [ + 64, + 64 + ], + "textures": { + "0": "joy:block/brown_bear", + "particle": "joy:block/brown_bear" + }, + "elements": [ + { + "name": "head", + "from": [ + 4, + 10, + 7 + ], + "to": [ + 12, + 16, + 14 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 15.5, + 10.5 + ] + }, + "faces": { + "north": { + "uv": [ + 1.75, + 7.75, + 3.75, + 9.25 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 0, + 7.75, + 1.75, + 9.25 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 5.5, + 7.75, + 7.5, + 9.25 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 3.75, + 7.75, + 5.5, + 9.25 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 3.75, + 7.75, + 1.75, + 6 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 5.75, + 6, + 3.75, + 7.75 + ], + "texture": "#0" + } + } + }, + { + "name": "snout", + "from": [ + 6, + 10.5, + 5 + ], + "to": [ + 10, + 13.5, + 7 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 10, + 16, + 8.5 + ] + }, + "faces": { + "north": { + "uv": [ + 8, + 9, + 9, + 9.75 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 7.5, + 9, + 8, + 9.75 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 9.5, + 9, + 10.5, + 9.75 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 9, + 9, + 9.5, + 9.75 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 9, + 9, + 8, + 8.5 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 10, + 8.5, + 9, + 9 + ], + "texture": "#0" + } + } + }, + { + "name": "ear_right", + "from": [ + 12.75, + 15.75, + 10 + ], + "to": [ + 14.75, + 17.75, + 12 + ], + "rotation": { + "angle": -45, + "axis": "z", + "origin": [ + 12, + 18.5, + 11 + ] + }, + "faces": { + "north": { + "uv": [ + 2.5, + 9.75, + 3, + 10.25 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 2, + 9.75, + 2.5, + 10.25 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 3.5, + 9.75, + 4, + 10.25 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 3, + 9.75, + 3.5, + 10.25 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 3, + 9.75, + 2.5, + 9.25 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 3.5, + 9.25, + 3, + 9.75 + ], + "texture": "#0" + } + } + }, + { + "name": "ear_left", + "from": [ + 1.25, + 15.75, + 10 + ], + "to": [ + 3.25, + 17.75, + 12 + ], + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 4, + 18.5, + 11 + ] + }, + "faces": { + "north": { + "uv": [ + 0.5, + 9.75, + 1, + 10.25 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 0, + 9.75, + 0.5, + 10.25 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 1.5, + 9.75, + 2, + 10.25 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 1, + 9.75, + 1.5, + 10.25 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 1, + 9.75, + 0.5, + 9.25 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 1.5, + 9.25, + 1, + 9.75 + ], + "texture": "#0" + } + } + }, + { + "name": "body", + "from": [ + 2, + 0, + 4 + ], + "to": [ + 14, + 10, + 15 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 6, + 10 + ] + }, + "faces": { + "north": { + "uv": [ + 2.75, + 3.25, + 5.75, + 5.75 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 0, + 3.25, + 2.75, + 5.75 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 8.5, + 3.25, + 11.5, + 5.75 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 5.75, + 3.25, + 8.5, + 5.75 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 5.75, + 2.75, + 2.75, + 0 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 8.75, + 0, + 5.75, + 2.75 + ], + "texture": "#0" + } + } + }, + { + "name": "foot_left", + "from": [ + 2, + -0.01, + 2 + ], + "to": [ + 5, + 1.99, + 5 + ], + "rotation": { + "angle": 22.5, + "axis": "y", + "origin": [ + 3.5, + 0.9375, + 5 + ] + }, + "faces": { + "north": { + "uv": [ + 9.5, + 2, + 10.25, + 2.5 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 8.75, + 2, + 9.5, + 2.5 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 11, + 2, + 11.75, + 2.5 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 10.25, + 2, + 11, + 2.5 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 10.25, + 2, + 9.5, + 1.25 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 11, + 1.25, + 10.25, + 2 + ], + "texture": "#0" + } + } + }, + { + "name": "foot_right", + "from": [ + 11, + -0.01, + 2 + ], + "to": [ + 14, + 1.99, + 5 + ], + "rotation": { + "angle": -22.5, + "axis": "y", + "origin": [ + 12.5, + 0.9375, + 5 + ] + }, + "faces": { + "north": { + "uv": [ + 9.5, + 0.75, + 10.25, + 1.25 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 8.75, + 0.75, + 9.5, + 1.25 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 11, + 0.75, + 11.75, + 1.25 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 10.25, + 0.75, + 11, + 1.25 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 10.25, + 0.75, + 9.5, + 0 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 11, + 0, + 10.25, + 0.75 + ], + "texture": "#0" + } + } + }, + { + "name": "arm_left", + "from": [ + 1, + 3, + 10 + ], + "to": [ + 3, + 10, + 13 + ], + "rotation": { + "angle": -22.5, + "axis": "z", + "origin": [ + 1.089, + 7.10946, + 11.5 + ] + }, + "faces": { + "north": { + "uv": [ + 8.25, + 6.5, + 8.75, + 8.5 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 7.5, + 6.5, + 8.25, + 8.5 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 9.5, + 6.5, + 10, + 8.5 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 8.75, + 6.5, + 9.5, + 8.5 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 8.75, + 6.5, + 8.25, + 5.75 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 9.25, + 5.75, + 8.75, + 6.5 + ], + "texture": "#0" + } + } + }, + { + "name": "arm_right", + "from": [ + 13, + 3, + 10 + ], + "to": [ + 15, + 10, + 13 + ], + "rotation": { + "angle": 22.5, + "axis": "z", + "origin": [ + 14.664, + 7.10946, + 11.5 + ] + }, + "faces": { + "north": { + "uv": [ + 0.75, + 0.75, + 1.25, + 2.75 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 0, + 0.75, + 0.75, + 2.75 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 2, + 0.75, + 2.5, + 2.75 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 1.25, + 0.75, + 2, + 2.75 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 1.25, + 0.75, + 0.75, + 0 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 1.75, + 0, + 1.25, + 0.75 + ], + "texture": "#0" + } + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [ + 36.12, + -2.36, + -17.3 + ], + "translation": [ + -1.5, + 1, + 0.25 + ], + "scale": [ + 0.9, + 0.9, + 0.9 + ] + }, + "firstperson_righthand": { + "rotation": [ + 0, + 0, + -5 + ], + "translation": [ + 0, + -1.25, + 0 + ] + }, + "ground": { + "translation": [ + 0, + 3, + 0 + ], + "scale": [ + 0.35, + 0.35, + 0.34 + ] + }, + "gui": { + "rotation": [ + 30, + 135, + 0 + ], + "translation": [ + -0.5, + 0, + 0 + ], + "scale": [ + 0.71, + 0.71, + 0.71 + ] + }, + "head": { + "translation": [ + 0, + 14, + 0 + ] + }, + "fixed": { + "translation": [ + 0, + 0, + -4 + ] + } + }, + "groups": [ + { + "name": "head", + "origin": [ + 4, + 19, + 11 + ], + "color": 0, + "children": [ + 0, + 1, + 2, + 3 + ] + }, + 4, + 5, + 6, + 7, + 8 + ] +} diff --git a/src/main/resources/assets/joy/models/block/demi_r_shark.json b/src/main/resources/assets/joy/models/block/demi_r_shark.json new file mode 100644 index 0000000..1db0c4d --- /dev/null +++ b/src/main/resources/assets/joy/models/block/demi_r_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/demi_r" + } +} diff --git a/src/main/resources/assets/joy/models/block/demi_s_shark.json b/src/main/resources/assets/joy/models/block/demi_s_shark.json new file mode 100644 index 0000000..e3744b3 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/demi_s_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/demi_s" + } +} diff --git a/src/main/resources/assets/joy/models/block/demiboy_shark.json b/src/main/resources/assets/joy/models/block/demiboy_shark.json new file mode 100644 index 0000000..99cd4d0 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/demiboy_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/demiboy" + } +} diff --git a/src/main/resources/assets/joy/models/block/demigirl_shark.json b/src/main/resources/assets/joy/models/block/demigirl_shark.json new file mode 100644 index 0000000..7574f17 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/demigirl_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/demigirl" + } +} diff --git a/src/main/resources/assets/joy/models/block/enby_shark.json b/src/main/resources/assets/joy/models/block/enby_shark.json new file mode 100644 index 0000000..07814f4 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/enby_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/enby" + } +} diff --git a/src/main/resources/assets/joy/models/block/gay_shark.json b/src/main/resources/assets/joy/models/block/gay_shark.json new file mode 100644 index 0000000..dfd3342 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/gay_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/gay" + } +} diff --git a/src/main/resources/assets/joy/models/block/genderfluid_shark.json b/src/main/resources/assets/joy/models/block/genderfluid_shark.json new file mode 100644 index 0000000..ffe167e --- /dev/null +++ b/src/main/resources/assets/joy/models/block/genderfluid_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/genderfluid" + } +} diff --git a/src/main/resources/assets/joy/models/block/genderqueer_shark.json b/src/main/resources/assets/joy/models/block/genderqueer_shark.json new file mode 100644 index 0000000..4f9fe52 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/genderqueer_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/genderqueer" + } +} diff --git a/src/main/resources/assets/joy/models/block/grey_r_shark.json b/src/main/resources/assets/joy/models/block/grey_r_shark.json new file mode 100644 index 0000000..36e1e3d --- /dev/null +++ b/src/main/resources/assets/joy/models/block/grey_r_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/grey_r" + } +} diff --git a/src/main/resources/assets/joy/models/block/grey_s_shark.json b/src/main/resources/assets/joy/models/block/grey_s_shark.json new file mode 100644 index 0000000..31364c5 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/grey_s_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/grey_s" + } +} diff --git a/src/main/resources/assets/joy/models/block/greyrose_shark.json b/src/main/resources/assets/joy/models/block/greyrose_shark.json new file mode 100644 index 0000000..aeffe02 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/greyrose_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/greyrose" + } +} diff --git a/src/main/resources/assets/joy/models/block/intersex_shark.json b/src/main/resources/assets/joy/models/block/intersex_shark.json new file mode 100644 index 0000000..88654cc --- /dev/null +++ b/src/main/resources/assets/joy/models/block/intersex_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/intersex" + } +} diff --git a/src/main/resources/assets/joy/models/block/lesbian_shark.json b/src/main/resources/assets/joy/models/block/lesbian_shark.json new file mode 100644 index 0000000..3fb6778 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/lesbian_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/lesbian" + } +} diff --git a/src/main/resources/assets/joy/models/block/pan_shark.json b/src/main/resources/assets/joy/models/block/pan_shark.json new file mode 100644 index 0000000..92374a9 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/pan_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/pan" + } +} diff --git a/src/main/resources/assets/joy/models/block/poly_shark.json b/src/main/resources/assets/joy/models/block/poly_shark.json new file mode 100644 index 0000000..c136324 --- /dev/null +++ b/src/main/resources/assets/joy/models/block/poly_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/poly" + } +} diff --git a/src/main/resources/assets/joy/models/block/pride_shark.json b/src/main/resources/assets/joy/models/block/pride_shark.json new file mode 100644 index 0000000..3bed85d --- /dev/null +++ b/src/main/resources/assets/joy/models/block/pride_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/pride" + } +} diff --git a/src/main/resources/assets/joy/models/block/trans_shark.json b/src/main/resources/assets/joy/models/block/trans_shark.json new file mode 100644 index 0000000..32701ae --- /dev/null +++ b/src/main/resources/assets/joy/models/block/trans_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "joy:block/blue_shark", + "textures": { + "0": "joy:block/pride_sharks/trans" + } +} diff --git a/src/main/resources/assets/joy/models/item/ace_shark.json b/src/main/resources/assets/joy/models/item/ace_shark.json new file mode 100644 index 0000000..168f108 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/ace_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/ace_shark" +} diff --git a/src/main/resources/assets/joy/models/item/agender_shark.json b/src/main/resources/assets/joy/models/item/agender_shark.json new file mode 100644 index 0000000..087dc8a --- /dev/null +++ b/src/main/resources/assets/joy/models/item/agender_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/agender_shark" +} diff --git a/src/main/resources/assets/joy/models/item/aro_shark.json b/src/main/resources/assets/joy/models/item/aro_shark.json new file mode 100644 index 0000000..0f204dd --- /dev/null +++ b/src/main/resources/assets/joy/models/item/aro_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/aro_shark" +} diff --git a/src/main/resources/assets/joy/models/item/aroace_shark.json b/src/main/resources/assets/joy/models/item/aroace_shark.json new file mode 100644 index 0000000..5550921 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/aroace_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/aroace_shark" +} diff --git a/src/main/resources/assets/joy/models/item/bi_shark.json b/src/main/resources/assets/joy/models/item/bi_shark.json new file mode 100644 index 0000000..e2bf519 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/bi_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/bi_shark" +} diff --git a/src/main/resources/assets/joy/models/item/brown_bear.json b/src/main/resources/assets/joy/models/item/brown_bear.json new file mode 100644 index 0000000..c8dc30b --- /dev/null +++ b/src/main/resources/assets/joy/models/item/brown_bear.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/brown_bear" +} diff --git a/src/main/resources/assets/joy/models/item/demi_r_shark.json b/src/main/resources/assets/joy/models/item/demi_r_shark.json new file mode 100644 index 0000000..510d5a2 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/demi_r_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/demi_r_shark" +} diff --git a/src/main/resources/assets/joy/models/item/demi_s_shark.json b/src/main/resources/assets/joy/models/item/demi_s_shark.json new file mode 100644 index 0000000..b0905f7 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/demi_s_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/demi_s_shark" +} diff --git a/src/main/resources/assets/joy/models/item/demiboy_shark.json b/src/main/resources/assets/joy/models/item/demiboy_shark.json new file mode 100644 index 0000000..fa97b16 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/demiboy_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/demiboy_shark" +} diff --git a/src/main/resources/assets/joy/models/item/demigirl_shark.json b/src/main/resources/assets/joy/models/item/demigirl_shark.json new file mode 100644 index 0000000..dc7d8b6 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/demigirl_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/demigirl_shark" +} diff --git a/src/main/resources/assets/joy/models/item/enby_shark.json b/src/main/resources/assets/joy/models/item/enby_shark.json new file mode 100644 index 0000000..0017dfc --- /dev/null +++ b/src/main/resources/assets/joy/models/item/enby_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/enby_shark" +} diff --git a/src/main/resources/assets/joy/models/item/gay_shark.json b/src/main/resources/assets/joy/models/item/gay_shark.json new file mode 100644 index 0000000..9c89599 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/gay_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/gay_shark" +} diff --git a/src/main/resources/assets/joy/models/item/genderfluid_shark.json b/src/main/resources/assets/joy/models/item/genderfluid_shark.json new file mode 100644 index 0000000..c0fc6e7 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/genderfluid_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/genderfluid_shark" +} diff --git a/src/main/resources/assets/joy/models/item/genderqueer_shark.json b/src/main/resources/assets/joy/models/item/genderqueer_shark.json new file mode 100644 index 0000000..baaf666 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/genderqueer_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/genderqueer_shark" +} diff --git a/src/main/resources/assets/joy/models/item/grey_r_shark.json b/src/main/resources/assets/joy/models/item/grey_r_shark.json new file mode 100644 index 0000000..b819bc3 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/grey_r_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/grey_r_shark" +} diff --git a/src/main/resources/assets/joy/models/item/grey_s_shark.json b/src/main/resources/assets/joy/models/item/grey_s_shark.json new file mode 100644 index 0000000..c679456 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/grey_s_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/grey_s_shark" +} diff --git a/src/main/resources/assets/joy/models/item/greyrose_shark.json b/src/main/resources/assets/joy/models/item/greyrose_shark.json new file mode 100644 index 0000000..5d29cb1 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/greyrose_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/greyrose_shark" +} diff --git a/src/main/resources/assets/joy/models/item/intersex_shark.json b/src/main/resources/assets/joy/models/item/intersex_shark.json new file mode 100644 index 0000000..30aafed --- /dev/null +++ b/src/main/resources/assets/joy/models/item/intersex_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/intersex_shark" +} diff --git a/src/main/resources/assets/joy/models/item/lesbian_shark.json b/src/main/resources/assets/joy/models/item/lesbian_shark.json new file mode 100644 index 0000000..e58f3f3 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/lesbian_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/lesbian_shark" +} diff --git a/src/main/resources/assets/joy/models/item/pan_shark.json b/src/main/resources/assets/joy/models/item/pan_shark.json new file mode 100644 index 0000000..ab68db6 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/pan_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/pan_shark" +} diff --git a/src/main/resources/assets/joy/models/item/poly_shark.json b/src/main/resources/assets/joy/models/item/poly_shark.json new file mode 100644 index 0000000..27e8984 --- /dev/null +++ b/src/main/resources/assets/joy/models/item/poly_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/poly_shark" +} diff --git a/src/main/resources/assets/joy/models/item/pride_shark.json b/src/main/resources/assets/joy/models/item/pride_shark.json new file mode 100644 index 0000000..c2c2dca --- /dev/null +++ b/src/main/resources/assets/joy/models/item/pride_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/pride_shark" +} diff --git a/src/main/resources/assets/joy/models/item/trans_shark.json b/src/main/resources/assets/joy/models/item/trans_shark.json new file mode 100644 index 0000000..4ca26bf --- /dev/null +++ b/src/main/resources/assets/joy/models/item/trans_shark.json @@ -0,0 +1,3 @@ +{ + "parent": "joy:block/trans_shark" +} diff --git a/src/main/resources/assets/joy/textures/block/brown_bear.png b/src/main/resources/assets/joy/textures/block/brown_bear.png new file mode 100644 index 0000000..41f540c Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/brown_bear.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/ace.png b/src/main/resources/assets/joy/textures/block/pride_sharks/ace.png new file mode 100644 index 0000000..33b5db2 Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/ace.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/agender.png b/src/main/resources/assets/joy/textures/block/pride_sharks/agender.png new file mode 100644 index 0000000..f50b34c Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/agender.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/aro.png b/src/main/resources/assets/joy/textures/block/pride_sharks/aro.png new file mode 100644 index 0000000..c5ca527 Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/aro.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/aroace.png b/src/main/resources/assets/joy/textures/block/pride_sharks/aroace.png new file mode 100644 index 0000000..5eef759 Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/aroace.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/bi.png b/src/main/resources/assets/joy/textures/block/pride_sharks/bi.png new file mode 100644 index 0000000..b6466bd Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/bi.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/demi_r.png b/src/main/resources/assets/joy/textures/block/pride_sharks/demi_r.png new file mode 100644 index 0000000..a37e9c7 Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/demi_r.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/demi_s.png b/src/main/resources/assets/joy/textures/block/pride_sharks/demi_s.png new file mode 100644 index 0000000..2cba441 Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/demi_s.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/demiboy.png b/src/main/resources/assets/joy/textures/block/pride_sharks/demiboy.png new file mode 100644 index 0000000..a08e373 Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/demiboy.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/demigirl.png b/src/main/resources/assets/joy/textures/block/pride_sharks/demigirl.png new file mode 100644 index 0000000..e654a61 Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/demigirl.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/enby.png b/src/main/resources/assets/joy/textures/block/pride_sharks/enby.png new file mode 100644 index 0000000..233c695 Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/enby.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/gay.png b/src/main/resources/assets/joy/textures/block/pride_sharks/gay.png new file mode 100644 index 0000000..f382656 Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/gay.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/genderfluid.png b/src/main/resources/assets/joy/textures/block/pride_sharks/genderfluid.png new file mode 100644 index 0000000..ab99a7e Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/genderfluid.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/genderqueer.png b/src/main/resources/assets/joy/textures/block/pride_sharks/genderqueer.png new file mode 100644 index 0000000..8cc63bf Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/genderqueer.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/grey_r.png b/src/main/resources/assets/joy/textures/block/pride_sharks/grey_r.png new file mode 100644 index 0000000..b8cd83d Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/grey_r.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/grey_s.png b/src/main/resources/assets/joy/textures/block/pride_sharks/grey_s.png new file mode 100644 index 0000000..36ce34d Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/grey_s.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/greyrose.png b/src/main/resources/assets/joy/textures/block/pride_sharks/greyrose.png new file mode 100644 index 0000000..35b270f Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/greyrose.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/intersex.png b/src/main/resources/assets/joy/textures/block/pride_sharks/intersex.png new file mode 100644 index 0000000..c8ba4a2 Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/intersex.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/lesbian.png b/src/main/resources/assets/joy/textures/block/pride_sharks/lesbian.png new file mode 100644 index 0000000..2b7aa70 Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/lesbian.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/pan.png b/src/main/resources/assets/joy/textures/block/pride_sharks/pan.png new file mode 100644 index 0000000..e8dfa7c Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/pan.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/poly.png b/src/main/resources/assets/joy/textures/block/pride_sharks/poly.png new file mode 100644 index 0000000..cf1378b Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/poly.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/pride.png b/src/main/resources/assets/joy/textures/block/pride_sharks/pride.png new file mode 100644 index 0000000..5fbf6fc Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/pride.png differ diff --git a/src/main/resources/assets/joy/textures/block/pride_sharks/trans.png b/src/main/resources/assets/joy/textures/block/pride_sharks/trans.png new file mode 100644 index 0000000..175f06d Binary files /dev/null and b/src/main/resources/assets/joy/textures/block/pride_sharks/trans.png differ diff --git a/src/main/resources/assets/minecraft/texts/credits.json b/src/main/resources/assets/minecraft/texts/credits.json index afec619..90cf215 100644 --- a/src/main/resources/assets/minecraft/texts/credits.json +++ b/src/main/resources/assets/minecraft/texts/credits.json @@ -4442,7 +4442,8 @@ "title": "Other mods used in Joy", "names": [ "Hibi - Blåhaj Mod (Fabric)", - "DaFuqs - Blåhaj Mod (Fabric)" + "DaFuqs - Blåhaj Mod (Fabric)", + "musicalskele - Blåhaj Mod (Fabric)" ] } ] diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e2eef57..d5b82d3 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -18,7 +18,8 @@ "contributors": [ "CallMeEchoCodes", "hibi (blahaj)", - "DaFuqs (blahaj)" + "DaFuqs (blahaj)", + "musicalskele (blahaj)" ], "contact": { "homepage": "https://pridecraft.gay/",