From 1e079d1a6cb53da15cdcb5b0efb99aa0faebc827 Mon Sep 17 00:00:00 2001 From: blryface <124838505+blryface@users.noreply.github.com> Date: Mon, 21 Oct 2024 13:46:36 -0300 Subject: [PATCH] Readd spawn egg item models --- .../assets/joy/models/item/axolotl_spawn_egg.json | 6 ------ .../assets/joy/models/item/bii_spawn_egg.json | 6 ------ .../assets/joy/models/item/enbee_spawn_egg.json | 6 ------ .../assets/joy/models/item/frog_spawn_egg.json | 6 ------ .../assets/joy/models/item/sniffer_spawn_egg.json | 6 ------ .../assets/joy/models/item/sock_fox_spawn_egg.json | 6 ------ .../assets/joy/models/item/trans_bee_spawn_egg.json | 6 ------ .../pridecraft/joy/datagen/ModModelProvider.java | 13 ++++++------- .../assets/joy/models/item/axolotl_spawn_egg.json | 3 +++ .../assets/joy/models/item/bii_spawn_egg.json | 3 +++ .../assets/joy/models/item/enbee_spawn_egg.json | 3 +++ .../assets/joy/models/item/frog_spawn_egg.json | 3 +++ .../assets/joy/models/item/slime_spawn_egg.json | 3 +++ .../assets/joy/models/item/sniffer_spawn_egg.json | 3 +++ .../assets/joy/models/item/sock_fox_spawn_egg.json | 3 +++ .../assets/joy/models/item/trans_bee_spawn_egg.json | 3 +++ .../assets/joy/models/item/tree_spawn_egg.json | 3 +++ 17 files changed, 33 insertions(+), 49 deletions(-) delete mode 100644 src/main/generated/assets/joy/models/item/axolotl_spawn_egg.json delete mode 100644 src/main/generated/assets/joy/models/item/bii_spawn_egg.json delete mode 100644 src/main/generated/assets/joy/models/item/enbee_spawn_egg.json delete mode 100644 src/main/generated/assets/joy/models/item/frog_spawn_egg.json delete mode 100644 src/main/generated/assets/joy/models/item/sniffer_spawn_egg.json delete mode 100644 src/main/generated/assets/joy/models/item/sock_fox_spawn_egg.json delete mode 100644 src/main/generated/assets/joy/models/item/trans_bee_spawn_egg.json create mode 100644 src/main/resources/assets/joy/models/item/axolotl_spawn_egg.json create mode 100644 src/main/resources/assets/joy/models/item/bii_spawn_egg.json create mode 100644 src/main/resources/assets/joy/models/item/enbee_spawn_egg.json create mode 100644 src/main/resources/assets/joy/models/item/frog_spawn_egg.json create mode 100644 src/main/resources/assets/joy/models/item/slime_spawn_egg.json create mode 100644 src/main/resources/assets/joy/models/item/sniffer_spawn_egg.json create mode 100644 src/main/resources/assets/joy/models/item/sock_fox_spawn_egg.json create mode 100644 src/main/resources/assets/joy/models/item/trans_bee_spawn_egg.json create mode 100644 src/main/resources/assets/joy/models/item/tree_spawn_egg.json diff --git a/src/main/generated/assets/joy/models/item/axolotl_spawn_egg.json b/src/main/generated/assets/joy/models/item/axolotl_spawn_egg.json deleted file mode 100644 index 6464687..0000000 --- a/src/main/generated/assets/joy/models/item/axolotl_spawn_egg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "joy:item/axolotl_spawn_egg" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/item/bii_spawn_egg.json b/src/main/generated/assets/joy/models/item/bii_spawn_egg.json deleted file mode 100644 index fac41a6..0000000 --- a/src/main/generated/assets/joy/models/item/bii_spawn_egg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "joy:item/bii_spawn_egg" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/item/enbee_spawn_egg.json b/src/main/generated/assets/joy/models/item/enbee_spawn_egg.json deleted file mode 100644 index cbb9a05..0000000 --- a/src/main/generated/assets/joy/models/item/enbee_spawn_egg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "joy:item/enbee_spawn_egg" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/item/frog_spawn_egg.json b/src/main/generated/assets/joy/models/item/frog_spawn_egg.json deleted file mode 100644 index 2bad01c..0000000 --- a/src/main/generated/assets/joy/models/item/frog_spawn_egg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "joy:item/frog_spawn_egg" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/item/sniffer_spawn_egg.json b/src/main/generated/assets/joy/models/item/sniffer_spawn_egg.json deleted file mode 100644 index 4bbd128..0000000 --- a/src/main/generated/assets/joy/models/item/sniffer_spawn_egg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "joy:item/sniffer_spawn_egg" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/item/sock_fox_spawn_egg.json b/src/main/generated/assets/joy/models/item/sock_fox_spawn_egg.json deleted file mode 100644 index cb28e0c..0000000 --- a/src/main/generated/assets/joy/models/item/sock_fox_spawn_egg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "joy:item/sock_fox_spawn_egg" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/joy/models/item/trans_bee_spawn_egg.json b/src/main/generated/assets/joy/models/item/trans_bee_spawn_egg.json deleted file mode 100644 index 5fde225..0000000 --- a/src/main/generated/assets/joy/models/item/trans_bee_spawn_egg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "joy:item/trans_bee_spawn_egg" - } -} \ No newline at end of file diff --git a/src/main/java/gay/pridecraft/joy/datagen/ModModelProvider.java b/src/main/java/gay/pridecraft/joy/datagen/ModModelProvider.java index 89afec0..256f19b 100644 --- a/src/main/java/gay/pridecraft/joy/datagen/ModModelProvider.java +++ b/src/main/java/gay/pridecraft/joy/datagen/ModModelProvider.java @@ -39,12 +39,11 @@ public class ModModelProvider extends FabricModelProvider { itemModelGenerator.register(ModItems.TOTEM_OF_PRIDE, Models.GENERATED); itemModelGenerator.register(ModItems.PRIDE_ELYTRA, Models.GENERATED); itemModelGenerator.register(ModItems.PRIDE_BRUSH, Models.GENERATED); - itemModelGenerator.register(ModItems.SOCK_FOX_SPAWN_EGG, Models.GENERATED); - itemModelGenerator.register(ModItems.BII_SPAWN_EGG, Models.GENERATED); - itemModelGenerator.register(ModItems.ENBEE_SPAWN_EGG, Models.GENERATED); - itemModelGenerator.register(ModItems.TRANS_BEE_SPAWN_EGG, Models.GENERATED); - itemModelGenerator.register(ModItems.AXOLOTL_SPAWN_EGG, Models.GENERATED); - itemModelGenerator.register(ModItems.FROG_SPAWN_EGG, Models.GENERATED); - itemModelGenerator.register(ModItems.SNIFFER_SPAWN_EGG, Models.GENERATED); +// itemModelGenerator.register(ModItems.SOCK_FOX_SPAWN_EGG, Models.GENERATED); +// itemModelGenerator.register(ModItems.BII_SPAWN_EGG, Models.GENERATED); +// itemModelGenerator.register(ModItems.ENBEE_SPAWN_EGG, Models.GENERATED); +// itemModelGenerator.register(ModItems.TRANS_BEE_SPAWN_EGG, Models.GENERATED); +// itemModelGenerator.register(ModItems.AXOLOTL_SPAWN_EGG, Models.GENERATED); +// itemModelGenerator.register(ModItems.SNIFFER_SPAWN_EGG, Models.GENERATED); } } \ No newline at end of file diff --git a/src/main/resources/assets/joy/models/item/axolotl_spawn_egg.json b/src/main/resources/assets/joy/models/item/axolotl_spawn_egg.json new file mode 100644 index 0000000..fb8b11e --- /dev/null +++ b/src/main/resources/assets/joy/models/item/axolotl_spawn_egg.json @@ -0,0 +1,3 @@ +{ + "parent": "item/template_spawn_egg" +} diff --git a/src/main/resources/assets/joy/models/item/bii_spawn_egg.json b/src/main/resources/assets/joy/models/item/bii_spawn_egg.json new file mode 100644 index 0000000..fb8b11e --- /dev/null +++ b/src/main/resources/assets/joy/models/item/bii_spawn_egg.json @@ -0,0 +1,3 @@ +{ + "parent": "item/template_spawn_egg" +} diff --git a/src/main/resources/assets/joy/models/item/enbee_spawn_egg.json b/src/main/resources/assets/joy/models/item/enbee_spawn_egg.json new file mode 100644 index 0000000..fb8b11e --- /dev/null +++ b/src/main/resources/assets/joy/models/item/enbee_spawn_egg.json @@ -0,0 +1,3 @@ +{ + "parent": "item/template_spawn_egg" +} diff --git a/src/main/resources/assets/joy/models/item/frog_spawn_egg.json b/src/main/resources/assets/joy/models/item/frog_spawn_egg.json new file mode 100644 index 0000000..fb8b11e --- /dev/null +++ b/src/main/resources/assets/joy/models/item/frog_spawn_egg.json @@ -0,0 +1,3 @@ +{ + "parent": "item/template_spawn_egg" +} diff --git a/src/main/resources/assets/joy/models/item/slime_spawn_egg.json b/src/main/resources/assets/joy/models/item/slime_spawn_egg.json new file mode 100644 index 0000000..fb8b11e --- /dev/null +++ b/src/main/resources/assets/joy/models/item/slime_spawn_egg.json @@ -0,0 +1,3 @@ +{ + "parent": "item/template_spawn_egg" +} diff --git a/src/main/resources/assets/joy/models/item/sniffer_spawn_egg.json b/src/main/resources/assets/joy/models/item/sniffer_spawn_egg.json new file mode 100644 index 0000000..fb8b11e --- /dev/null +++ b/src/main/resources/assets/joy/models/item/sniffer_spawn_egg.json @@ -0,0 +1,3 @@ +{ + "parent": "item/template_spawn_egg" +} diff --git a/src/main/resources/assets/joy/models/item/sock_fox_spawn_egg.json b/src/main/resources/assets/joy/models/item/sock_fox_spawn_egg.json new file mode 100644 index 0000000..fb8b11e --- /dev/null +++ b/src/main/resources/assets/joy/models/item/sock_fox_spawn_egg.json @@ -0,0 +1,3 @@ +{ + "parent": "item/template_spawn_egg" +} diff --git a/src/main/resources/assets/joy/models/item/trans_bee_spawn_egg.json b/src/main/resources/assets/joy/models/item/trans_bee_spawn_egg.json new file mode 100644 index 0000000..fb8b11e --- /dev/null +++ b/src/main/resources/assets/joy/models/item/trans_bee_spawn_egg.json @@ -0,0 +1,3 @@ +{ + "parent": "item/template_spawn_egg" +} diff --git a/src/main/resources/assets/joy/models/item/tree_spawn_egg.json b/src/main/resources/assets/joy/models/item/tree_spawn_egg.json new file mode 100644 index 0000000..fb8b11e --- /dev/null +++ b/src/main/resources/assets/joy/models/item/tree_spawn_egg.json @@ -0,0 +1,3 @@ +{ + "parent": "item/template_spawn_egg" +}