From dda94bc798175cbfd92c318b8d9ddf2038495210 Mon Sep 17 00:00:00 2001 From: Carter <69820300+Cart3r1234@users.noreply.github.com> Date: Sat, 11 Jan 2025 23:19:02 -0500 Subject: [PATCH] prop item model definitions --- .../assets/portalcubed/emissives.json | 100 ++++++++---------- .../assets/portalcubed/items/beans.json | 29 +++++ .../assets/portalcubed/items/clipboard.json | 57 ++++++++++ .../portalcubed/items/companion_cube.json | 70 ++++++++++++ .../assets/portalcubed/items/error.json | 6 ++ .../portalcubed/items/lil_pineapple.json | 85 +++++++++++++++ .../assets/portalcubed/items/mug.json | 64 +++++++++++ .../assets/portalcubed/items/oil_drum.json | 36 +++++++ .../items/portal_1_companion_cube.json | 56 ++++++++++ .../assets/portalcubed/items/radio.json | 43 ++++++++ .../portalcubed/items/redirection_cube.json | 70 ++++++++++++ .../portalcubed/items/schrodinger_cube.json | 70 ++++++++++++ .../portalcubed/items/storage_cube.json | 70 ++++++++++++ .../assets/portalcubed/items/the_taco.json | 22 ++++ .../assets/portalcubed/models/prop/beans.json | 94 ---------------- .../prop/charred_portal_1_companion_cube.json | 3 +- .../models/prop/christmas_companion_cube.json | 2 +- .../prop/christmas_companion_cube_lit.json | 2 +- .../models/prop/christmas_storage_cube.json | 2 +- .../prop/christmas_storage_cube_lit.json | 2 +- .../portalcubed/models/prop/clipboard.json | 81 -------------- .../models/prop/companion_cube.json | 9 +- .../models/prop/companion_cube_lit.json | 2 +- .../models/prop/dirty_companion_cube.json | 2 +- .../models/prop/dirty_companion_cube_lit.json | 2 +- .../models/prop/dirty_redirection_cube.json | 2 +- .../prop/dirty_redirection_cube_lit.json | 2 +- .../models/prop/dirty_schrodinger_cube.json | 2 +- .../prop/dirty_schrodinger_cube_lit.json | 2 +- .../models/prop/dirty_storage_cube.json | 2 +- .../models/prop/dirty_storage_cube_lit.json | 2 +- .../models/prop/lil_pineapple.json | 16 +-- .../models/prop/lil_pineapple_ace.json | 2 +- .../models/prop/lil_pineapple_agender.json | 2 +- .../models/prop/lil_pineapple_aro.json | 2 +- .../models/prop/lil_pineapple_bi.json | 2 +- .../prop/lil_pineapple_genderfluid.json | 2 +- .../models/prop/lil_pineapple_lesbian.json | 2 +- .../models/prop/lil_pineapple_nonbinary.json | 2 +- .../models/prop/lil_pineapple_pan.json | 2 +- .../models/prop/lil_pineapple_proud.json | 2 +- .../models/prop/lil_pineapple_trans.json | 2 +- .../assets/portalcubed/models/prop/mug.json | 15 --- .../portalcubed/models/prop/mug_aperture.json | 2 +- .../portalcubed/models/prop/mug_blue.json | 2 +- .../portalcubed/models/prop/mug_fall.json | 2 +- .../portalcubed/models/prop/mug_orange.json | 2 +- .../portalcubed/models/prop/mug_red.json | 2 +- .../portalcubed/models/prop/mug_white.json | 2 +- .../portalcubed/models/prop/mug_yellow.json | 2 +- .../portalcubed/models/prop/oil_drum.json | 92 ---------------- .../models/prop/portal_1_companion_cube.json | 8 +- .../assets/portalcubed/models/prop/radio.json | 6 -- .../models/prop/redirection_cube.json | 9 +- .../models/prop/redirection_cube_lit.json | 2 +- .../models/prop/schrodinger_cube.json | 9 +- .../models/prop/schrodinger_cube_lit.json | 2 +- .../portalcubed/models/prop/storage_cube.json | 9 +- .../models/prop/storage_cube_lit.json | 2 +- .../portalcubed/models/prop/the_taco.json | 3 - 60 files changed, 773 insertions(+), 425 deletions(-) create mode 100644 src/main/resources/assets/portalcubed/items/beans.json create mode 100644 src/main/resources/assets/portalcubed/items/clipboard.json create mode 100644 src/main/resources/assets/portalcubed/items/companion_cube.json create mode 100644 src/main/resources/assets/portalcubed/items/error.json create mode 100644 src/main/resources/assets/portalcubed/items/lil_pineapple.json create mode 100644 src/main/resources/assets/portalcubed/items/mug.json create mode 100644 src/main/resources/assets/portalcubed/items/oil_drum.json create mode 100644 src/main/resources/assets/portalcubed/items/portal_1_companion_cube.json create mode 100644 src/main/resources/assets/portalcubed/items/radio.json create mode 100644 src/main/resources/assets/portalcubed/items/redirection_cube.json create mode 100644 src/main/resources/assets/portalcubed/items/schrodinger_cube.json create mode 100644 src/main/resources/assets/portalcubed/items/storage_cube.json create mode 100644 src/main/resources/assets/portalcubed/items/the_taco.json delete mode 100644 src/main/resources/assets/portalcubed/models/prop/beans.json delete mode 100644 src/main/resources/assets/portalcubed/models/prop/clipboard.json delete mode 100644 src/main/resources/assets/portalcubed/models/prop/mug.json delete mode 100644 src/main/resources/assets/portalcubed/models/prop/oil_drum.json diff --git a/src/main/resources/assets/portalcubed/emissives.json b/src/main/resources/assets/portalcubed/emissives.json index 186601ee..8d58dfbb 100644 --- a/src/main/resources/assets/portalcubed/emissives.json +++ b/src/main/resources/assets/portalcubed/emissives.json @@ -1,15 +1,12 @@ { "block/floor_button": "block/button_emissives", "block/floor_button_active": "block/button_emissives", - "item/floor_button": "block/button_emissives", "block/cube_button": "block/button_emissives", "block/cube_button_active": "block/button_emissives", - "item/cube_button": "block/button_emissives", "block/old_ap_floor_button": "block/button_emissives", "block/old_ap_floor_button_active": "block/button_emissives", - "item/old_ap_floor_button": "block/button_emissives", "block/pedestal_button": "block/pedestal_button_e", "block/pedestal_button_active": "block/pedestal_button_e", @@ -19,11 +16,9 @@ "block/pedestal_button_base_left_active": "block/pedestal_button_e", "block/pedestal_button_base_right": "block/pedestal_button_e", "block/pedestal_button_base_right_active": "block/pedestal_button_e", - "item/pedestal_button": "block/pedestal_button_e", "block/portal_1_floor_button": "block/button_emissives", "block/portal_1_floor_button_active": "block/button_emissives", - "item/portal_1_floor_button": "block/button_emissives", "item/white_octopus_chamber_door": "item/octopus_chamber_door_emissive", "block/white_octopus_chamber_door_top_right_open": "block/chamber_door_emissive", @@ -72,62 +67,61 @@ "block/gray_chamber_door_bottom_left_open": "block/chamber_door_emissive", "block/gray_chamber_door_bottom_left_unlocked": "block/chamber_door_emissive", - "item/portal_gun_default": "item/portal_gun_dyeable", - "item/portal_gun_primary": "item/portal_gun_dyeable", - "item/portal_gun_secondary": "item/portal_gun_dyeable", - "item/portal_gun_atlas": "item/portal_gun_dyeable", - "item/portal_gun_p_body": "item/portal_gun_dyeable", - "item/portal_gun_reloaded": "item/portal_gun_dyeable", - "item/potatos_portal_gun": "item/portal_gun_dyeable", - "item/2005_beta_portal_gun": "item/portal_gun_dyeable", - "item/2006_beta_portal_gun": "item/portal_gun_dyeable", - "item/mel_portal_gun": "item/portal_gun_dyeable", - "item/lego_portal_gun": "item/portal_gun_dyeable", - "item/damaged_portal_gun": "item/portal_gun_dyeable", - "item/painted_portal_gun": "item/portal_gun_dyeable", - "item/2d_portal_gun": "item/2d_portal_gun_dyeable", - "item/2d_portal_gun_atlas": "item/2d_portal_gun_dyeable", - "item/2d_portal_gun_p_body": "item/2d_portal_gun_dyeable", - "item/2d_portal_gun_reloaded": "item/2d_portal_gun_dyeable", - "item/legacy_portal_gun": "item/portal_gun_dyeable", - "item/legacy_portal_gun_atlas": "item/portal_gun_dyeable", - "item/legacy_portal_gun_p_body": "item/portal_gun_dyeable", - "item/legacy_portal_gun_reloaded": "item/portal_gun_dyeable", - "item/tiny_potatos_portal_gun": "item/portal_gun_dyeable", - "item/wand": "item/wand_orb", - "item/smithers_portal_gun": "item/portal_gun_dyeable", - "item/rick_portal_gun": "item/portal_gun_dyeable", - - "item/storage_cube": "prop/storage_cube_ring", - "item/storage_cube_lit": "prop/storage_cube_ring", - "item/dirty_storage_cube": "prop/dirty_storage_cube_ring", - "item/dirty_storage_cube_lit": "prop/dirty_storage_cube_ring", - "item/christmas_storage_cube": "prop/christmas_storage_cube_bow", - "item/christmas_storage_cube_lit": "prop/christmas_storage_cube_bow_lit", - "item/companion_cube": "prop/companion_cube_ring", - "item/companion_cube_lit": "prop/companion_cube_ring", - "item/dirty_companion_cube": "prop/dirty_companion_cube_ring", - "item/dirty_companion_cube_lit": "prop/dirty_companion_cube_ring", - "item/christmas_companion_cube": "prop/christmas_companion_cube_bow", - "item/christmas_companion_cube_lit": "prop/christmas_companion_cube_bow_lit", - "item/redirection_cube_lit": "prop/redirection_cube_center_lit", - "item/dirty_redirection_cube_lit": "prop/dirty_redirection_cube_center_lit", - "item/schrodinger_cube_lit": "prop/schrodinger_cube_center_lit", - "item/dirty_schrodinger_cube_lit": "prop/dirty_schrodinger_cube_center_lit", + "portal_gun/portal_gun_default": "item/portal_gun_dyeable", + "portal_gun/portal_gun_primary": "item/portal_gun_dyeable", + "portal_gun/portal_gun_secondary": "item/portal_gun_dyeable", + "portal_gun/portal_gun_atlas": "item/portal_gun_dyeable", + "portal_gun/portal_gun_p_body": "item/portal_gun_dyeable", + "portal_gun/portal_gun_reloaded": "item/portal_gun_dyeable", + "portal_gun/potatos_portal_gun": "item/portal_gun_dyeable", + "portal_gun/2005_beta_portal_gun": "item/portal_gun_dyeable", + "portal_gun/2006_beta_portal_gun": "item/portal_gun_dyeable", + "portal_gun/mel_portal_gun": "item/portal_gun_dyeable", + "portal_gun/lego_portal_gun": "item/portal_gun_dyeable", + "portal_gun/damaged_portal_gun": "item/portal_gun_dyeable", + "portal_gun/painted_portal_gun": "item/portal_gun_dyeable", + "portal_gun/2d_portal_gun": "item/2d_portal_gun_dyeable", + "portal_gun/2d_portal_gun_atlas": "item/2d_portal_gun_dyeable", + "portal_gun/2d_portal_gun_p_body": "item/2d_portal_gun_dyeable", + "portal_gun/2d_portal_gun_reloaded": "item/2d_portal_gun_dyeable", + "portal_gun/legacy_portal_gun": "item/portal_gun_dyeable", + "portal_gun/legacy_portal_gun_atlas": "item/portal_gun_dyeable", + "portal_gun/legacy_portal_gun_p_body": "item/portal_gun_dyeable", + "portal_gun/legacy_portal_gun_reloaded": "item/portal_gun_dyeable", + "portal_gun/tiny_potatos_portal_gun": "item/portal_gun_dyeable", + "portal_gun/wand": "item/wand_orb", + "portal_gun/smithers_portal_gun": "item/portal_gun_dyeable", + "portal_gun/rick_portal_gun": "item/portal_gun_dyeable", + + "prop/storage_cube": "prop/storage_cube_ring", + "prop/storage_cube_lit": "prop/storage_cube_ring", + "prop/dirty_storage_cube": "prop/dirty_storage_cube_ring", + "prop/dirty_storage_cube_lit": "prop/dirty_storage_cube_ring", + "prop/christmas_storage_cube": "prop/christmas_storage_cube_bow", + "prop/christmas_storage_cube_lit": "prop/christmas_storage_cube_bow_lit", + "prop/companion_cube": "prop/companion_cube_ring", + "prop/companion_cube_lit": "prop/companion_cube_ring", + "prop/dirty_companion_cube": "prop/dirty_companion_cube_ring", + "prop/dirty_companion_cube_lit": "prop/dirty_companion_cube_ring", + "prop/christmas_companion_cube": "prop/christmas_companion_cube_bow", + "prop/christmas_companion_cube_lit": "prop/christmas_companion_cube_bow_lit", + "prop/redirection_cube_lit": "prop/redirection_cube_center_lit", + "prop/dirty_redirection_cube_lit": "prop/dirty_redirection_cube_center_lit", + "prop/schrodinger_cube_lit": "prop/schrodinger_cube_center_lit", + "prop/dirty_schrodinger_cube_lit": "prop/dirty_schrodinger_cube_center_lit", "item/prop_barrier": "item/prop_barrier_e", "item/advanced_knee_replacements": "item/advanced_knee_replacements_e", - "item/radio": "prop/radio_e", - "item/radio_transmission_received": "prop/radio_e", - "item/radio_awaiting_transmission": "prop/radio_e", - "item/dirty_radio": "prop/radio_e", + "prop/radio": "prop/radio_e", + "prop/radio_transmission_received": "prop/radio_e", + "prop/radio_awaiting_transmission": "prop/radio_e", + "prop/dirty_radio": "prop/radio_e", - "item/taco_with_way_too_much_ranch_on_it_holy_shit_why_is_there_so_much": "prop/the_taco", + "prop/taco_with_way_too_much_ranch_on_it_holy_shit_why_is_there_so_much": "prop/the_taco", "item/construction_cannon": "item/construction_cannon_screen", - "item/error": "block/error", "block/error": "block/error", "item/small_signage": "signage/small_signage_blank", diff --git a/src/main/resources/assets/portalcubed/items/beans.json b/src/main/resources/assets/portalcubed/items/beans.json new file mode 100644 index 00000000..fd0b1291 --- /dev/null +++ b/src/main/resources/assets/portalcubed/items/beans.json @@ -0,0 +1,29 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/open_beans" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/open_beans" + } + }, + { + "threshold": 2, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/closed_beans" + } + } + ] + } +} diff --git a/src/main/resources/assets/portalcubed/items/clipboard.json b/src/main/resources/assets/portalcubed/items/clipboard.json new file mode 100644 index 00000000..98dbf162 --- /dev/null +++ b/src/main/resources/assets/portalcubed/items/clipboard.json @@ -0,0 +1,57 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/clipboard_blank" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/clipboard_blank" + } + }, + { + "threshold": 2, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/clipboard_chell" + } + }, + { + "threshold": 3, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/clipboard_chicken" + } + }, + { + "threshold": 4, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/clipboard_hazards" + } + }, + { + "threshold": 5, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/clipboard_knee" + } + }, + { + "threshold": 6, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/clipboard_text" + } + } + ] + } +} diff --git a/src/main/resources/assets/portalcubed/items/companion_cube.json b/src/main/resources/assets/portalcubed/items/companion_cube.json new file mode 100644 index 00000000..2d42809a --- /dev/null +++ b/src/main/resources/assets/portalcubed/items/companion_cube.json @@ -0,0 +1,70 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/christmas_companion_cube" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/christmas_companion_cube_lit" + } + } + ] + }, + "when": [ + "12-24", + "12-25", + "12-26" + ] + } + ], + "fallback": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/companion_cube" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/companion_cube_lit" + } + }, + { + "threshold": 2, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/dirty_companion_cube" + } + }, + { + "threshold": 3, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/dirty_companion_cube_lit" + } + } + ] + }, + "pattern": "MM-dd", + "property": "minecraft:local_time" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/portalcubed/items/error.json b/src/main/resources/assets/portalcubed/items/error.json new file mode 100644 index 00000000..ed9634b9 --- /dev/null +++ b/src/main/resources/assets/portalcubed/items/error.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "portalcubed:block/error" + } +} diff --git a/src/main/resources/assets/portalcubed/items/lil_pineapple.json b/src/main/resources/assets/portalcubed/items/lil_pineapple.json new file mode 100644 index 00000000..5f5ba97d --- /dev/null +++ b/src/main/resources/assets/portalcubed/items/lil_pineapple.json @@ -0,0 +1,85 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/lil_pineapple" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/lil_pineapple_ace" + } + }, + { + "threshold": 2, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/lil_pineapple_agender" + } + }, + { + "threshold": 3, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/lil_pineapple_aro" + } + }, + { + "threshold": 4, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/lil_pineapple_bi" + } + }, + { + "threshold": 5, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/lil_pineapple_genderfluid" + } + }, + { + "threshold": 6, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/lil_pineapple_lesbian" + } + }, + { + "threshold": 7, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/lil_pineapple_nonbinary" + } + }, + { + "threshold": 8, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/lil_pineapple_pan" + } + }, + { + "threshold": 9, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/lil_pineapple_trans" + } + }, + { + "threshold": 10, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/lil_pineapple_proud" + } + } + ] + } +} diff --git a/src/main/resources/assets/portalcubed/items/mug.json b/src/main/resources/assets/portalcubed/items/mug.json new file mode 100644 index 00000000..fea83f11 --- /dev/null +++ b/src/main/resources/assets/portalcubed/items/mug.json @@ -0,0 +1,64 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/mug_blue" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/mug_blue" + } + }, + { + "threshold": 2, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/mug_red" + } + }, + { + "threshold": 3, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/mug_yellow" + } + }, + { + "threshold": 4, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/mug_white" + } + }, + { + "threshold": 5, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/mug_orange" + } + }, + { + "threshold": 6, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/mug_aperture" + } + }, + { + "threshold": 7, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/mug_fall" + } + } + ] + } +} diff --git a/src/main/resources/assets/portalcubed/items/oil_drum.json b/src/main/resources/assets/portalcubed/items/oil_drum.json new file mode 100644 index 00000000..c165f9cd --- /dev/null +++ b/src/main/resources/assets/portalcubed/items/oil_drum.json @@ -0,0 +1,36 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/oil_drum_blue" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/oil_drum_blue" + } + }, + { + "threshold": 2, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/oil_drum_white" + } + }, + { + "threshold": 3, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/oil_drum_brown" + } + } + ] + } +} diff --git a/src/main/resources/assets/portalcubed/items/portal_1_companion_cube.json b/src/main/resources/assets/portalcubed/items/portal_1_companion_cube.json new file mode 100644 index 00000000..c5a2d179 --- /dev/null +++ b/src/main/resources/assets/portalcubed/items/portal_1_companion_cube.json @@ -0,0 +1,56 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/christmas_portal_1_companion_cube" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/christmas_charred_portal_1_companion_cube" + } + } + ] + }, + "when": [ + "12-24", + "12-25", + "12-26" + ] + } + ], + "fallback": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/portal_1_companion_cube" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/charred_portal_1_companion_cube" + } + } + ] + }, + "pattern": "MM-dd", + "property": "minecraft:local_time" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/portalcubed/items/radio.json b/src/main/resources/assets/portalcubed/items/radio.json new file mode 100644 index 00000000..cf790819 --- /dev/null +++ b/src/main/resources/assets/portalcubed/items/radio.json @@ -0,0 +1,43 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/radio" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/dirty_radio" + } + }, + { + "threshold": 2, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/radio_awaiting_transmission" + } + }, + { + "threshold": 3, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/radio_transmission_received" + } + }, + { + "threshold": 4, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/boombox" + } + } + ] + } +} diff --git a/src/main/resources/assets/portalcubed/items/redirection_cube.json b/src/main/resources/assets/portalcubed/items/redirection_cube.json new file mode 100644 index 00000000..20ef530f --- /dev/null +++ b/src/main/resources/assets/portalcubed/items/redirection_cube.json @@ -0,0 +1,70 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/redirection_cube" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/redirection_cube_lit" + } + } + ] + }, + "when": [ + "12-24", + "12-25", + "12-26" + ] + } + ], + "fallback": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/redirection_cube" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/redirection_cube_lit" + } + }, + { + "threshold": 2, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/dirty_redirection_cube" + } + }, + { + "threshold": 3, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/dirty_redirection_cube_lit" + } + } + ] + }, + "pattern": "MM-dd", + "property": "minecraft:local_time" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/portalcubed/items/schrodinger_cube.json b/src/main/resources/assets/portalcubed/items/schrodinger_cube.json new file mode 100644 index 00000000..786303d5 --- /dev/null +++ b/src/main/resources/assets/portalcubed/items/schrodinger_cube.json @@ -0,0 +1,70 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/schrodinger_cube" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/schrodinger_cube_lit" + } + } + ] + }, + "when": [ + "12-24", + "12-25", + "12-26" + ] + } + ], + "fallback": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/schrodinger_cube" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/schrodinger_cube_lit" + } + }, + { + "threshold": 2, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/dirty_schrodinger_cube" + } + }, + { + "threshold": 3, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/dirty_schrodinger_cube_lit" + } + } + ] + }, + "pattern": "MM-dd", + "property": "minecraft:local_time" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/portalcubed/items/storage_cube.json b/src/main/resources/assets/portalcubed/items/storage_cube.json new file mode 100644 index 00000000..bd7634fe --- /dev/null +++ b/src/main/resources/assets/portalcubed/items/storage_cube.json @@ -0,0 +1,70 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/christmas_storage_cube" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/christmas_storage_cube_lit" + } + } + ] + }, + "when": [ + "12-24", + "12-25", + "12-26" + ] + } + ], + "fallback": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/storage_cube" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/storage_cube_lit" + } + }, + { + "threshold": 2, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/dirty_storage_cube" + } + }, + { + "threshold": 3, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/dirty_storage_cube_lit" + } + } + ] + }, + "pattern": "MM-dd", + "property": "minecraft:local_time" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/portalcubed/items/the_taco.json b/src/main/resources/assets/portalcubed/items/the_taco.json new file mode 100644 index 00000000..ea0f8fba --- /dev/null +++ b/src/main/resources/assets/portalcubed/items/the_taco.json @@ -0,0 +1,22 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "portalcubed:prop_variant", + "entries": [ + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/the_taco" + } + }, + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "portalcubed:prop/taco_with_way_too_much_ranch_on_it_holy_shit_why_is_there_so_much" + } + } + ] + } +} diff --git a/src/main/resources/assets/portalcubed/models/prop/beans.json b/src/main/resources/assets/portalcubed/models/prop/beans.json deleted file mode 100644 index aab26842..00000000 --- a/src/main/resources/assets/portalcubed/models/prop/beans.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "credit": "Made by Cart3r using Blockbench.", - "textures": { - "0": "portalcubed:prop/beans", - "particle": "portalcubed:prop/beans" - }, - "elements": [ - { - "from": [6, 0, 6], - "to": [10, 6, 10], - "faces": { - "north": {"uv": [0, 4, 4, 10], "texture": "#0"}, - "east": {"uv": [8, 4, 4, 10], "texture": "#0"}, - "south": {"uv": [12, 4, 8, 10], "texture": "#0"}, - "west": {"uv": [12, 4, 16, 10], "texture": "#0"}, - "down": {"uv": [12, 4, 8, 0], "texture": "#0"} - } - }, - { - "name": "cube inverted", - "from": [10, 6, 10], - "to": [6, 0, 6], - "faces": { - "north": {"uv": [16, 16, 12, 10], "texture": "#0"}, - "east": {"uv": [12, 16, 16, 10], "texture": "#0"}, - "south": {"uv": [16, 10, 12, 16], "texture": "#0"}, - "west": {"uv": [12, 10, 16, 16], "texture": "#0"}, - "up": {"uv": [8, 4, 12, 0], "texture": "#0"} - } - }, - { - "from": [6, 10.24193, 9.75665], - "to": [10, 10.24193, 11.75665], - "rotation": {"angle": 45, "axis": "x", "origin": [-3, 10.24193, 5.75665]}, - "faces": { - "up": {"uv": [1, 14, 5, 16], "texture": "#0"}, - "down": {"uv": [10, 16, 6, 14], "texture": "#0"} - } - }, - { - "from": [6, 7.33771, 8.20218], - "to": [10, 9.33771, 8.20218], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 8.33771, 8.20218]}, - "faces": { - "north": {"uv": [6, 12, 10, 14], "texture": "#0"}, - "south": {"uv": [1, 12, 5, 14], "texture": "#0"} - } - } - ], - "overrides": [ - {"model": "portalcubed:item/open_beans", "predicate": {"custom_model_data": 1}}, - {"model": "portalcubed:item/closed_beans", "predicate": {"custom_model_data": 2}} - ], - "display": { - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 3], - "scale": [0.75391, 0.75391, 0.75391] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 3], - "scale": [0.75391, 0.75391, 0.75391] - }, - "firstperson_righthand": { - "rotation": [-143.31, 76.02, 151.51], - "translation": [-1.25, 7, 2.5], - "scale": [0.75391, 0.75391, 0.75391] - }, - "firstperson_lefthand": { - "rotation": [-143.31, 76.02, 151.51], - "translation": [-1.25, 7, 2.5], - "scale": [0.75391, 0.75391, 0.75391] - }, - "ground": { - "translation": [0, 3.1, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [30, 225, 0], - "translation": [0, 4, 0], - "scale": [1.25391, 1.25391, 1.25391] - }, - "head": { - "translation": [0, 16.75, 0], - "scale": [1.31055, 1.31055, 1.31055] - }, - "fixed": { - "rotation": [0, 87.25, 0], - "translation": [0, 2.75, 0], - "scale": [0.875, 0.87695, 0.875] - } - } -} diff --git a/src/main/resources/assets/portalcubed/models/prop/charred_portal_1_companion_cube.json b/src/main/resources/assets/portalcubed/models/prop/charred_portal_1_companion_cube.json index 3a49a113..831936df 100644 --- a/src/main/resources/assets/portalcubed/models/prop/charred_portal_1_companion_cube.json +++ b/src/main/resources/assets/portalcubed/models/prop/charred_portal_1_companion_cube.json @@ -2,7 +2,8 @@ "credit": "Made by Cart3r using Blockbench.", "texture_size": [32, 16], "textures": { - "1": "portalcubed:prop/charred_portal_1_companion_cube" + "1": "portalcubed:prop/charred_portal_1_companion_cube", + "particle": "portalcubed:prop/charred_portal_1_companion_cube" }, "elements": [ { diff --git a/src/main/resources/assets/portalcubed/models/prop/christmas_companion_cube.json b/src/main/resources/assets/portalcubed/models/prop/christmas_companion_cube.json index e3c46fd1..6862e72d 100644 --- a/src/main/resources/assets/portalcubed/models/prop/christmas_companion_cube.json +++ b/src/main/resources/assets/portalcubed/models/prop/christmas_companion_cube.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_christmas_cube", + "parent": "portalcubed:prop/template_christmas_cube", "textures": { "cube": "portalcubed:prop/christmas_companion_cube", "bow": "portalcubed:prop/christmas_companion_cube_bow" diff --git a/src/main/resources/assets/portalcubed/models/prop/christmas_companion_cube_lit.json b/src/main/resources/assets/portalcubed/models/prop/christmas_companion_cube_lit.json index f1f3865a..677a434d 100644 --- a/src/main/resources/assets/portalcubed/models/prop/christmas_companion_cube_lit.json +++ b/src/main/resources/assets/portalcubed/models/prop/christmas_companion_cube_lit.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_christmas_cube", + "parent": "portalcubed:prop/template_christmas_cube", "textures": { "cube": "portalcubed:prop/christmas_companion_cube", "bow": "portalcubed:prop/christmas_companion_cube_bow_lit" diff --git a/src/main/resources/assets/portalcubed/models/prop/christmas_storage_cube.json b/src/main/resources/assets/portalcubed/models/prop/christmas_storage_cube.json index f97a1bff..24d7eb18 100644 --- a/src/main/resources/assets/portalcubed/models/prop/christmas_storage_cube.json +++ b/src/main/resources/assets/portalcubed/models/prop/christmas_storage_cube.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_christmas_cube", + "parent": "portalcubed:prop/template_christmas_cube", "textures": { "cube": "portalcubed:prop/christmas_storage_cube", "bow": "portalcubed:prop/christmas_storage_cube_bow" diff --git a/src/main/resources/assets/portalcubed/models/prop/christmas_storage_cube_lit.json b/src/main/resources/assets/portalcubed/models/prop/christmas_storage_cube_lit.json index c4c7669b..e0d362bb 100644 --- a/src/main/resources/assets/portalcubed/models/prop/christmas_storage_cube_lit.json +++ b/src/main/resources/assets/portalcubed/models/prop/christmas_storage_cube_lit.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_christmas_cube", + "parent": "portalcubed:prop/template_christmas_cube", "textures": { "cube": "portalcubed:prop/christmas_storage_cube", "bow": "portalcubed:prop/christmas_storage_cube_bow_lit" diff --git a/src/main/resources/assets/portalcubed/models/prop/clipboard.json b/src/main/resources/assets/portalcubed/models/prop/clipboard.json deleted file mode 100644 index 465a0bee..00000000 --- a/src/main/resources/assets/portalcubed/models/prop/clipboard.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "credit": "Made by Cart3r using Blockbench.", - "texture_size": [32, 32], - "textures": { - "0": "portalcubed:prop/clipboard", - "particle": "portalcubed:prop/clipboard" - }, - "elements": [ - { - "from": [5, 0, 3.5], - "to": [11, 1, 12.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.73483, 9.76517]}, - "faces": { - "north": {"uv": [4.5, 4.5, 7.5, 5], "texture": "#0"}, - "east": {"uv": [0, 4.5, 4.5, 5], "texture": "#0"}, - "south": {"uv": [12, 4.5, 15, 5], "texture": "#0"}, - "west": {"uv": [7.5, 4.5, 12, 5], "texture": "#0"}, - "up": {"uv": [9, 14.5, 6, 10], "texture": "#0"}, - "down": {"uv": [10.5, 0, 7.5, 4.5], "texture": "#0"} - } - }, - { - "from": [6.5, 1.64905, 10.34727], - "to": [9.5, 2.64905, 11.34727], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.73483, 9.76517]}, - "faces": { - "north": {"uv": [0.5, 0.5, 2, 1], "texture": "#0"}, - "east": {"uv": [0, 0.5, 0.5, 1], "texture": "#0"}, - "west": {"uv": [2, 0.5, 2.5, 1], "texture": "#0"}, - "up": {"uv": [2, 0.5, 0.5, 0], "texture": "#0"} - } - } - ], - "overrides": [ - {"model": "portalcubed:item/clipboard_blank", "predicate": {"custom_model_data": 1}}, - {"model": "portalcubed:item/clipboard_chell", "predicate": {"custom_model_data": 2}}, - {"model": "portalcubed:item/clipboard_chicken", "predicate": {"custom_model_data": 3}}, - {"model": "portalcubed:item/clipboard_hazards", "predicate": {"custom_model_data": 4}}, - {"model": "portalcubed:item/clipboard_knee", "predicate": {"custom_model_data": 5}}, - {"model": "portalcubed:item/clipboard_text", "predicate": {"custom_model_data": 6}} - ], - "display": { - "thirdperson_righthand": { - "rotation": [-82.32, -2.98, -173.09], - "translation": [0.25, 2.75, 8.25] - }, - "thirdperson_lefthand": { - "rotation": [-82.32, -2.98, -173.09], - "translation": [0.25, 2.75, 8.25] - }, - "firstperson_righthand": { - "rotation": [-95, -5, 177], - "translation": [-2.25, 5.5, 8.25], - "scale": [0.71, 0.71, 0.71] - }, - "firstperson_lefthand": { - "rotation": [-95, -5, 177], - "translation": [-2.25, 5.5, 8.25], - "scale": [0.71, 0.71, 0.71] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [30, 225, 0], - "translation": [0, 8, 0], - "scale": [1.32227, 1.31445, 1.32227] - }, - "head": { - "rotation": [-89, 0, 0], - "translation": [0, 0, -21.5], - "scale": [1.83398, 1.83398, 1.83398] - }, - "fixed": { - "rotation": [-89, 0, 0], - "translation": [0, 0, -13.75], - "scale": [1.83398, 1.83398, 1.83398] - } - } -} diff --git a/src/main/resources/assets/portalcubed/models/prop/companion_cube.json b/src/main/resources/assets/portalcubed/models/prop/companion_cube.json index 09cbac2f..0888c608 100644 --- a/src/main/resources/assets/portalcubed/models/prop/companion_cube.json +++ b/src/main/resources/assets/portalcubed/models/prop/companion_cube.json @@ -1,12 +1,7 @@ { - "parent": "portalcubed:item/template_companion_cube", + "parent": "portalcubed:prop/template_companion_cube", "textures": { "cube": "portalcubed:prop/companion_cube", "ring": "portalcubed:prop/companion_cube_ring" - }, - "overrides": [ - {"model": "portalcubed:item/companion_cube_lit", "predicate": {"custom_model_data": 1}}, - {"model": "portalcubed:item/dirty_companion_cube", "predicate": {"custom_model_data": 2}}, - {"model": "portalcubed:item/dirty_companion_cube_lit", "predicate": {"custom_model_data": 3}} - ] + } } diff --git a/src/main/resources/assets/portalcubed/models/prop/companion_cube_lit.json b/src/main/resources/assets/portalcubed/models/prop/companion_cube_lit.json index 0e833d23..462b6f2a 100644 --- a/src/main/resources/assets/portalcubed/models/prop/companion_cube_lit.json +++ b/src/main/resources/assets/portalcubed/models/prop/companion_cube_lit.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_companion_cube_lit", + "parent": "portalcubed:prop/template_companion_cube_lit", "textures": { "cube": "portalcubed:prop/companion_cube", "ring": "portalcubed:prop/companion_cube_ring" diff --git a/src/main/resources/assets/portalcubed/models/prop/dirty_companion_cube.json b/src/main/resources/assets/portalcubed/models/prop/dirty_companion_cube.json index d7c84b82..e444d814 100644 --- a/src/main/resources/assets/portalcubed/models/prop/dirty_companion_cube.json +++ b/src/main/resources/assets/portalcubed/models/prop/dirty_companion_cube.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_companion_cube", + "parent": "portalcubed:prop/template_companion_cube", "textures": { "cube": "portalcubed:prop/dirty_companion_cube", "ring": "portalcubed:prop/dirty_companion_cube_ring" diff --git a/src/main/resources/assets/portalcubed/models/prop/dirty_companion_cube_lit.json b/src/main/resources/assets/portalcubed/models/prop/dirty_companion_cube_lit.json index 6004f0fe..85193556 100644 --- a/src/main/resources/assets/portalcubed/models/prop/dirty_companion_cube_lit.json +++ b/src/main/resources/assets/portalcubed/models/prop/dirty_companion_cube_lit.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_companion_cube_lit", + "parent": "portalcubed:prop/template_companion_cube_lit", "textures": { "cube": "portalcubed:prop/dirty_companion_cube", "ring": "portalcubed:prop/dirty_companion_cube_ring" diff --git a/src/main/resources/assets/portalcubed/models/prop/dirty_redirection_cube.json b/src/main/resources/assets/portalcubed/models/prop/dirty_redirection_cube.json index 9237f1d3..4f32713a 100644 --- a/src/main/resources/assets/portalcubed/models/prop/dirty_redirection_cube.json +++ b/src/main/resources/assets/portalcubed/models/prop/dirty_redirection_cube.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_laser_cube", + "parent": "portalcubed:prop/template_laser_cube", "textures": { "cube": "portalcubed:prop/dirty_redirection_cube" } diff --git a/src/main/resources/assets/portalcubed/models/prop/dirty_redirection_cube_lit.json b/src/main/resources/assets/portalcubed/models/prop/dirty_redirection_cube_lit.json index 45f52737..a413051b 100644 --- a/src/main/resources/assets/portalcubed/models/prop/dirty_redirection_cube_lit.json +++ b/src/main/resources/assets/portalcubed/models/prop/dirty_redirection_cube_lit.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_laser_cube_lit", + "parent": "portalcubed:prop/template_laser_cube_lit", "textures": { "cube": "portalcubed:prop/dirty_redirection_cube", "center_lit": "portalcubed:prop/dirty_redirection_cube_center_lit" diff --git a/src/main/resources/assets/portalcubed/models/prop/dirty_schrodinger_cube.json b/src/main/resources/assets/portalcubed/models/prop/dirty_schrodinger_cube.json index 0243b3d1..fc01b135 100644 --- a/src/main/resources/assets/portalcubed/models/prop/dirty_schrodinger_cube.json +++ b/src/main/resources/assets/portalcubed/models/prop/dirty_schrodinger_cube.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_laser_cube", + "parent": "portalcubed:prop/template_laser_cube", "textures": { "cube": "portalcubed:prop/dirty_schrodinger_cube" } diff --git a/src/main/resources/assets/portalcubed/models/prop/dirty_schrodinger_cube_lit.json b/src/main/resources/assets/portalcubed/models/prop/dirty_schrodinger_cube_lit.json index b14bc9af..9951b87e 100644 --- a/src/main/resources/assets/portalcubed/models/prop/dirty_schrodinger_cube_lit.json +++ b/src/main/resources/assets/portalcubed/models/prop/dirty_schrodinger_cube_lit.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_laser_cube_lit", + "parent": "portalcubed:prop/template_laser_cube_lit", "textures": { "cube": "portalcubed:prop/dirty_schrodinger_cube", "center_lit": "portalcubed:prop/dirty_schrodinger_cube_center_lit" diff --git a/src/main/resources/assets/portalcubed/models/prop/dirty_storage_cube.json b/src/main/resources/assets/portalcubed/models/prop/dirty_storage_cube.json index 5420d8c2..472a11e2 100644 --- a/src/main/resources/assets/portalcubed/models/prop/dirty_storage_cube.json +++ b/src/main/resources/assets/portalcubed/models/prop/dirty_storage_cube.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_storage_cube", + "parent": "portalcubed:prop/template_storage_cube", "textures": { "cube": "portalcubed:prop/dirty_storage_cube", "ring": "portalcubed:prop/dirty_storage_cube_ring" diff --git a/src/main/resources/assets/portalcubed/models/prop/dirty_storage_cube_lit.json b/src/main/resources/assets/portalcubed/models/prop/dirty_storage_cube_lit.json index dc73b948..372ef9b2 100644 --- a/src/main/resources/assets/portalcubed/models/prop/dirty_storage_cube_lit.json +++ b/src/main/resources/assets/portalcubed/models/prop/dirty_storage_cube_lit.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_storage_cube_lit", + "parent": "portalcubed:prop/template_storage_cube_lit", "textures": { "cube": "portalcubed:prop/dirty_storage_cube", "ring": "portalcubed:prop/dirty_storage_cube_ring" diff --git a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple.json b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple.json index a07f36ec..4e594da0 100644 --- a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple.json +++ b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple.json @@ -1,18 +1,6 @@ { - "parent": "portalcubed:item/template_lil_pineapple", + "parent": "portalcubed:prop/template_lil_pineapple", "textures": { "pineapple": "portalcubed:prop/lil_pineapple" - }, - "overrides": [ - {"model": "portalcubed:item/lil_pineapple_ace", "predicate": {"custom_model_data": 1}}, - {"model": "portalcubed:item/lil_pineapple_agender", "predicate": {"custom_model_data": 2}}, - {"model": "portalcubed:item/lil_pineapple_aro", "predicate": {"custom_model_data": 3}}, - {"model": "portalcubed:item/lil_pineapple_bi", "predicate": {"custom_model_data": 4}}, - {"model": "portalcubed:item/lil_pineapple_genderfluid", "predicate": {"custom_model_data": 5}}, - {"model": "portalcubed:item/lil_pineapple_lesbian", "predicate": {"custom_model_data": 6}}, - {"model": "portalcubed:item/lil_pineapple_nonbinary", "predicate": {"custom_model_data": 7}}, - {"model": "portalcubed:item/lil_pineapple_pan", "predicate": {"custom_model_data": 8}}, - {"model": "portalcubed:item/lil_pineapple_trans", "predicate": {"custom_model_data": 9}}, - {"model": "portalcubed:item/lil_pineapple_proud", "predicate": {"custom_model_data": 10}} - ] + } } diff --git a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_ace.json b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_ace.json index b36bb217..7ae282a3 100644 --- a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_ace.json +++ b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_ace.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_lil_pineapple", + "parent": "portalcubed:prop/template_lil_pineapple", "textures": { "pineapple": "portalcubed:prop/lil_prideapple_ace" } diff --git a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_agender.json b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_agender.json index 997691cb..b6e9d5dd 100644 --- a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_agender.json +++ b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_agender.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_lil_pineapple", + "parent": "portalcubed:prop/template_lil_pineapple", "textures": { "pineapple": "portalcubed:prop/lil_prideapple_agender" } diff --git a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_aro.json b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_aro.json index 827fedca..56e9bb9a 100644 --- a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_aro.json +++ b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_aro.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_lil_pineapple", + "parent": "portalcubed:prop/template_lil_pineapple", "textures": { "pineapple": "portalcubed:prop/lil_prideapple_aro" } diff --git a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_bi.json b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_bi.json index e47a9b47..85656c10 100644 --- a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_bi.json +++ b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_bi.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_lil_pineapple", + "parent": "portalcubed:prop/template_lil_pineapple", "textures": { "pineapple": "portalcubed:prop/lil_prideapple_bi" } diff --git a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_genderfluid.json b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_genderfluid.json index fade15d2..dfa087c9 100644 --- a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_genderfluid.json +++ b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_genderfluid.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_lil_pineapple", + "parent": "portalcubed:prop/template_lil_pineapple", "textures": { "pineapple": "portalcubed:prop/lil_prideapple_genderfluid" } diff --git a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_lesbian.json b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_lesbian.json index 3d3d5bf4..22c96f2d 100644 --- a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_lesbian.json +++ b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_lesbian.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_lil_pineapple", + "parent": "portalcubed:prop/template_lil_pineapple", "textures": { "pineapple": "portalcubed:prop/lil_prideapple_lesbian" } diff --git a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_nonbinary.json b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_nonbinary.json index adc10194..08f092e6 100644 --- a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_nonbinary.json +++ b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_nonbinary.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_lil_pineapple", + "parent": "portalcubed:prop/template_lil_pineapple", "textures": { "pineapple": "portalcubed:prop/lil_prideapple_nonbinary" } diff --git a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_pan.json b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_pan.json index 4fdaf96a..a44eb689 100644 --- a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_pan.json +++ b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_pan.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_lil_pineapple", + "parent": "portalcubed:prop/template_lil_pineapple", "textures": { "pineapple": "portalcubed:prop/lil_prideapple_pan" } diff --git a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_proud.json b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_proud.json index 092dbd5d..e220808d 100644 --- a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_proud.json +++ b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_proud.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_lil_pineapple", + "parent": "portalcubed:prop/template_lil_pineapple", "textures": { "pineapple": "portalcubed:prop/lil_prideapple_proud" } diff --git a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_trans.json b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_trans.json index 68ebf0e3..1812f325 100644 --- a/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_trans.json +++ b/src/main/resources/assets/portalcubed/models/prop/lil_pineapple_trans.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_lil_pineapple", + "parent": "portalcubed:prop/template_lil_pineapple", "textures": { "pineapple": "portalcubed:prop/lil_prideapple_trans" } diff --git a/src/main/resources/assets/portalcubed/models/prop/mug.json b/src/main/resources/assets/portalcubed/models/prop/mug.json deleted file mode 100644 index ea08e444..00000000 --- a/src/main/resources/assets/portalcubed/models/prop/mug.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parent": "portalcubed:item/template_mug", - "textures": { - "mug": "portalcubed:prop/mug_blue" - }, - "overrides": [ - {"model": "portalcubed:item/mug_blue", "predicate": {"custom_model_data": 1}}, - {"model": "portalcubed:item/mug_red", "predicate": {"custom_model_data": 2}}, - {"model": "portalcubed:item/mug_yellow", "predicate": {"custom_model_data": 3}}, - {"model": "portalcubed:item/mug_white", "predicate": {"custom_model_data": 4}}, - {"model": "portalcubed:item/mug_orange", "predicate": {"custom_model_data": 5}}, - {"model": "portalcubed:item/mug_aperture", "predicate": {"custom_model_data": 6}}, - {"model": "portalcubed:item/mug_fall", "predicate": {"custom_model_data": 7}} - ] -} diff --git a/src/main/resources/assets/portalcubed/models/prop/mug_aperture.json b/src/main/resources/assets/portalcubed/models/prop/mug_aperture.json index 3f2580c5..2010000b 100644 --- a/src/main/resources/assets/portalcubed/models/prop/mug_aperture.json +++ b/src/main/resources/assets/portalcubed/models/prop/mug_aperture.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_mug", + "parent": "portalcubed:prop/template_mug", "textures": { "mug": "portalcubed:prop/mug_aperture" } diff --git a/src/main/resources/assets/portalcubed/models/prop/mug_blue.json b/src/main/resources/assets/portalcubed/models/prop/mug_blue.json index 59fb5049..26f30d1b 100644 --- a/src/main/resources/assets/portalcubed/models/prop/mug_blue.json +++ b/src/main/resources/assets/portalcubed/models/prop/mug_blue.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_mug", + "parent": "portalcubed:prop/template_mug", "textures": { "mug": "portalcubed:prop/mug_blue" } diff --git a/src/main/resources/assets/portalcubed/models/prop/mug_fall.json b/src/main/resources/assets/portalcubed/models/prop/mug_fall.json index b613ab22..3fc3abcd 100644 --- a/src/main/resources/assets/portalcubed/models/prop/mug_fall.json +++ b/src/main/resources/assets/portalcubed/models/prop/mug_fall.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_mug", + "parent": "portalcubed:prop/template_mug", "textures": { "mug": "portalcubed:prop/mug_fall" } diff --git a/src/main/resources/assets/portalcubed/models/prop/mug_orange.json b/src/main/resources/assets/portalcubed/models/prop/mug_orange.json index c38a6858..4c3ff193 100644 --- a/src/main/resources/assets/portalcubed/models/prop/mug_orange.json +++ b/src/main/resources/assets/portalcubed/models/prop/mug_orange.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_mug", + "parent": "portalcubed:prop/template_mug", "textures": { "mug": "portalcubed:prop/mug_orange" } diff --git a/src/main/resources/assets/portalcubed/models/prop/mug_red.json b/src/main/resources/assets/portalcubed/models/prop/mug_red.json index 58dc8d60..1394dfa9 100644 --- a/src/main/resources/assets/portalcubed/models/prop/mug_red.json +++ b/src/main/resources/assets/portalcubed/models/prop/mug_red.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_mug", + "parent": "portalcubed:prop/template_mug", "textures": { "mug": "portalcubed:prop/mug_red" } diff --git a/src/main/resources/assets/portalcubed/models/prop/mug_white.json b/src/main/resources/assets/portalcubed/models/prop/mug_white.json index 5177bd36..da0153d6 100644 --- a/src/main/resources/assets/portalcubed/models/prop/mug_white.json +++ b/src/main/resources/assets/portalcubed/models/prop/mug_white.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_mug", + "parent": "portalcubed:prop/template_mug", "textures": { "mug": "portalcubed:prop/mug_white" } diff --git a/src/main/resources/assets/portalcubed/models/prop/mug_yellow.json b/src/main/resources/assets/portalcubed/models/prop/mug_yellow.json index c046f100..18a3dbe9 100644 --- a/src/main/resources/assets/portalcubed/models/prop/mug_yellow.json +++ b/src/main/resources/assets/portalcubed/models/prop/mug_yellow.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_mug", + "parent": "portalcubed:prop/template_mug", "textures": { "mug": "portalcubed:prop/mug_yellow" } diff --git a/src/main/resources/assets/portalcubed/models/prop/oil_drum.json b/src/main/resources/assets/portalcubed/models/prop/oil_drum.json deleted file mode 100644 index cb8ef3a8..00000000 --- a/src/main/resources/assets/portalcubed/models/prop/oil_drum.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "credit": "Made by Cart3r using Blockbench.", - "texture_size": [64, 32], - "textures": { - "0": "portalcubed:prop/oil_drum_blue", - "particle": "portalcubed:prop/oil_drum_blue" - }, - "elements": [ - { - "from": [3.5, 0, 3.5], - "to": [12.5, 15, 12.5], - "faces": { - "north": {"uv": [2.258, 4.516, 4.492, 11.984], "texture": "#0"}, - "east": {"uv": [0.008, 4.516, 2.242, 11.984], "texture": "#0"}, - "south": {"uv": [6.758, 4.516, 8.992, 11.984], "texture": "#0"}, - "west": {"uv": [4.508, 4.516, 6.742, 11.984], "texture": "#0"}, - "up": {"uv": [2.242, 4.484, 0.008, 0.016], "texture": "#0"}, - "down": {"uv": [4.492, 0.016, 2.258, 4.484], "texture": "#0"} - } - }, - { - "from": [3, 3, 3], - "to": [13, 4, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 8]}, - "faces": { - "north": {"uv": [13.508, 0.016, 15.992, 0.484], "texture": "#0"}, - "east": {"uv": [11.008, 0.016, 13.492, 0.484], "texture": "#0"}, - "south": {"uv": [8.508, 0.016, 10.992, 0.484], "texture": "#0"}, - "west": {"uv": [6.008, 0.016, 8.492, 0.484], "texture": "#0"}, - "up": {"uv": [13.492, 5.984, 11.008, 1.016], "rotation": 180, "texture": "#0"}, - "down": {"uv": [15.992, 1.016, 13.508, 5.984], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [3, 11, 3], - "to": [13, 12, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11.5, 8]}, - "faces": { - "north": {"uv": [6.008, 0.016, 8.492, 0.484], "texture": "#0"}, - "east": {"uv": [13.508, 0.016, 15.992, 0.484], "texture": "#0"}, - "south": {"uv": [11.008, 0.016, 13.492, 0.484], "texture": "#0"}, - "west": {"uv": [8.508, 0.016, 10.992, 0.484], "texture": "#0"}, - "up": {"uv": [13.492, 5.984, 11.008, 1.016], "rotation": 270, "texture": "#0"}, - "down": {"uv": [15.992, 1.016, 13.508, 5.984], "rotation": 90, "texture": "#0"} - } - } - ], - "overrides": [ - {"model": "portalcubed:item/oil_drum_blue", "predicate": {"custom_model_data": 1}}, - {"model": "portalcubed:item/oil_drum_white", "predicate": {"custom_model_data": 2}}, - {"model": "portalcubed:item/oil_drum_brown", "predicate": {"custom_model_data": 3}} - ], - "display": { - "thirdperson_righthand": { - "rotation": [29, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [29, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "translation": [0.75, 3, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 45, 0], - "translation": [0.75, 3, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [30, 225, 0], - "translation": [0, 0.25, 0], - "scale": [0.78125, 0.78125, 0.78125] - }, - "head": { - "rotation": [178.75, 0.1, -4.25], - "translation": [-0.75, 6.75, 0], - "scale": [1.74805, 1.74805, 1.74805] - }, - "fixed": { - "scale": [0.74414, 0.74414, 0.74414] - } - } -} diff --git a/src/main/resources/assets/portalcubed/models/prop/portal_1_companion_cube.json b/src/main/resources/assets/portalcubed/models/prop/portal_1_companion_cube.json index 44faadf1..85ea17bf 100644 --- a/src/main/resources/assets/portalcubed/models/prop/portal_1_companion_cube.json +++ b/src/main/resources/assets/portalcubed/models/prop/portal_1_companion_cube.json @@ -2,7 +2,8 @@ "credit": "Made by Cart3r using Blockbench.", "texture_size": [32, 16], "textures": { - "1": "portalcubed:prop/portal_1_companion_cube" + "1": "portalcubed:prop/portal_1_companion_cube", + "particle": "portalcubed:prop/portal_1_companion_cube" }, "elements": [ { @@ -81,9 +82,6 @@ } } ], - "overrides": [ - {"model": "portalcubed:item/charred_portal_1_companion_cube", "predicate": {"custom_model_data": 1}} - ], "display": { "thirdperson_righthand": { "rotation": [75, 45, 0], @@ -123,4 +121,4 @@ "scale": [0.94922, 0.94922, 0.94922] } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/portalcubed/models/prop/radio.json b/src/main/resources/assets/portalcubed/models/prop/radio.json index a96e48c0..5baf2787 100644 --- a/src/main/resources/assets/portalcubed/models/prop/radio.json +++ b/src/main/resources/assets/portalcubed/models/prop/radio.json @@ -62,12 +62,6 @@ } } ], - "overrides": [ - {"model": "portalcubed:item/dirty_radio", "predicate": {"custom_model_data": 1}}, - {"model": "portalcubed:item/radio_awaiting_transmission", "predicate": {"custom_model_data": 2}}, - {"model": "portalcubed:item/radio_transmission_received", "predicate": {"custom_model_data": 3}}, - {"model": "portalcubed:item/boombox", "predicate": {"custom_model_data": 4}} - ], "display": { "thirdperson_righthand": { "rotation": [75, 45, 0], diff --git a/src/main/resources/assets/portalcubed/models/prop/redirection_cube.json b/src/main/resources/assets/portalcubed/models/prop/redirection_cube.json index bbc44355..1bc1a8d5 100644 --- a/src/main/resources/assets/portalcubed/models/prop/redirection_cube.json +++ b/src/main/resources/assets/portalcubed/models/prop/redirection_cube.json @@ -1,11 +1,6 @@ { - "parent": "portalcubed:item/template_laser_cube", + "parent": "portalcubed:prop/template_laser_cube", "textures": { "cube": "portalcubed:prop/redirection_cube" - }, - "overrides": [ - {"model": "portalcubed:item/redirection_cube_lit", "predicate": {"custom_model_data": 1}}, - {"model": "portalcubed:item/dirty_redirection_cube", "predicate": {"custom_model_data": 2}}, - {"model": "portalcubed:item/dirty_redirection_cube_lit", "predicate": {"custom_model_data": 3}} - ] + } } diff --git a/src/main/resources/assets/portalcubed/models/prop/redirection_cube_lit.json b/src/main/resources/assets/portalcubed/models/prop/redirection_cube_lit.json index 7543ba06..4727231b 100644 --- a/src/main/resources/assets/portalcubed/models/prop/redirection_cube_lit.json +++ b/src/main/resources/assets/portalcubed/models/prop/redirection_cube_lit.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_laser_cube_lit", + "parent": "portalcubed:prop/template_laser_cube_lit", "textures": { "cube": "portalcubed:prop/redirection_cube", "center_lit": "portalcubed:prop/redirection_cube_center_lit" diff --git a/src/main/resources/assets/portalcubed/models/prop/schrodinger_cube.json b/src/main/resources/assets/portalcubed/models/prop/schrodinger_cube.json index fea8e75e..e1243df8 100644 --- a/src/main/resources/assets/portalcubed/models/prop/schrodinger_cube.json +++ b/src/main/resources/assets/portalcubed/models/prop/schrodinger_cube.json @@ -1,11 +1,6 @@ { - "parent": "portalcubed:item/template_laser_cube_lit", + "parent": "portalcubed:prop/template_laser_cube", "textures": { "cube": "portalcubed:prop/schrodinger_cube" - }, - "overrides": [ - {"model": "portalcubed:item/schrodinger_cube_lit", "predicate": {"custom_model_data": 1}}, - {"model": "portalcubed:item/dirty_schrodinger_cube", "predicate": {"custom_model_data": 2}}, - {"model": "portalcubed:item/dirty_schrodinger_cube_lit", "predicate": {"custom_model_data": 3}} - ] + } } diff --git a/src/main/resources/assets/portalcubed/models/prop/schrodinger_cube_lit.json b/src/main/resources/assets/portalcubed/models/prop/schrodinger_cube_lit.json index b76d45bf..287f92de 100644 --- a/src/main/resources/assets/portalcubed/models/prop/schrodinger_cube_lit.json +++ b/src/main/resources/assets/portalcubed/models/prop/schrodinger_cube_lit.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_laser_cube_lit", + "parent": "portalcubed:prop/template_laser_cube_lit", "textures": { "cube": "portalcubed:prop/schrodinger_cube", "center_lit": "portalcubed:prop/schrodinger_cube_center_lit" diff --git a/src/main/resources/assets/portalcubed/models/prop/storage_cube.json b/src/main/resources/assets/portalcubed/models/prop/storage_cube.json index 39c068c2..bbddca26 100644 --- a/src/main/resources/assets/portalcubed/models/prop/storage_cube.json +++ b/src/main/resources/assets/portalcubed/models/prop/storage_cube.json @@ -1,12 +1,7 @@ { - "parent": "portalcubed:item/template_storage_cube", + "parent": "portalcubed:prop/template_storage_cube", "textures": { "cube": "portalcubed:prop/storage_cube", "ring": "portalcubed:prop/storage_cube_ring" - }, - "overrides": [ - {"model": "portalcubed:item/storage_cube_lit", "predicate": {"custom_model_data": 1}}, - {"model": "portalcubed:item/dirty_storage_cube", "predicate": {"custom_model_data": 2}}, - {"model": "portalcubed:item/dirty_storage_cube_lit", "predicate": {"custom_model_data": 3}} - ] + } } diff --git a/src/main/resources/assets/portalcubed/models/prop/storage_cube_lit.json b/src/main/resources/assets/portalcubed/models/prop/storage_cube_lit.json index 46df97fd..489b5566 100644 --- a/src/main/resources/assets/portalcubed/models/prop/storage_cube_lit.json +++ b/src/main/resources/assets/portalcubed/models/prop/storage_cube_lit.json @@ -1,5 +1,5 @@ { - "parent": "portalcubed:item/template_storage_cube_lit", + "parent": "portalcubed:prop/template_storage_cube_lit", "textures": { "cube": "portalcubed:prop/storage_cube", "ring": "portalcubed:prop/storage_cube_ring" diff --git a/src/main/resources/assets/portalcubed/models/prop/the_taco.json b/src/main/resources/assets/portalcubed/models/prop/the_taco.json index 1ce7ab7f..1e14c91a 100644 --- a/src/main/resources/assets/portalcubed/models/prop/the_taco.json +++ b/src/main/resources/assets/portalcubed/models/prop/the_taco.json @@ -45,9 +45,6 @@ } } ], - "overrides": [ - {"model": "portalcubed:item/taco_with_way_too_much_ranch_on_it_holy_shit_why_is_there_so_much", "predicate": {"custom_model_data": 1}} - ], "display": { "thirdperson_righthand": { "rotation": [-17, -43, 0],