From 10703a2fc8164b54cd8cd1e242c34ae739fabb66 Mon Sep 17 00:00:00 2001 From: Carter <69820300+Cart3r1234@users.noreply.github.com> Date: Tue, 10 Oct 2023 07:27:05 -0400 Subject: [PATCH] Item model stuff, misc changes - Added emissives for the High Energy Pellet and Super High Energy Pellet item models - Added emissives to many of the portal gun models - The glass tube has been added to some Portal Gun models that previously did not have them, following the translucency fix a few commits ago. - Added emissives for the Fizzler Emitter item models - Added emissives to prop item models for the props that have emissives on their entity model (Portal 2 Cubes, Radios, Cores) - Added emissives to block item models for blocks that use emissives (Pedestal Button, Floor Buttons, Excursion Funnel, Laser Catcher) - Fix the enchanting glint z fighting with itself on some item models - Fix the faith plate target blocking portal placement - Rename the current Beta Portal Gun skin internally to 2006 Beta Portal Gun, due to there being multiple known beta portal gun designs - Added subtitles for when the crowbar (and in the future, turrets) hit different surface types - Updated the license listed in the readme since that was changed a while ago --- README.md | 4 +- .../assets/minecraft/atlases/blocks.json | 22 +- .../assets/portalcubed/emissives.json | 51 +++- .../assets/portalcubed/lang/en_us.json | 10 +- .../models/block/laser_catcher.json | 9 +- .../models/block/laser_catcher_active.json | 9 +- .../models/block/laser_emitter.json | 11 +- .../models/block/laser_emitter_active.json | 11 +- .../portalcubed/models/block/laser_relay.json | 28 +- .../models/block/laser_relay_active.json | 28 +- .../light_bridge_emitter_down_edge_on.json | 10 +- .../light_bridge_emitter_left_edge_on.json | 10 +- .../light_bridge_emitter_right_edge_on.json | 10 +- .../light_bridge_emitter_up_edge_on.json | 10 +- .../models/block/old_ap_floor_button.json | 6 +- .../block/old_ap_floor_button_active.json | 6 +- ...tal_gun.json => 2006_beta_portal_gun.json} | 6 +- .../models/item/adventure_core.json | 15 +- .../portalcubed/models/item/anger_core.json | 15 +- .../models/item/companion_cube.json | 31 +- .../portalcubed/models/item/crowbar.json | 36 +-- .../models/item/curiosity_core.json | 15 +- .../models/item/death_fizzler_emitter.json | 27 +- .../portalcubed/models/item/fact_core.json | 15 +- .../models/item/fizzler_emitter.json | 27 +- .../models/item/intelligence_core.json | 15 +- .../models/item/laser_fizzler_emitter.json | 60 +++- .../models/item/legacy_portal_gun.json | 34 +-- .../models/item/legacy_portal_gun_atlas.json | 37 ++- .../models/item/legacy_portal_gun_p_body.json | 34 +-- .../item/legacy_portal_gun_reloaded.json | 34 +-- .../matter_inquisition_field_emitter.json | 27 +- .../models/item/mel_portal_gun.json | 75 ++--- .../models/item/morality_core.json | 13 +- .../old_aperture_death_fizzler_emitter.json | 177 ++++++------ .../item/old_aperture_fizzler_emitter.json | 177 ++++++------ .../item/physics_repulsion_field_emitter.json | 27 +- .../models/item/portal_1_fizzler_emitter.json | 270 +++++++++++++++++- .../portalcubed/models/item/portal_gun.json | 49 ++-- .../models/item/portal_gun_atlas.json | 43 ++- .../models/item/portal_gun_p_body.json | 45 +-- .../models/item/portal_gun_primary.json | 49 ++-- .../models/item/portal_gun_reloaded.json | 45 +-- .../models/item/portal_gun_secondary.json | 27 +- .../models/item/potatos_portal_gun.json | 54 ++-- .../assets/portalcubed/models/item/radio.json | 18 +- .../portalcubed/models/item/space_core.json | 15 +- .../portalcubed/models/item/storage_cube.json | 31 +- .../resources/assets/portalcubed/sounds.json | 11 +- .../block/portal_1_elevator_wall_lower.png | Bin 928 -> 5904 bytes .../portal_1_elevator_wall_middle_top.png | Bin 5784 -> 6098 bytes .../block/portal_1_elevator_wall_top.png | Bin 5493 -> 5792 bytes .../block/portal_1_elevator_wall_upper.png | Bin 896 -> 5857 bytes .../textures/entity/companion_cube.png | Bin 11437 -> 11385 bytes .../textures/entity/storage_cube.png | Bin 11011 -> 11009 bytes ...ortal_gun.png => 2006_beta_portal_gun.png} | Bin .../item/old_aperture_death_fizzler_icon.png | Bin 260 -> 5349 bytes .../item/old_aperture_fizzler_frame.png | Bin 0 -> 5592 bytes .../item/old_aperture_fizzler_icon.png | Bin 260 -> 5389 bytes .../textures/item/portal_1_fizzler_frame.png | Bin 0 -> 5790 bytes .../textures/item/portal_1_fizzler_icon.png | Bin 5732 -> 5715 bytes .../item/portal_2_death_fizzler_icon.png | Bin 5383 -> 5450 bytes .../textures/item/portal_2_fizzler_frame.png | Bin 0 -> 5754 bytes .../textures/item/portal_2_fizzler_icon.png | Bin 5429 -> 5487 bytes .../item/portal_2_laser_field_icon.png | Bin 5674 -> 5700 bytes .../item/portal_2_laser_fizzler_frame.png | Bin 0 -> 5551 bytes ...portal_2_matter_inquisition_field_icon.png | Bin 5869 -> 5931 bytes .../portal_2_physics_repulsion_field_icon.png | Bin 5682 -> 5751 bytes .../portalcubed/textures/item/portal_gun.png | Bin 7624 -> 7950 bytes .../textures/item/portal_gun_atlas.png | Bin 8040 -> 8399 bytes .../textures/item/portal_gun_p_body.png | Bin 8116 -> 8434 bytes .../textures/item/portal_gun_reloaded.png | Bin 8087 -> 8419 bytes .../textures/item/toxic_goo_bucket.png | Bin 5557 -> 5933 bytes .../tags/blocks/portal_nonsolid.json | 3 +- .../portalcubed/tags/blocks/portal_solid.json | 3 +- .../tags/blocks/portalable_gels.json | 2 +- src/main/resources/portal_blocks.json | 2 +- 77 files changed, 1209 insertions(+), 590 deletions(-) rename src/main/resources/assets/portalcubed/models/item/{beta_portal_gun.json => 2006_beta_portal_gun.json} (99%) rename src/main/resources/assets/portalcubed/textures/item/{beta_portal_gun.png => 2006_beta_portal_gun.png} (100%) create mode 100644 src/main/resources/assets/portalcubed/textures/item/old_aperture_fizzler_frame.png create mode 100644 src/main/resources/assets/portalcubed/textures/item/portal_1_fizzler_frame.png create mode 100644 src/main/resources/assets/portalcubed/textures/item/portal_2_fizzler_frame.png create mode 100644 src/main/resources/assets/portalcubed/textures/item/portal_2_laser_fizzler_frame.png diff --git a/README.md b/README.md index c9e401d3..c05edf3f 100644 --- a/README.md +++ b/README.md @@ -39,10 +39,11 @@ Portal Cubed is a Minecraft mod for Quilt that adds mechanics from Valve's Porta ## License -This project is licensed under the [MIT License](LICENSE) +This project is licensed under the [Mozilla Public License version 2.0](LICENSE) ## Discord Server Join my Discord server to talk about ClusterFlux mods, or if you need help with said mods! + discord-plural @@ -50,6 +51,7 @@ Join my Discord server to talk about ClusterFlux mods, or if you need help with ## Support me! You can directly support me on Ko-Fi! + kofi-singular diff --git a/src/main/resources/assets/minecraft/atlases/blocks.json b/src/main/resources/assets/minecraft/atlases/blocks.json index cb51eb97..88583b52 100644 --- a/src/main/resources/assets/minecraft/atlases/blocks.json +++ b/src/main/resources/assets/minecraft/atlases/blocks.json @@ -56,21 +56,41 @@ "type": "single", "resource": "portalcubed:entity/radio" }, + { + "type": "single", + "resource": "portalcubed:entity/radio_e" + }, { "type": "single", "resource": "portalcubed:entity/companion_cube" }, + { + "type": "single", + "resource": "portalcubed:entity/companion_cube_e" + }, { "type": "single", "resource": "portalcubed:entity/storage_cube" }, + { + "type": "single", + "resource": "portalcubed:entity/storage_cube_e" + }, { "type": "single", "resource": "portalcubed:entity/portal_1_cores" }, + { + "type": "single", + "resource": "portalcubed:entity/portal_1_cores_e" + }, { "type": "single", "resource": "portalcubed:entity/portal_2_cores" + }, + { + "type": "single", + "resource": "portalcubed:entity/portal_2_cores_e" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/emissives.json b/src/main/resources/assets/portalcubed/emissives.json index e431ddc8..0b52efd9 100644 --- a/src/main/resources/assets/portalcubed/emissives.json +++ b/src/main/resources/assets/portalcubed/emissives.json @@ -1,10 +1,9 @@ { - "item/energy_pellet": "item/energy_pellet", - "item/super_pellet": "item/super_pellet", - "item/missing_pellet": "item/missing_pellet", "block/faith_plate_target": "block/faith_plate_target", + "item/faith_plate_target": "block/faith_plate_target", + "item/excursion_funnel_emitter": "block/excursion_funnel_emitter_e", "block/excursion_funnel_emitter_forward_off_quadrant_1": "block/excursion_funnel_emitter_e", "block/excursion_funnel_emitter_forward_off_quadrant_2": "block/excursion_funnel_emitter_e", "block/excursion_funnel_emitter_forward_off_quadrant_3": "block/excursion_funnel_emitter_e", @@ -61,6 +60,7 @@ "block/laser_emitter_active": "block/laser_emitter_e", "block/laser_catcher_active": "block/laser_emitter_e", "block/laser_catcher": "block/laser_emitter_e", + "item/laser_catcher": "block/laser_emitter_e", "block/portal_2_fizzler_top": "block/portal_2_fizzler_top", @@ -156,13 +156,15 @@ "block/octopus_door_top_right": "block/octopus_door_e", "block/octopus_door_top_right_open": "block/octopus_door_e", - + "item/floor_button": "block/floor_button_e", "block/floor_button": "block/floor_button_e", "block/floor_button_active": "block/floor_button_e", + "item/old_ap_floor_button": "block/old_ap_floor_button_e", "block/old_ap_floor_button": "block/old_ap_floor_button_e", "block/old_ap_floor_button_active": "block/old_ap_floor_button_e", + "item/pedestal_button": "block/pedestal_button_e", "block/pedestal_button": "block/pedestal_button_e", "block/pedestal_button_active": "block/pedestal_button_e", "block/offset_pedestal_button": "block/pedestal_button_e", @@ -172,5 +174,44 @@ "block/rocket_turret_active": "block/rocket_turret_active_e", "block/rocket_turret_inactive": "block/rocket_turret_inactive_e", - "block/rocket_turret_lock_on": "block/rocket_turret_lock_on_e" + "block/rocket_turret_lock_on": "block/rocket_turret_lock_on_e", + + "item/energy_pellet": "item/energy_pellet", + "item/super_pellet": "item/super_pellet", + "item/missing_pellet": "item/missing_pellet", + + "item/portal_gun": "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/2006_beta_portal_gun": "item/portal_gun_dyeable", + "item/mel_portal_gun": "item/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/fizzler_emitter": "item/portal_2_fizzler_icon", + "item/portal_1_fizzler_emitter": "item/portal_1_fizzler_icon", + "item/laser_fizzler_emitter": "item/portal_2_laser_field_icon", + "item/death_fizzler_emitter": "item/portal_2_death_fizzler_icon", + "item/old_aperture_fizzler_emitter": "item/old_aperture_fizzler_icon", + "item/old_aperture_death_fizzler_emitter": "item/old_aperture_death_fizzler_icon", + "item/matter_inquisition_field_emitter": "item/portal_2_matter_inquisition_field_icon", + "item/physics_repulsion_field_emitter": "item/portal_2_physics_repulsion_field_icon", + + "item/storage_cube": "entity/storage_cube_e", + "item/companion_cube": "entity/companion_cube_e", + "item/radio": "entity/radio_e", + "item/morality_core": "entity/portal_1_cores_e", + "item/curiosity_core": "entity/portal_1_cores_e", + "item/intelligence_core": "entity/portal_1_cores_e", + "item/anger_core": "entity/portal_1_cores_e", + "item/space_core": "entity/portal_2_cores_e", + "item/adventure_core": "entity/portal_2_cores_e", + "item/fact_core": "entity/portal_2_cores_e" + } diff --git a/src/main/resources/assets/portalcubed/lang/en_us.json b/src/main/resources/assets/portalcubed/lang/en_us.json index 71cae931..01c4aed9 100644 --- a/src/main/resources/assets/portalcubed/lang/en_us.json +++ b/src/main/resources/assets/portalcubed/lang/en_us.json @@ -40,10 +40,12 @@ "subtitles.portalcubed.pellet.spawn": "Energy pellet launches", "subtitles.portalcubed.crowbar_swoosh": "Crowbar swooshes", + "subtitles.portalcubed.impact.concrete": "Concrete crumbles", + "subtitles.portalcubed.impact.metal": "Metal clanks", + "subtitles.portalcubed.impact.glass": "Glass cracks", "subtitles.portalcubed.faith_plate": "Faith plate activates", - "advancement.portalcubed.root.title": "Portal Cubed", "advancement.portalcubed.root.description": "Welcome to Aperture Science! You're here because we want the best, and you are it.", @@ -82,7 +84,7 @@ "advancement.portalcubed.pellet_bounce.description": "Bounce a High Energy Pellet at least 35 times before it expires", "advancement.portalcubed.laser.title": "It Burns, Ah!", - "advancement.portalcubed.laser.description": "Touch a Thermal Discouragement Beam and become thermally discouraged", + "advancement.portalcubed.laser.description": "Touch a Thermal Discouragement Beam and become thermally discouraged from doing it again", "advancement.portalcubed.goo.title": "The Floor is Failure", "advancement.portalcubed.goo.description": "Submerse yourself in a pool of Toxic Goo and receive an unsatisfactory mark to your record", @@ -442,7 +444,7 @@ "portalcubed.midnightconfig.title": "Portal Cubed Config", "portalcubed.midnightconfig.maxBridgeLength": "Maximum Emitter Block Range", - "portalcubed.midnightconfig.enableRoundPortals": "Enable Round Portals", + "portalcubed.midnightconfig.enableRoundPortals": "Use Round Portal Texture", "portalcubed.midnightconfig.enableAccurateMovement": "Long Fall Boots Enable Source-Accurate Movement", "portalcubed.midnightconfig.fizzlerDamage": "Death Fizzler Damage", "portalcubed.midnightconfig.rocketDamage": "Rocket Turret Damage", @@ -463,7 +465,7 @@ "death.attack.fizzle": "%s was fizzled", "death.attack.fizzle.player": "%1$s was pushed into a fizzler by %2$s", "death.attack.vaporization": "%s was vaporized by a High Energy Pellet", - "death.attack.vaporization.player": "%1$s was vaporized by a High Energy Pellet because of %2$s", + "death.attack.vaporization.player": "%1$s was vaporized by a High Energy Pellet trying to escape %2$s", "death.attack.laser": "%s was thermally discouraged", "death.attack.laser.player": "%1$s was thermally discouraged trying to escape %2$s", "death.attack.cube": "%s was hit on the head by a falling Weighted Cube", diff --git a/src/main/resources/assets/portalcubed/models/block/laser_catcher.json b/src/main/resources/assets/portalcubed/models/block/laser_catcher.json index 8eda8198..54fc2c83 100644 --- a/src/main/resources/assets/portalcubed/models/block/laser_catcher.json +++ b/src/main/resources/assets/portalcubed/models/block/laser_catcher.json @@ -21,7 +21,7 @@ } }, { - "name": "translucent", + "name": "transparent", "from": [-0.01, 15.99, -0.01], "to": [16.01, 17.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [16, 23, 0]}, @@ -34,7 +34,7 @@ } }, { - "name": "translucent", + "name": "transparent", "from": [15.9, 16.75, 0.1], "to": [0.075, 16.75, 15.9], "rotation": {"angle": 0, "axis": "y", "origin": [16, 23, 0]}, @@ -143,5 +143,8 @@ "rotation": [-90, 0, 0], "scale": [0.5, 0.5, 0.5] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/laser_catcher_active.json b/src/main/resources/assets/portalcubed/models/block/laser_catcher_active.json index 3a9ff6c7..8cb3c728 100644 --- a/src/main/resources/assets/portalcubed/models/block/laser_catcher_active.json +++ b/src/main/resources/assets/portalcubed/models/block/laser_catcher_active.json @@ -22,7 +22,7 @@ } }, { - "name": "translucent", + "name": "transparent", "from": [-0.01, 15.99, -0.01], "to": [16.01, 17.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [16.04289, 22.95711, 0]}, @@ -35,7 +35,7 @@ } }, { - "name": "translucent", + "name": "transparent", "from": [15.9, 16.75, 0.1], "to": [0.075, 16.75, 15.9], "rotation": {"angle": 0, "axis": "y", "origin": [16, 23, 0]}, @@ -143,5 +143,8 @@ "translation": [0, 0, -0.5], "scale": [0.5, 0.5, 0.5] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/laser_emitter.json b/src/main/resources/assets/portalcubed/models/block/laser_emitter.json index 1cdf7273..36b8c3cc 100644 --- a/src/main/resources/assets/portalcubed/models/block/laser_emitter.json +++ b/src/main/resources/assets/portalcubed/models/block/laser_emitter.json @@ -8,7 +8,7 @@ }, "elements": [ { - "name": "translucent", + "name": "transparent", "from": [-0.01, 15.99, -0.01], "to": [16.01, 17.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 23, 16]}, @@ -21,7 +21,7 @@ } }, { - "name": "translucent", + "name": "transparent", "from": [7.5, 18, 7.5], "to": [8.5, 21, 8.5], "rotation": {"angle": -45, "axis": "y", "origin": [8, 19.5, 8]}, @@ -34,7 +34,7 @@ } }, { - "name": "translucent", + "name": "transparent", "from": [15.9, 16.75, 0.1], "to": [0.075, 16.75, 15.9], "rotation": {"angle": 0, "axis": "y", "origin": [16, 23, 0]}, @@ -184,5 +184,8 @@ "rotation": [-90, 0, 0], "scale": [0.5, 0.5, 0.5] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/laser_emitter_active.json b/src/main/resources/assets/portalcubed/models/block/laser_emitter_active.json index 0fe6018c..cd911b4c 100644 --- a/src/main/resources/assets/portalcubed/models/block/laser_emitter_active.json +++ b/src/main/resources/assets/portalcubed/models/block/laser_emitter_active.json @@ -8,7 +8,7 @@ }, "elements": [ { - "name": "translucent", + "name": "transparent", "from": [-0.01, 15.99, -0.01], "to": [16.01, 17.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 23, 16]}, @@ -21,7 +21,7 @@ } }, { - "name": "translucent", + "name": "transparent", "from": [7.5, 18, 7.5], "to": [8.5, 21, 8.5], "rotation": {"angle": -45, "axis": "y", "origin": [8, 19.5, 8]}, @@ -34,7 +34,7 @@ } }, { - "name": "translucent", + "name": "transparent", "from": [15.9, 16.75, 0.1], "to": [0.075, 16.75, 15.9], "rotation": {"angle": 0, "axis": "y", "origin": [16, 23, 0]}, @@ -183,5 +183,8 @@ "translation": [0, 0, -0.5], "scale": [0.5, 0.5, 0.5] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/laser_relay.json b/src/main/resources/assets/portalcubed/models/block/laser_relay.json index 768d073d..e6507146 100644 --- a/src/main/resources/assets/portalcubed/models/block/laser_relay.json +++ b/src/main/resources/assets/portalcubed/models/block/laser_relay.json @@ -16,8 +16,7 @@ "west": {"uv": [8.258, 12.008, 9.992, 13.992], "rotation": 90, "texture": "#0"}, "up": {"uv": [8.258, 12.008, 9.992, 13.992], "rotation": 180, "texture": "#0"}, "down": {"uv": [8.258, 12.008, 9.992, 13.992], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [0, 0, 0], @@ -30,8 +29,7 @@ "west": {"uv": [0.008, 4.008, 3.992, 4.242], "rotation": 90, "texture": "#0"}, "up": {"uv": [0.008, 4.008, 3.992, 4.242], "rotation": 180, "texture": "#0"}, "down": {"uv": [0.008, 4.008, 3.992, 4.242], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "name": "cube inverted", @@ -44,11 +42,10 @@ "west": {"uv": [8.258, 13.992, 9.992, 12.008], "rotation": 90, "texture": "#0"}, "up": {"uv": [8.258, 13.992, 9.992, 12.008], "rotation": 180, "texture": "#0"}, "down": {"uv": [8.258, 13.992, 9.992, 12.008], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { - "name": "translucent", + "name": "transparent", "from": [11, 11, 10.75], "to": [5, 5, 3.75], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 1.5]}, @@ -69,8 +66,7 @@ "west": {"uv": [10.008, 14.258, 12.492, 14.492], "rotation": 90, "texture": "#0"}, "up": {"uv": [10.008, 14.258, 12.492, 14.492], "rotation": 180, "texture": "#0"}, "down": {"uv": [10.008, 14.258, 12.492, 14.492], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [2, 2.75, 1], @@ -82,8 +78,7 @@ "west": {"uv": [0.008, 4.008, 2.742, 4.242], "rotation": 90, "texture": "#0"}, "up": {"uv": [0.008, 4.008, 2.742, 4.242], "rotation": 180, "texture": "#0"}, "down": {"uv": [0.008, 4.008, 2.742, 4.242], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [7.5, 8.04289, 3], @@ -92,8 +87,7 @@ "faces": { "up": {"uv": [10.758, 13.258, 11.008, 13.508], "rotation": 180, "texture": "#0"}, "down": {"uv": [10.758, 13.258, 11.008, 13.508], "rotation": 180, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [8, 7.54289, 3], @@ -102,8 +96,7 @@ "faces": { "east": {"uv": [10.758, 13.258, 11.008, 13.508], "rotation": 270, "texture": "#0"}, "west": {"uv": [10.758, 13.258, 11.008, 13.508], "rotation": 270, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } } ], "display": { @@ -146,5 +139,8 @@ "translation": [0, -0.25, 0], "scale": [0.41602, 0.41602, 0.41602] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/laser_relay_active.json b/src/main/resources/assets/portalcubed/models/block/laser_relay_active.json index 4429bfe7..05065fd9 100644 --- a/src/main/resources/assets/portalcubed/models/block/laser_relay_active.json +++ b/src/main/resources/assets/portalcubed/models/block/laser_relay_active.json @@ -17,8 +17,7 @@ "west": {"uv": [0.008, 4.008, 2.742, 4.242], "rotation": 90, "texture": "#0"}, "up": {"uv": [0.008, 4.008, 2.742, 4.242], "rotation": 180, "texture": "#0"}, "down": {"uv": [0.008, 4.008, 2.742, 4.242], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [2.5, 3.25, 2], @@ -30,8 +29,7 @@ "west": {"uv": [10.008, 14.258, 12.492, 14.492], "rotation": 90, "texture": "#0"}, "up": {"uv": [10.008, 14.258, 12.492, 14.492], "rotation": 180, "texture": "#0"}, "down": {"uv": [10.008, 14.258, 12.492, 14.492], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [0, 0, 0], @@ -44,8 +42,7 @@ "west": {"uv": [0.008, 4.008, 3.992, 4.242], "rotation": 90, "texture": "#0"}, "up": {"uv": [0.008, 4.008, 3.992, 4.242], "rotation": 180, "texture": "#0"}, "down": {"uv": [0.008, 4.008, 3.992, 4.242], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [7.5, 8.04289, 3], @@ -54,8 +51,7 @@ "faces": { "up": {"uv": [10.758, 13.258, 11.008, 13.508], "rotation": 180, "texture": "#0"}, "down": {"uv": [10.758, 13.258, 11.008, 13.508], "rotation": 180, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [8, 7.54289, 3], @@ -64,11 +60,10 @@ "faces": { "east": {"uv": [10.758, 13.258, 11.008, 13.508], "rotation": 270, "texture": "#0"}, "west": {"uv": [10.758, 13.258, 11.008, 13.508], "rotation": 270, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { - "name": "translucent", + "name": "transparent", "from": [11, 11, 10.75], "to": [5, 5, 3.75], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7.125]}, @@ -89,8 +84,7 @@ "west": {"uv": [13.992, 0.008, 7.008, 7.995], "rotation": 90, "texture": "#3"}, "up": {"uv": [13.992, 0.008, 7.008, 7.995], "rotation": 180, "texture": "#3"}, "down": {"uv": [7.008, 7.995, 13.992, 0.008], "rotation": 180, "texture": "#3"} - }, - "portalcubed:render_type": "cutout" + } }, { "name": "cube inverted", @@ -103,8 +97,7 @@ "west": {"uv": [13.992, 7.995, 7.008, 0.008], "rotation": 90, "texture": "#3"}, "up": {"uv": [13.992, 7.995, 7.008, 0.008], "rotation": 180, "texture": "#3"}, "down": {"uv": [7.008, 0.008, 13.992, 7.995], "rotation": 180, "texture": "#3"} - }, - "portalcubed:render_type": "cutout" + } } ], "display": { @@ -141,5 +134,8 @@ "fixed": { "scale": [0.5, 0.5, 0.5] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_down_edge_on.json b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_down_edge_on.json index c096838e..af8ebfb5 100644 --- a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_down_edge_on.json +++ b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_down_edge_on.json @@ -64,7 +64,7 @@ } }, { - "name": "beam", + "name": "transparent", "from": [2, 1.5, 0], "to": [14, 2.5, 13], "shade": false, @@ -74,8 +74,7 @@ "west": {"uv": [2, 0, 3, 16], "texture": "#4"}, "up": {"uv": [2, 3, 14, 16], "rotation": 180, "texture": "#4"}, "down": {"uv": [14, 3, 2, 16], "texture": "#4"} - }, - "portalcubed:render_type": "translucent" + } } ], "display": { @@ -115,5 +114,8 @@ "fixed": { "scale": [0.5, 0.5, 0.5] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_left_edge_on.json b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_left_edge_on.json index a4605f21..48a6a529 100644 --- a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_left_edge_on.json +++ b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_left_edge_on.json @@ -64,7 +64,7 @@ } }, { - "name": "beam", + "name": "transparent", "from": [1.5, 2, 0], "to": [2.5, 14, 13], "shade": false, @@ -74,8 +74,7 @@ "west": {"uv": [2, 3, 14, 16], "rotation": 90, "texture": "#2"}, "up": {"uv": [2, 0, 3, 16], "rotation": 90, "texture": "#2"}, "down": {"uv": [13, 0, 14, 16], "rotation": 90, "texture": "#2"} - }, - "portalcubed:render_type": "translucent" + } } ], "display": { @@ -115,5 +114,8 @@ "fixed": { "scale": [0.5, 0.5, 0.5] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_right_edge_on.json b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_right_edge_on.json index 7482e2e1..ceec7535 100644 --- a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_right_edge_on.json +++ b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_right_edge_on.json @@ -64,7 +64,7 @@ } }, { - "name": "beam", + "name": "transparent", "from": [13.5, 2, 0], "to": [14.5, 14, 13], "shade": false, @@ -74,8 +74,7 @@ "west": {"uv": [2, 3, 14, 16], "rotation": 90, "texture": "#3"}, "up": {"uv": [2, 0, 3, 16], "rotation": 90, "texture": "#3"}, "down": {"uv": [13, 0, 14, 16], "rotation": 90, "texture": "#3"} - }, - "portalcubed:render_type": "translucent" + } } ], "display": { @@ -115,5 +114,8 @@ "fixed": { "scale": [0.5, 0.5, 0.5] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_up_edge_on.json b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_up_edge_on.json index 0cce8ffc..396c2255 100644 --- a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_up_edge_on.json +++ b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_up_edge_on.json @@ -65,7 +65,7 @@ } }, { - "name": "beam", + "name": "transparent", "from": [2, 13.5, 0], "to": [14, 14.5, 13], "shade": false, @@ -75,8 +75,7 @@ "west": {"uv": [2, 0, 3, 16], "texture": "#2"}, "up": {"uv": [2, 3, 14, 16], "rotation": 180, "texture": "#2"}, "down": {"uv": [14, 3, 2, 16], "texture": "#2"} - }, - "portalcubed:render_type": "translucent" + } } ], "display": { @@ -116,5 +115,8 @@ "fixed": { "scale": [0.5, 0.5, 0.5] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/old_ap_floor_button.json b/src/main/resources/assets/portalcubed/models/block/old_ap_floor_button.json index 985a08de..1bd1edc9 100644 --- a/src/main/resources/assets/portalcubed/models/block/old_ap_floor_button.json +++ b/src/main/resources/assets/portalcubed/models/block/old_ap_floor_button.json @@ -80,6 +80,7 @@ } }, { + "name": "transparent", "from": [-2.52, 18.805, -2.52], "to": [18.52, 19.845, 18.52], "rotation": {"angle": 0, "axis": "y", "origin": [8, 18.075, 8]}, @@ -165,5 +166,8 @@ "fixed": { "scale": [0.5, 0.5, 0.5] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/old_ap_floor_button_active.json b/src/main/resources/assets/portalcubed/models/block/old_ap_floor_button_active.json index aec77b97..0453d82c 100644 --- a/src/main/resources/assets/portalcubed/models/block/old_ap_floor_button_active.json +++ b/src/main/resources/assets/portalcubed/models/block/old_ap_floor_button_active.json @@ -121,6 +121,7 @@ } }, { + "name": "transparent", "from": [-2.52, 17.555, -2.52], "to": [18.52, 18.595, 18.52], "rotation": {"angle": 0, "axis": "y", "origin": [8, 18.075, 8]}, @@ -165,5 +166,8 @@ "fixed": { "scale": [0.5, 0.5, 0.5] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/beta_portal_gun.json b/src/main/resources/assets/portalcubed/models/item/2006_beta_portal_gun.json similarity index 99% rename from src/main/resources/assets/portalcubed/models/item/beta_portal_gun.json rename to src/main/resources/assets/portalcubed/models/item/2006_beta_portal_gun.json index 3bd7f04a..439211a8 100644 --- a/src/main/resources/assets/portalcubed/models/item/beta_portal_gun.json +++ b/src/main/resources/assets/portalcubed/models/item/2006_beta_portal_gun.json @@ -2,9 +2,9 @@ "credit": "Made by Cart3r using Blockbench.", "texture_size": [32, 32], "textures": { - "0": "portalcubed:item/beta_portal_gun", + "0": "portalcubed:item/2006_beta_portal_gun", "1": "portalcubed:item/portal_gun_dyeable", - "particle": "portalcubed:item/beta_portal_gun" + "particle": "portalcubed:item/2006_beta_portal_gun" }, "elements": [ { @@ -519,4 +519,4 @@ 40, 41 ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/adventure_core.json b/src/main/resources/assets/portalcubed/models/item/adventure_core.json index 5462b149..0353d005 100644 --- a/src/main/resources/assets/portalcubed/models/item/adventure_core.json +++ b/src/main/resources/assets/portalcubed/models/item/adventure_core.json @@ -2,7 +2,9 @@ "credit": "Made with Blockbench by Cart3r. ", "texture_size": [32, 32], "textures": { - "0": "portalcubed:entity/portal_2_cores" + "0": "portalcubed:entity/portal_2_cores", + "1": "portalcubed:entity/portal_2_cores_e", + "particle": "portalcubed:entity/portal_2_cores_e" }, "elements": [ { @@ -90,7 +92,14 @@ "from": [6.5, 1.5, 5.075], "to": [9.5, 4.5, 6.075], "faces": { - "north": {"uv": [12.5, 9, 14, 10.5], "texture": "#0"} + "north": {"uv": [12.5, 2, 14, 3.5], "texture": "#0"} + } + }, + { + "from": [6.5, 1.5, 5.075], + "to": [9.5, 4.5, 6.075], + "faces": { + "north": {"uv": [12.5, 2, 14, 3.5], "texture": "#1"} } } ], @@ -133,4 +142,4 @@ "scale": [1.21484, 1.21484, 1.21484] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/anger_core.json b/src/main/resources/assets/portalcubed/models/item/anger_core.json index 6f238c55..602f19f7 100644 --- a/src/main/resources/assets/portalcubed/models/item/anger_core.json +++ b/src/main/resources/assets/portalcubed/models/item/anger_core.json @@ -2,7 +2,9 @@ "credit": "Made with Blockbench by Cart3r. ", "texture_size": [32, 32], "textures": { - "0": "portalcubed:entity/portal_1_cores" + "0": "portalcubed:entity/portal_1_cores", + "1": "portalcubed:entity/portal_1_cores_e", + "particle": "portalcubed:entity/portal_1_cores_e" }, "elements": [ { @@ -77,7 +79,14 @@ "from": [6.5, 1.5, 5.075], "to": [9.5, 4.5, 6.075], "faces": { - "north": {"uv": [12.5, 9, 14, 10.5], "texture": "#0"} + "north": {"uv": [12.5, 2, 14, 3.5], "texture": "#0"} + } + }, + { + "from": [6.5, 1.5, 5.075], + "to": [9.5, 4.5, 6.075], + "faces": { + "north": {"uv": [12.5, 2, 14, 3.5], "texture": "#1"} } } ], @@ -120,4 +129,4 @@ "scale": [1.21484, 1.21484, 1.21484] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/companion_cube.json b/src/main/resources/assets/portalcubed/models/item/companion_cube.json index 4064706d..6c0d3bae 100644 --- a/src/main/resources/assets/portalcubed/models/item/companion_cube.json +++ b/src/main/resources/assets/portalcubed/models/item/companion_cube.json @@ -2,7 +2,9 @@ "credit": "Made with Blockbench by Cart3r. ", "texture_size": [64, 64], "textures": { - "2": "portalcubed:entity/companion_cube" + "1": "portalcubed:entity/companion_cube_e", + "2": "portalcubed:entity/companion_cube", + "particle": "portalcubed:entity/companion_cube_e" }, "elements": [ { @@ -10,12 +12,25 @@ "to": [13, 10, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2.5, 13.5, 5, 16], "texture": "#2"}, - "east": {"uv": [0, 13.5, 2.5, 16], "texture": "#2"}, - "south": {"uv": [7.5, 13.5, 10, 16], "texture": "#2"}, - "west": {"uv": [5, 13.5, 7.5, 16], "texture": "#2"}, - "up": {"uv": [5, 13.5, 2.5, 11], "texture": "#2"}, - "down": {"uv": [7.5, 11, 5, 13.5], "texture": "#2"} + "north": {"uv": [2.5, 2.5, 5, 5], "texture": "#2"}, + "east": {"uv": [0, 2.5, 2.5, 5], "texture": "#2"}, + "south": {"uv": [7.5, 2.5, 10, 5], "texture": "#2"}, + "west": {"uv": [5, 2.5, 7.5, 5], "texture": "#2"}, + "up": {"uv": [5, 2.5, 2.5, 0], "texture": "#2"}, + "down": {"uv": [7.5, 0, 5, 2.5], "texture": "#2"} + } + }, + { + "from": [3, 0, 3], + "to": [13, 10, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [2.5, 2.5, 5, 5], "texture": "#1"}, + "east": {"uv": [0, 2.5, 2.5, 5], "texture": "#1"}, + "south": {"uv": [7.5, 2.5, 10, 5], "texture": "#1"}, + "west": {"uv": [5, 2.5, 7.5, 5], "texture": "#1"}, + "up": {"uv": [5, 2.5, 2.5, 0], "texture": "#1"}, + "down": {"uv": [7.5, 0, 5, 2.5], "texture": "#1"} } }, { @@ -149,4 +164,4 @@ "scale": [0.94922, 0.94922, 0.94922] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/crowbar.json b/src/main/resources/assets/portalcubed/models/item/crowbar.json index 3fac3f6c..8e43dae4 100644 --- a/src/main/resources/assets/portalcubed/models/item/crowbar.json +++ b/src/main/resources/assets/portalcubed/models/item/crowbar.json @@ -6,45 +6,45 @@ }, "elements": [ { - "from": [7, 15, 7], - "to": [8, 16, 7], - "rotation": {"angle": -45, "axis": "x", "origin": [7, 15, 7]}, + "from": [6.99, 15, 6.98586], + "to": [8.01, 16.02, 7.00586], + "rotation": {"angle": -45, "axis": "x", "origin": [7, 15.01, 6.99586]}, "faces": { "north": {"uv": [2.032, 0.032, 2.968, 0.968], "texture": "#0"}, "south": {"uv": [2.032, 0.032, 2.968, 0.968], "texture": "#0"} } }, { - "from": [7, 15.70689, 4.29398], - "to": [8, 15.70689, 6.29398], - "rotation": {"angle": -45, "axis": "x", "origin": [7, 15.70689, 6.29398]}, + "from": [6.99, 15.70711, 4.27875], + "to": [8.01, 15.72711, 6.29875], + "rotation": {"angle": -45, "axis": "x", "origin": [7, 15.71711, 6.28875]}, "faces": { "up": {"uv": [2.032, 3.968, 2.968, 2.032], "texture": "#0"}, "down": {"uv": [2.032, 2.032, 2.968, 3.968], "texture": "#0"} } }, { - "from": [7, 3, 7], - "to": [8, 15, 7], + "from": [6.99, 2.99, 6.99], + "to": [8.01, 15.01, 7.01], "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 9, 7]}, "faces": { - "north": {"uv": [0.032, 0.032, 1.032, 12.032], "texture": "#0"}, - "south": {"uv": [0.032, 0.032, 1.032, 12.032], "texture": "#0"} + "north": {"uv": [0.032, 0.032, 0.968, 11.968], "texture": "#0"}, + "south": {"uv": [0.032, 0.032, 0.968, 11.968], "texture": "#0"} } }, { - "from": [7.5, 3, 6.5], - "to": [7.5, 15, 7.5], + "from": [7.49, 2.99, 6.49], + "to": [7.51, 15.01, 7.51], "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 9, 7]}, "faces": { - "east": {"uv": [0.032, 0.032, 1.032, 12.032], "texture": "#0"}, - "west": {"uv": [0.032, 0.032, 1.032, 12.032], "texture": "#0"} + "east": {"uv": [0.032, 0.032, 0.968, 11.968], "texture": "#0"}, + "west": {"uv": [0.032, 0.032, 0.968, 11.968], "texture": "#0"} } }, { - "from": [7, 0.025, 7], - "to": [8, 3.025, 7], - "rotation": {"angle": -22.5, "axis": "x", "origin": [7, 3.025, 7]}, + "from": [6.99, -0.00807, 6.99459], + "to": [8.01, 3.01193, 7.01459], + "rotation": {"angle": -22.5, "axis": "x", "origin": [7, 3.00193, 7.00459]}, "faces": { "north": {"uv": [2.032, 5.032, 2.968, 7.968], "texture": "#0"}, "south": {"uv": [2.032, 5.032, 2.968, 7.968], "texture": "#0"} @@ -88,4 +88,4 @@ "rotation": [-180, 90, -180] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/curiosity_core.json b/src/main/resources/assets/portalcubed/models/item/curiosity_core.json index e4bff2de..2a6604b9 100644 --- a/src/main/resources/assets/portalcubed/models/item/curiosity_core.json +++ b/src/main/resources/assets/portalcubed/models/item/curiosity_core.json @@ -2,7 +2,9 @@ "credit": "Made with Blockbench by Cart3r. ", "texture_size": [32, 32], "textures": { - "0": "portalcubed:entity/portal_1_cores" + "0": "portalcubed:entity/portal_1_cores", + "1": "portalcubed:entity/portal_1_cores_e", + "particle": "portalcubed:entity/portal_1_cores_e" }, "elements": [ { @@ -77,7 +79,14 @@ "from": [6.5, 1.5, 5.075], "to": [9.5, 4.5, 6.075], "faces": { - "north": {"uv": [12.5, 7.5, 14, 9], "texture": "#0"} + "north": {"uv": [12.5, 0.5, 14, 2], "texture": "#0"} + } + }, + { + "from": [6.5, 1.5, 5.075], + "to": [9.5, 4.5, 6.075], + "faces": { + "north": {"uv": [12.5, 0.5, 14, 2], "texture": "#1"} } } ], @@ -120,4 +129,4 @@ "scale": [1.21484, 1.21484, 1.21484] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/death_fizzler_emitter.json b/src/main/resources/assets/portalcubed/models/item/death_fizzler_emitter.json index c4a12a32..811fcf94 100644 --- a/src/main/resources/assets/portalcubed/models/item/death_fizzler_emitter.json +++ b/src/main/resources/assets/portalcubed/models/item/death_fizzler_emitter.json @@ -1,8 +1,9 @@ { "credit": "Made by Cart3r using Blockbench.", "textures": { - "0": "portalcubed:item/portal_2_death_fizzler_icon", - "particle": "portalcubed:item/portal_2_death_fizzler_icon" + "0": "portalcubed:item/portal_2_laser_fizzler_frame", + "1": "portalcubed:item/portal_2_death_fizzler_icon", + "particle": "portalcubed:item/portal_2_laser_fizzler_frame" }, "elements": [ { @@ -10,7 +11,9 @@ "from": [11, 3, 7.5], "to": [12, 12, 8.5], "faces": { + "north": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, "east": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, + "south": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, "west": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, "up": {"uv": [11.032, 4.032, 11.968, 4.968], "texture": "#0"}, "down": {"uv": [11.032, 12.032, 11.968, 12.968], "texture": "#0"} @@ -21,7 +24,9 @@ "from": [4, 3, 7.5], "to": [5, 12, 8.5], "faces": { + "north": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, "east": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, + "south": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, "west": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, "up": {"uv": [4.032, 4.032, 4.968, 4.968], "texture": "#0"}, "down": {"uv": [4.032, 12.032, 4.968, 12.968], "texture": "#0"} @@ -32,7 +37,9 @@ "from": [12, 1, 7.5], "to": [13, 14, 8.5], "faces": { + "north": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, "east": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, + "south": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, "west": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, "up": {"uv": [12.032, 2.032, 12.968, 2.968], "texture": "#0"}, "down": {"uv": [12.032, 14.032, 12.968, 14.968], "texture": "#0"} @@ -43,7 +50,9 @@ "from": [3, 1, 7.5], "to": [4, 14, 8.5], "faces": { + "north": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, "east": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, + "south": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, "west": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, "up": {"uv": [3.032, 2.032, 3.968, 2.968], "texture": "#0"}, "down": {"uv": [3.032, 14.032, 3.968, 14.968], "texture": "#0"} @@ -80,12 +89,11 @@ "from": [3, 0, 7.5], "to": [13, 15, 8.5], "faces": { - "north": {"uv": [13, 1, 3, 16], "texture": "#0"}, - "south": {"uv": [13, 1, 3, 16], "texture": "#0"}, - "up": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#0"}, - "down": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#0"} - }, - "portalcubed:render_type": "translucent" + "north": {"uv": [13, 1, 3, 16], "texture": "#1"}, + "south": {"uv": [13, 1, 3, 16], "texture": "#1"}, + "up": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#1"}, + "down": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#1"} + } } ], "gui_light": "front", @@ -119,5 +127,8 @@ "fixed": { "rotation": [0, 180, 0] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } } diff --git a/src/main/resources/assets/portalcubed/models/item/fact_core.json b/src/main/resources/assets/portalcubed/models/item/fact_core.json index 61cd1dee..e9d8dc7a 100644 --- a/src/main/resources/assets/portalcubed/models/item/fact_core.json +++ b/src/main/resources/assets/portalcubed/models/item/fact_core.json @@ -2,7 +2,9 @@ "credit": "Made with Blockbench by Cart3r. ", "texture_size": [32, 32], "textures": { - "0": "portalcubed:entity/portal_2_cores" + "0": "portalcubed:entity/portal_2_cores", + "1": "portalcubed:entity/portal_2_cores_e", + "particle": "portalcubed:entity/portal_2_cores_e" }, "elements": [ { @@ -90,7 +92,14 @@ "from": [6.5, 1.5, 5.075], "to": [9.5, 4.5, 6.075], "faces": { - "north": {"uv": [12.5, 10.5, 14, 12], "texture": "#0"} + "north": {"uv": [12.5, 3.5, 14, 5], "texture": "#0"} + } + }, + { + "from": [6.5, 1.5, 5.075], + "to": [9.5, 4.5, 6.075], + "faces": { + "north": {"uv": [12.5, 3.5, 14, 5], "texture": "#1"} } } ], @@ -133,4 +142,4 @@ "scale": [1.21484, 1.21484, 1.21484] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/fizzler_emitter.json b/src/main/resources/assets/portalcubed/models/item/fizzler_emitter.json index 62f526be..e2c945b2 100644 --- a/src/main/resources/assets/portalcubed/models/item/fizzler_emitter.json +++ b/src/main/resources/assets/portalcubed/models/item/fizzler_emitter.json @@ -1,8 +1,9 @@ { "credit": "Made by Cart3r using Blockbench.", "textures": { - "0": "portalcubed:item/portal_2_fizzler_icon", - "particle": "portalcubed:item/portal_2_fizzler_icon" + "0": "portalcubed:item/portal_2_fizzler_frame", + "1": "portalcubed:item/portal_2_fizzler_icon", + "particle": "portalcubed:item/portal_2_fizzler_frame" }, "elements": [ { @@ -10,7 +11,9 @@ "from": [11, 3, 7.5], "to": [12, 12, 8.5], "faces": { + "north": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, "east": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, + "south": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, "west": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, "up": {"uv": [11.032, 4.032, 11.968, 4.968], "texture": "#0"}, "down": {"uv": [11.032, 12.032, 11.968, 12.968], "texture": "#0"} @@ -21,7 +24,9 @@ "from": [4, 3, 7.5], "to": [5, 12, 8.5], "faces": { + "north": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, "east": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, + "south": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, "west": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, "up": {"uv": [4.032, 4.032, 4.968, 4.968], "texture": "#0"}, "down": {"uv": [4.032, 12.032, 4.968, 12.968], "texture": "#0"} @@ -32,7 +37,9 @@ "from": [12, 1, 7.5], "to": [13, 14, 8.5], "faces": { + "north": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, "east": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, + "south": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, "west": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, "up": {"uv": [12.032, 2.032, 12.968, 2.968], "texture": "#0"}, "down": {"uv": [12.032, 14.032, 12.968, 14.968], "texture": "#0"} @@ -43,7 +50,9 @@ "from": [3, 1, 7.5], "to": [4, 14, 8.5], "faces": { + "north": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, "east": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, + "south": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, "west": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, "up": {"uv": [3.032, 2.032, 3.968, 2.968], "texture": "#0"}, "down": {"uv": [3.032, 14.032, 3.968, 14.968], "texture": "#0"} @@ -80,12 +89,11 @@ "from": [3, 0, 7.5], "to": [13, 15, 8.5], "faces": { - "north": {"uv": [13, 1, 3, 16], "texture": "#0"}, - "south": {"uv": [13, 1, 3, 16], "texture": "#0"}, - "up": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#0"}, - "down": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#0"} - }, - "portalcubed:render_type": "translucent" + "north": {"uv": [13, 1, 3, 16], "texture": "#1"}, + "south": {"uv": [13, 1, 3, 16], "texture": "#1"}, + "up": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#1"}, + "down": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#1"} + } } ], "gui_light": "front", @@ -119,5 +127,8 @@ "fixed": { "rotation": [0, 180, 0] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } } diff --git a/src/main/resources/assets/portalcubed/models/item/intelligence_core.json b/src/main/resources/assets/portalcubed/models/item/intelligence_core.json index c5c5dbc6..e81befb1 100644 --- a/src/main/resources/assets/portalcubed/models/item/intelligence_core.json +++ b/src/main/resources/assets/portalcubed/models/item/intelligence_core.json @@ -2,7 +2,9 @@ "credit": "Made with Blockbench by Cart3r. ", "texture_size": [32, 32], "textures": { - "0": "portalcubed:entity/portal_1_cores" + "0": "portalcubed:entity/portal_1_cores", + "1": "portalcubed:entity/portal_1_cores_e", + "particle": "portalcubed:entity/portal_1_cores_e" }, "elements": [ { @@ -77,7 +79,14 @@ "from": [6.5, 1.5, 5.075], "to": [9.5, 4.5, 6.075], "faces": { - "north": {"uv": [12.5, 12, 14, 13.5], "texture": "#0"} + "north": {"uv": [12.5, 5, 14, 6.5], "texture": "#0"} + } + }, + { + "from": [6.5, 1.5, 5.075], + "to": [9.5, 4.5, 6.075], + "faces": { + "north": {"uv": [12.5, 5, 14, 6.5], "texture": "#1"} } } ], @@ -120,4 +129,4 @@ "scale": [1.21484, 1.21484, 1.21484] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/laser_fizzler_emitter.json b/src/main/resources/assets/portalcubed/models/item/laser_fizzler_emitter.json index a29c4048..99c88810 100644 --- a/src/main/resources/assets/portalcubed/models/item/laser_fizzler_emitter.json +++ b/src/main/resources/assets/portalcubed/models/item/laser_fizzler_emitter.json @@ -1,8 +1,9 @@ { "credit": "Made by Cart3r using Blockbench.", "textures": { - "0": "portalcubed:item/portal_2_laser_field_icon", - "particle": "portalcubed:item/portal_2_laser_field_icon" + "0": "portalcubed:item/portal_2_laser_fizzler_frame", + "1": "portalcubed:item/portal_2_laser_field_icon", + "particle": "portalcubed:item/portal_2_laser_fizzler_frame" }, "elements": [ { @@ -10,7 +11,9 @@ "from": [11, 3, 7.5], "to": [12, 12, 8.5], "faces": { + "north": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, "east": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, + "south": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, "west": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, "up": {"uv": [11.032, 4.032, 11.968, 4.968], "texture": "#0"}, "down": {"uv": [11.032, 12.032, 11.968, 12.968], "texture": "#0"} @@ -21,7 +24,9 @@ "from": [4, 3, 7.5], "to": [5, 12, 8.5], "faces": { + "north": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, "east": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, + "south": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, "west": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, "up": {"uv": [4.032, 4.032, 4.968, 4.968], "texture": "#0"}, "down": {"uv": [4.032, 12.032, 4.968, 12.968], "texture": "#0"} @@ -32,7 +37,9 @@ "from": [12, 1, 7.5], "to": [13, 14, 8.5], "faces": { + "north": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, "east": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, + "south": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, "west": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, "up": {"uv": [12.032, 2.032, 12.968, 2.968], "texture": "#0"}, "down": {"uv": [12.032, 14.032, 12.968, 14.968], "texture": "#0"} @@ -43,7 +50,9 @@ "from": [3, 1, 7.5], "to": [4, 14, 8.5], "faces": { + "north": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, "east": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, + "south": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, "west": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, "up": {"uv": [3.032, 2.032, 3.968, 2.968], "texture": "#0"}, "down": {"uv": [3.032, 14.032, 3.968, 14.968], "texture": "#0"} @@ -78,14 +87,46 @@ { "name": "transparent", "from": [3, 0, 7.5], + "to": [13, 3, 8.5], + "faces": { + "north": {"uv": [13, 13, 3, 16], "texture": "#1"}, + "south": {"uv": [13, 13, 3, 16], "texture": "#1"}, + "up": {"uv": [3.032, 13.032, 12.968, 13.968], "texture": "#1"}, + "down": {"uv": [3.032, 15.032, 12.968, 15.968], "texture": "#1"} + } + }, + { + "name": "transparent", + "from": [3, 12, 7.5], "to": [13, 15, 8.5], "faces": { - "north": {"uv": [13, 1, 3, 16], "texture": "#0"}, - "south": {"uv": [13, 1, 3, 16], "texture": "#0"}, - "up": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#0"}, - "down": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#0"} - }, - "portalcubed:render_type": "translucent" + "north": {"uv": [13, 1, 3, 4], "texture": "#1"}, + "south": {"uv": [13, 1, 3, 4], "texture": "#1"}, + "up": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#1"}, + "down": {"uv": [3.032, 3.032, 12.968, 3.968], "texture": "#1"} + } + }, + { + "name": "transparent", + "from": [3, 8, 7.5], + "to": [13, 11, 8.5], + "faces": { + "north": {"uv": [13, 5, 3, 8], "texture": "#1"}, + "south": {"uv": [13, 5, 3, 8], "texture": "#1"}, + "up": {"uv": [3.032, 5.032, 12.968, 5.968], "texture": "#1"}, + "down": {"uv": [3.032, 7.032, 12.968, 7.968], "texture": "#1"} + } + }, + { + "name": "transparent", + "from": [3, 4, 7.5], + "to": [13, 7, 8.5], + "faces": { + "north": {"uv": [13, 9, 3, 12], "texture": "#1"}, + "south": {"uv": [13, 9, 3, 12], "texture": "#1"}, + "up": {"uv": [3.032, 9.032, 12.968, 9.968], "texture": "#1"}, + "down": {"uv": [3.032, 11.032, 12.968, 11.968], "texture": "#1"} + } } ], "gui_light": "front", @@ -119,5 +160,8 @@ "fixed": { "rotation": [0, 180, 0] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } } diff --git a/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun.json b/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun.json index 43657115..ce05138b 100644 --- a/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun.json +++ b/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun.json @@ -18,8 +18,7 @@ "west": {"uv": [2.515, 2.515, 4.985, 3.985], "texture": "#0"}, "up": {"uv": [1.735, 2.485, 0.015, 0.015], "texture": "#0"}, "down": {"uv": [3.485, 0.015, 1.765, 2.485], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [4.5, 0, -0.5], @@ -32,8 +31,7 @@ "west": {"uv": [5.515, 8.015, 6.985, 8.735], "texture": "#0"}, "up": {"uv": [6.485, 1.485, 4.765, 0.015], "texture": "#0"}, "down": {"uv": [6.485, 4.015, 4.765, 5.485], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [5.5, 0.75, 4.5], @@ -44,8 +42,7 @@ "west": {"uv": [7.265, 1.515, 8.242, 2.242], "texture": "#0"}, "up": {"uv": [4.742, 1.992, 3.515, 1.015], "texture": "#0"}, "down": {"uv": [1.242, 4.015, 0.008, 4.992], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [5, 1, 0.5], @@ -57,8 +54,7 @@ "south": {"uv": [5.515, 6.765, 6.985, 7.985], "texture": "#0"}, "west": {"uv": [8.015, 0.015, 8.985, 1.235], "texture": "#0"}, "up": {"uv": [8.735, 2.235, 7.265, 1.265], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [6, 1.075, -2.25], @@ -70,8 +66,7 @@ "west": {"uv": [3.765, 8.265, 4.735, 9.235], "texture": "#0"}, "up": {"uv": [9.735, 2.235, 8.765, 1.265], "texture": "#0"}, "down": {"uv": [5.735, 8.765, 4.765, 9.735], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [10.375, -0.4, -5.5], @@ -80,8 +75,7 @@ "faces": { "up": {"uv": [7.492, 5.242, 6.508, 3.508], "texture": "#0"}, "down": {"uv": [7.492, 3.508, 6.508, 5.242], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [1.425, -0.4, -5.5], @@ -90,8 +84,7 @@ "faces": { "up": {"uv": [6.508, 5.242, 7.492, 3.508], "texture": "#0"}, "down": {"uv": [6.508, 3.508, 7.492, 5.242], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [8, 4.875, -5.5], @@ -100,8 +93,7 @@ "faces": { "east": {"uv": [6.508, 5.225, 7.492, 3.508], "rotation": 90, "texture": "#0"}, "west": {"uv": [6.508, 3.508, 7.492, 5.242], "rotation": 90, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [7, 3.75, 3.5], @@ -111,8 +103,7 @@ "east": {"uv": [13.5, 3.508, 16, 4.008], "texture": "#1", "tintindex": 0}, "west": {"uv": [13.5, 3.508, 16, 4.008], "texture": "#1", "tintindex": 0}, "up": {"uv": [14.5, 4.008, 13.5, 1.508], "texture": "#1", "tintindex": 0} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [7.5, 6.025, 10.5], @@ -120,10 +111,10 @@ "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]}, "faces": { "up": {"uv": [4.515, 7.515, 4.015, 7.015], "texture": "#1", "tintindex": 0} - }, - "portalcubed:render_type": "cutout" + } }, { + "name": "transparent", "from": [6.5, 3.25, 4.5], "to": [9.5, 5.25, 8.5], "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]}, @@ -169,5 +160,8 @@ "rotation": [-90, -90, 0], "translation": [-1, 0.25, -8] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } } diff --git a/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun_atlas.json b/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun_atlas.json index 316de214..cb947b55 100644 --- a/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun_atlas.json +++ b/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun_atlas.json @@ -18,8 +18,7 @@ "west": {"uv": [2.515, 2.515, 4.985, 3.985], "texture": "#0"}, "up": {"uv": [5.235, 12.984, 3.515, 10.53], "texture": "#0"}, "down": {"uv": [3.485, 0.015, 1.765, 2.485], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [4.5, 0, -0.5], @@ -32,8 +31,7 @@ "west": {"uv": [5.515, 8.015, 6.985, 8.735], "texture": "#0"}, "up": {"uv": [6.485, 1.485, 4.765, 0.015], "texture": "#0"}, "down": {"uv": [6.485, 4.015, 4.765, 5.485], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [5.5, 0.75, 4.5], @@ -44,8 +42,7 @@ "west": {"uv": [7.265, 1.515, 8.242, 2.242], "texture": "#0"}, "up": {"uv": [4.742, 1.992, 3.515, 1.015], "texture": "#0"}, "down": {"uv": [1.242, 4.015, 0.008, 4.992], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [5, 1, 0.5], @@ -57,8 +54,7 @@ "south": {"uv": [5.515, 6.765, 6.985, 7.985], "texture": "#0"}, "west": {"uv": [8.015, 0.015, 8.985, 1.235], "texture": "#0"}, "up": {"uv": [8.735, 2.235, 7.265, 1.265], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [6, 1.075, -2.25], @@ -70,8 +66,7 @@ "west": {"uv": [3.765, 8.265, 4.735, 9.235], "texture": "#0"}, "up": {"uv": [9.735, 2.235, 8.765, 1.265], "texture": "#0"}, "down": {"uv": [5.735, 8.765, 4.765, 9.735], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [10.375, -0.4, -5.5], @@ -80,8 +75,7 @@ "faces": { "up": {"uv": [7.492, 5.242, 6.508, 3.508], "texture": "#0"}, "down": {"uv": [7.492, 3.508, 6.508, 5.242], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [1.425, -0.4, -5.5], @@ -90,8 +84,7 @@ "faces": { "up": {"uv": [6.508, 5.242, 7.492, 3.508], "texture": "#0"}, "down": {"uv": [6.508, 3.508, 7.492, 5.242], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [8, 4.875, -5.5], @@ -100,8 +93,7 @@ "faces": { "east": {"uv": [6.508, 5.225, 7.492, 3.508], "rotation": 90, "texture": "#0"}, "west": {"uv": [6.508, 3.508, 7.492, 5.242], "rotation": 90, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [7.5, 6.025, 10.5], @@ -109,8 +101,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]}, "faces": { "up": {"uv": [4.515, 7.515, 4.015, 7.015], "texture": "#1", "tintindex": 0} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [7, 3.75, 3.5], @@ -120,17 +111,18 @@ "east": {"uv": [13.5, 3.508, 16, 4.008], "texture": "#1", "tintindex": 0}, "west": {"uv": [13.5, 3.508, 16, 4.008], "texture": "#1", "tintindex": 0}, "up": {"uv": [14.5, 4.008, 13.5, 1.508], "texture": "#1", "tintindex": 0} - }, - "portalcubed:render_type": "cutout" + } }, { + "name": "transparent", "from": [6.5, 3.25, 4.5], "to": [9.5, 5.25, 8.5], "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]}, "faces": { "east": {"uv": [11.008, 0.008, 12.508, 2.508], "rotation": 90, "texture": "#1", "tintindex": 0}, "west": {"uv": [11.008, 0.008, 12.508, 2.508], "rotation": 90, "texture": "#1", "tintindex": 0}, - "up": {"uv": [11.008, 0.008, 12.492, 2.5], "rotation": 90, "texture": "#1", "tintindex": 0} } + "up": {"uv": [11.008, 0.008, 12.492, 2.5], "rotation": 90, "texture": "#1", "tintindex": 0} + } } ], "display": { @@ -168,5 +160,8 @@ "rotation": [-90, -90, 0], "translation": [-1, 0.25, -8] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } } diff --git a/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun_p_body.json b/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun_p_body.json index 18e56d7b..cbbc4180 100644 --- a/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun_p_body.json +++ b/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun_p_body.json @@ -18,8 +18,7 @@ "west": {"uv": [2.515, 2.515, 4.985, 3.985], "texture": "#0"}, "up": {"uv": [1.742, 12.9675, 0.008, 10.53], "texture": "#0"}, "down": {"uv": [3.485, 0.015, 1.765, 2.485], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [4.5, 0, -0.5], @@ -32,8 +31,7 @@ "west": {"uv": [5.515, 8.015, 6.985, 8.735], "texture": "#0"}, "up": {"uv": [6.485, 1.485, 4.765, 0.015], "texture": "#0"}, "down": {"uv": [6.485, 4.015, 4.765, 5.485], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [5.5, 0.75, 4.5], @@ -44,8 +42,7 @@ "west": {"uv": [7.265, 1.515, 8.242, 2.242], "texture": "#0"}, "up": {"uv": [4.742, 1.992, 3.515, 1.015], "texture": "#0"}, "down": {"uv": [1.242, 4.015, 0.008, 4.992], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [5, 1, 0.5], @@ -57,8 +54,7 @@ "south": {"uv": [5.515, 6.765, 6.985, 7.985], "texture": "#0"}, "west": {"uv": [8.015, 0.015, 8.985, 1.235], "texture": "#0"}, "up": {"uv": [8.735, 2.235, 7.265, 1.265], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [6, 1.075, -2.25], @@ -70,8 +66,7 @@ "west": {"uv": [3.765, 8.265, 4.735, 9.235], "texture": "#0"}, "up": {"uv": [9.735, 2.235, 8.765, 1.265], "texture": "#0"}, "down": {"uv": [5.735, 8.765, 4.765, 9.735], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [10.375, -0.4, -5.5], @@ -80,8 +75,7 @@ "faces": { "up": {"uv": [7.492, 5.242, 6.508, 3.508], "texture": "#0"}, "down": {"uv": [7.492, 3.508, 6.508, 5.242], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [1.425, -0.4, -5.5], @@ -90,8 +84,7 @@ "faces": { "up": {"uv": [6.508, 5.242, 7.492, 3.508], "texture": "#0"}, "down": {"uv": [6.508, 3.508, 7.492, 5.242], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [8, 4.875, -5.5], @@ -100,8 +93,7 @@ "faces": { "east": {"uv": [6.508, 5.225, 7.492, 3.508], "rotation": 90, "texture": "#0"}, "west": {"uv": [6.508, 3.508, 7.492, 5.242], "rotation": 90, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [7, 3.75, 3.5], @@ -111,8 +103,7 @@ "east": {"uv": [13.5, 3.508, 16, 4.008], "texture": "#1", "tintindex": 0}, "west": {"uv": [13.5, 3.508, 16, 4.008], "texture": "#1", "tintindex": 0}, "up": {"uv": [14.5, 4.008, 13.5, 1.508], "texture": "#1", "tintindex": 0} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [7.5, 6.025, 10.5], @@ -120,10 +111,10 @@ "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]}, "faces": { "up": {"uv": [4.515, 7.515, 4.015, 7.015], "texture": "#1", "tintindex": 0} - }, - "portalcubed:render_type": "cutout" + } }, { + "name": "transparent", "from": [6.5, 3.25, 4.5], "to": [9.5, 5.25, 8.5], "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]}, @@ -169,5 +160,8 @@ "rotation": [-90, -90, 0], "translation": [-1, 0.25, -8] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } } diff --git a/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun_reloaded.json b/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun_reloaded.json index fd02841f..efcd57e9 100644 --- a/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun_reloaded.json +++ b/src/main/resources/assets/portalcubed/models/item/legacy_portal_gun_reloaded.json @@ -18,8 +18,7 @@ "west": {"uv": [2.515, 2.515, 4.985, 3.985], "texture": "#0"}, "up": {"uv": [8.742, 12.9755, 7.008, 10.538], "texture": "#0"}, "down": {"uv": [3.485, 0.015, 1.765, 2.485], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [4.5, 0, -0.5], @@ -32,8 +31,7 @@ "west": {"uv": [5.515, 8.015, 6.985, 8.735], "texture": "#0"}, "up": {"uv": [6.485, 1.485, 4.765, 0.015], "texture": "#0"}, "down": {"uv": [6.485, 4.015, 4.765, 5.485], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [5.5, 0.75, 4.5], @@ -44,8 +42,7 @@ "west": {"uv": [7.265, 1.515, 8.242, 2.242], "texture": "#0"}, "up": {"uv": [4.742, 1.992, 3.515, 1.015], "texture": "#0"}, "down": {"uv": [1.242, 4.015, 0.008, 4.992], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [5, 1, 0.5], @@ -57,8 +54,7 @@ "south": {"uv": [5.515, 6.765, 6.985, 7.985], "texture": "#0"}, "west": {"uv": [8.015, 0.015, 8.985, 1.235], "texture": "#0"}, "up": {"uv": [8.735, 2.235, 7.265, 1.265], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [6, 1.075, -2.25], @@ -70,8 +66,7 @@ "west": {"uv": [3.765, 8.265, 4.735, 9.235], "texture": "#0"}, "up": {"uv": [9.735, 2.235, 8.765, 1.265], "texture": "#0"}, "down": {"uv": [5.735, 8.765, 4.765, 9.735], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [10.375, -0.4, -5.5], @@ -80,8 +75,7 @@ "faces": { "up": {"uv": [7.492, 5.242, 6.508, 3.508], "texture": "#0"}, "down": {"uv": [7.492, 3.508, 6.508, 5.242], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [1.425, -0.4, -5.5], @@ -90,8 +84,7 @@ "faces": { "up": {"uv": [6.508, 5.242, 7.492, 3.508], "texture": "#0"}, "down": {"uv": [6.508, 3.508, 7.492, 5.242], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [8, 4.875, -5.5], @@ -100,8 +93,7 @@ "faces": { "east": {"uv": [6.508, 5.225, 7.492, 3.508], "rotation": 90, "texture": "#0"}, "west": {"uv": [6.508, 3.508, 7.492, 5.242], "rotation": 90, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [7.5, 6.025, 10.5], @@ -109,8 +101,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]}, "faces": { "up": {"uv": [4.515, 7.515, 4.015, 7.015], "texture": "#1", "tintindex": 0} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [7, 3.75, 3.5], @@ -120,10 +111,10 @@ "east": {"uv": [13.5, 3.508, 16, 4.008], "texture": "#1", "tintindex": 0}, "west": {"uv": [13.5, 3.508, 16, 4.008], "texture": "#1", "tintindex": 0}, "up": {"uv": [14.5, 4.008, 13.5, 1.508], "texture": "#1", "tintindex": 0} - }, - "portalcubed:render_type": "cutout" + } }, { + "name": "transparent", "from": [6.5, 3.25, 4.5], "to": [9.5, 5.25, 8.5], "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]}, @@ -169,5 +160,8 @@ "rotation": [-90, -90, 0], "translation": [-1, 0.25, -8] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } } diff --git a/src/main/resources/assets/portalcubed/models/item/matter_inquisition_field_emitter.json b/src/main/resources/assets/portalcubed/models/item/matter_inquisition_field_emitter.json index 58f78197..bf3082a6 100644 --- a/src/main/resources/assets/portalcubed/models/item/matter_inquisition_field_emitter.json +++ b/src/main/resources/assets/portalcubed/models/item/matter_inquisition_field_emitter.json @@ -1,8 +1,9 @@ { "credit": "Made by Cart3r using Blockbench.", "textures": { - "0": "portalcubed:item/portal_2_matter_inquisition_field_icon", - "particle": "portalcubed:item/portal_2_matter_inquisition_field_icon" + "0": "portalcubed:item/portal_2_fizzler_frame", + "1": "portalcubed:item/portal_2_matter_inquisition_field_icon", + "particle": "portalcubed:item/portal_2_fizzler_frame" }, "elements": [ { @@ -10,7 +11,9 @@ "from": [11, 3, 7.5], "to": [12, 12, 8.5], "faces": { + "north": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, "east": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, + "south": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, "west": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, "up": {"uv": [11.032, 4.032, 11.968, 4.968], "texture": "#0"}, "down": {"uv": [11.032, 12.032, 11.968, 12.968], "texture": "#0"} @@ -21,7 +24,9 @@ "from": [4, 3, 7.5], "to": [5, 12, 8.5], "faces": { + "north": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, "east": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, + "south": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, "west": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, "up": {"uv": [4.032, 4.032, 4.968, 4.968], "texture": "#0"}, "down": {"uv": [4.032, 12.032, 4.968, 12.968], "texture": "#0"} @@ -32,7 +37,9 @@ "from": [12, 1, 7.5], "to": [13, 14, 8.5], "faces": { + "north": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, "east": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, + "south": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, "west": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, "up": {"uv": [12.032, 2.032, 12.968, 2.968], "texture": "#0"}, "down": {"uv": [12.032, 14.032, 12.968, 14.968], "texture": "#0"} @@ -43,7 +50,9 @@ "from": [3, 1, 7.5], "to": [4, 14, 8.5], "faces": { + "north": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, "east": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, + "south": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, "west": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, "up": {"uv": [3.032, 2.032, 3.968, 2.968], "texture": "#0"}, "down": {"uv": [3.032, 14.032, 3.968, 14.968], "texture": "#0"} @@ -80,12 +89,11 @@ "from": [3, 0, 7.5], "to": [13, 15, 8.5], "faces": { - "north": {"uv": [13, 1, 3, 16], "texture": "#0"}, - "south": {"uv": [13, 1, 3, 16], "texture": "#0"}, - "up": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#0"}, - "down": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#0"} - }, - "portalcubed:render_type": "translucent" + "north": {"uv": [12.968, 1.032, 3.032, 15.968], "texture": "#1"}, + "south": {"uv": [12.968, 1.032, 3.032, 15.968], "texture": "#1"}, + "up": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#1"}, + "down": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#1"} + } } ], "gui_light": "front", @@ -119,5 +127,8 @@ "fixed": { "rotation": [0, 180, 0] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } } diff --git a/src/main/resources/assets/portalcubed/models/item/mel_portal_gun.json b/src/main/resources/assets/portalcubed/models/item/mel_portal_gun.json index 1236088b..e296cbcd 100644 --- a/src/main/resources/assets/portalcubed/models/item/mel_portal_gun.json +++ b/src/main/resources/assets/portalcubed/models/item/mel_portal_gun.json @@ -17,8 +17,7 @@ "west": {"uv": [7.016, 0.016, 12.484, 3.484], "texture": "#0"}, "up": {"uv": [13.016, 0.016, 15.984, 5.484], "texture": "#0"}, "down": {"uv": [13.016, 13.984, 15.984, 8.516], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [4.99, -0.01, -2.01], @@ -29,8 +28,7 @@ "west": {"uv": [0.016, 0.016, 3.984, 2.984], "texture": "#0"}, "up": {"uv": [6.984, 3.984, 4.016, 0.016], "texture": "#0"}, "down": {"uv": [6.984, 4.016, 4.016, 7.984], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "name": "cube inverted", @@ -42,8 +40,7 @@ "west": {"uv": [3.984, 2.984, 0.016, 0.016], "texture": "#0"}, "up": {"uv": [4.016, 4.016, 6.984, 7.984], "texture": "#0"}, "down": {"uv": [4.016, 3.984, 6.984, 0.016], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "name": "cube inverted", @@ -56,8 +53,7 @@ "west": {"uv": [12.484, 3.484, 7.016, 0.016], "texture": "#0"}, "up": {"uv": [15.984, 13.984, 13.016, 8.516], "texture": "#0"}, "down": {"uv": [15.984, 0.016, 13.016, 5.484], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [5.5, 0.5, 2], @@ -69,8 +65,7 @@ "west": {"uv": [0.016, 9.016, 7.484, 10.984], "texture": "#0"}, "up": {"uv": [0.016, 13.516, 7.484, 15.984], "rotation": 90, "texture": "#0"}, "down": {"uv": [7.484, 11.016, 0.016, 13.484], "rotation": 90, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [5.5, 4.5, 8], @@ -80,8 +75,7 @@ "east": {"uv": [3, 9.016, 7.468, 9.984], "texture": "#0"}, "south": {"uv": [5.016, 13.516, 5.984, 15.984], "rotation": 270, "texture": "#0"}, "west": {"uv": [3, 9.016, 7.468, 9.984], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [6.45, 4.5, 2], @@ -92,8 +86,7 @@ "south": {"uv": [6.016, 11.516, 7.484, 11.984], "texture": "#0"}, "west": {"uv": [1.516, 11.516, 4.484, 11.984], "texture": "#0"}, "up": {"uv": [6.016, 10.016, 7.484, 12.984], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [1.25, 1.325, -7], @@ -102,8 +95,7 @@ "faces": { "up": {"uv": [12.984, 8.016, 8.016, 9.984], "rotation": 90, "texture": "#0"}, "down": {"uv": [8.016, 8.016, 12.984, 9.984], "rotation": 90, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [1.25, 1.325, 0.925], @@ -112,8 +104,7 @@ "faces": { "up": {"uv": [12.984, 6.016, 8.016, 7.984], "rotation": 90, "texture": "#0"}, "down": {"uv": [8.016, 6.016, 12.984, 7.984], "rotation": 90, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [10.75, 1.325, 0.925], @@ -122,8 +113,7 @@ "faces": { "up": {"uv": [12.984, 7.984, 8.016, 6.016], "rotation": 90, "texture": "#0"}, "down": {"uv": [8.016, 7.984, 12.984, 6.016], "rotation": 90, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [1.75, 0.825, -7], @@ -132,8 +122,7 @@ "faces": { "north": {"uv": [9.032, 14.016, 10.5, 14.484], "texture": "#0"}, "south": {"uv": [10.5, 14.016, 9.032, 14.484], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [10.75, 1.325, -7], @@ -142,8 +131,7 @@ "faces": { "up": {"uv": [12.984, 11.984, 8.016, 10.016], "rotation": 90, "texture": "#0"}, "down": {"uv": [8.016, 11.984, 12.984, 10.016], "rotation": 90, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [8, 7, -7], @@ -152,8 +140,7 @@ "faces": { "east": {"uv": [8.516, 12.016, 12.984, 13.984], "texture": "#0"}, "west": {"uv": [12.984, 12.016, 8.516, 13.984], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [7.99717, 6, 2.00076], @@ -162,8 +149,7 @@ "faces": { "east": {"uv": [9.016, 5.984, 12.984, 4.016], "texture": "#0"}, "west": {"uv": [12.984, 5.984, 9.016, 4.016], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [11.25, 0.825, -7], @@ -172,8 +158,7 @@ "faces": { "north": {"uv": [6.516, 12.484, 6.984, 11.016], "rotation": 270, "texture": "#0"}, "south": {"uv": [6.516, 12.484, 6.984, 11.016], "rotation": 90, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [7.5, 7.575, -7], @@ -182,8 +167,7 @@ "faces": { "north": {"uv": [6.984, 9.516, 6.516, 10.984], "texture": "#0"}, "south": {"uv": [6.984, 9.516, 6.516, 10.984], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [6.5, 2.39289, 0], @@ -196,8 +180,7 @@ "west": {"uv": [6.016, 13.516, 7.484, 15.484], "texture": "#0"}, "up": {"uv": [6.016, 15.484, 7.484, 13.516], "rotation": 90, "texture": "#0"}, "down": {"uv": [7.484, 13.516, 6.016, 15.484], "rotation": 90, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [6.5, 2.39289, -3], @@ -210,8 +193,7 @@ "west": {"uv": [14, 14, 14.5, 16], "texture": "#0"}, "up": {"uv": [14.5, 16, 14, 14], "rotation": 90, "texture": "#0"}, "down": {"uv": [14, 14, 14.5, 16], "rotation": 90, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [6.75, 3.39289, -4], @@ -223,8 +205,7 @@ "west": {"uv": [10.516, 14.016, 11.984, 15.984], "rotation": 90, "texture": "#0"}, "up": {"uv": [10.516, 14.016, 11.984, 15.984], "rotation": 180, "texture": "#0"}, "down": {"uv": [11.984, 15.984, 10.516, 14.016], "rotation": 180, "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [7.49, 0.49, 16.99], @@ -234,8 +215,7 @@ "south": {"uv": [6.516, 9.016, 6.984, 11.484], "texture": "#0"}, "up": {"uv": [6.516, 9.016, 6.984, 9.984], "texture": "#0"}, "down": {"uv": [6.516, 11.016, 6.984, 11.984], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "name": "cube inverted", @@ -246,8 +226,7 @@ "north": {"uv": [6.516, 11.484, 6.984, 9.016], "texture": "#0"}, "up": {"uv": [6.984, 11.016, 6.516, 11.984], "texture": "#0"}, "down": {"uv": [6.984, 9.016, 6.516, 9.984], "texture": "#0"} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [6.5, 6.95, 10], @@ -255,8 +234,7 @@ "rotation": {"angle": 45, "axis": "y", "origin": [8, 6.95, 11.5]}, "faces": { "up": {"uv": [14.5, 14.5, 16, 16], "texture": "#1", "tintindex": 0} - }, - "portalcubed:render_type": "cutout" + } }, { "from": [7.75, 4.275, 3.075], @@ -267,10 +245,10 @@ "west": {"uv": [14.016, 13.5, 14.484, 15.984], "rotation": 90, "texture": "#1", "tintindex": 0}, "up": {"uv": [14.016, 13.516, 14.484, 15.984], "texture": "#1", "tintindex": 0}, "down": {"uv": [14.016, 13.516, 14.484, 15.984], "texture": "#1", "tintindex": 0} - }, - "portalcubed:render_type": "cutout" + } }, { + "name": "transparent", "from": [7, 3.225, 2], "to": [9, 5.225, 8], "rotation": {"angle": 45, "axis": "z", "origin": [8, 4.225, 2.575]}, @@ -344,5 +322,8 @@ 21, 22, 23 - ] + ], + "portalcubed:render_types": { + "translucent": ["transparent"] + } } diff --git a/src/main/resources/assets/portalcubed/models/item/morality_core.json b/src/main/resources/assets/portalcubed/models/item/morality_core.json index 732dfe7b..adf02e21 100644 --- a/src/main/resources/assets/portalcubed/models/item/morality_core.json +++ b/src/main/resources/assets/portalcubed/models/item/morality_core.json @@ -2,7 +2,9 @@ "credit": "Made with Blockbench by Cart3r. ", "texture_size": [32, 32], "textures": { - "0": "portalcubed:entity/portal_1_cores" + "0": "portalcubed:entity/portal_1_cores", + "1": "portalcubed:entity/portal_1_cores_e", + "particle": "portalcubed:entity/portal_1_cores_e" }, "elements": [ { @@ -73,11 +75,18 @@ "down": {"uv": [1.5, 12, 0, 15.5], "rotation": 270, "texture": "#0"} } }, + { + "from": [6.5, 1.5, 5.125], + "to": [9.5, 4.5, 6.125], + "faces": { + "north": {"uv": [12.5, 3.5, 14, 5], "texture": "#0"} + } + }, { "from": [6.5, 1.5, 5.075], "to": [9.5, 4.5, 6.075], "faces": { - "north": {"uv": [12.5, 10.5, 14, 12], "texture": "#0"} + "north": {"uv": [12.5, 3.5, 14, 5], "texture": "#1"} } } ], diff --git a/src/main/resources/assets/portalcubed/models/item/old_aperture_death_fizzler_emitter.json b/src/main/resources/assets/portalcubed/models/item/old_aperture_death_fizzler_emitter.json index 76ef25c9..fdf4212d 100644 --- a/src/main/resources/assets/portalcubed/models/item/old_aperture_death_fizzler_emitter.json +++ b/src/main/resources/assets/portalcubed/models/item/old_aperture_death_fizzler_emitter.json @@ -1,8 +1,9 @@ { "credit": "Made by Cart3r using Blockbench.", "textures": { - "0": "portalcubed:item/old_aperture_death_fizzler_icon", - "particle": "portalcubed:item/old_aperture_death_fizzler_icon" + "0": "portalcubed:item/old_aperture_fizzler_frame", + "1": "portalcubed:item/old_aperture_death_fizzler_icon", + "particle": "portalcubed:item/old_aperture_fizzler_frame" }, "elements": [ { @@ -10,12 +11,12 @@ "from": [13, 0, 7.5], "to": [14, 1, 8.5], "faces": { - "north": {"uv": [14, 15, 13, 16], "texture": "#0"}, - "east": {"uv": [13, 15, 14, 16], "texture": "#0"}, - "south": {"uv": [13, 15, 14, 16], "texture": "#0"}, - "west": {"uv": [13, 15, 14, 16], "texture": "#0"}, - "up": {"uv": [13, 15, 14, 16], "texture": "#0"}, - "down": {"uv": [13, 15, 14, 16], "texture": "#0"} + "north": {"uv": [13.968, 15.032, 13.032, 15.968], "texture": "#0"}, + "east": {"uv": [13.032, 15.032, 13.968, 15.968], "texture": "#0"}, + "south": {"uv": [13.032, 15.032, 13.968, 15.968], "texture": "#0"}, + "west": {"uv": [13.032, 15.032, 13.968, 15.968], "texture": "#0"}, + "up": {"uv": [13.032, 15.032, 13.968, 15.968], "texture": "#0"}, + "down": {"uv": [13.032, 15.032, 13.968, 15.968], "texture": "#0"} } }, { @@ -23,12 +24,12 @@ "from": [2, 0, 7.5], "to": [3, 1, 8.5], "faces": { - "north": {"uv": [3, 15, 2, 16], "texture": "#0"}, - "east": {"uv": [2, 15, 3, 16], "texture": "#0"}, - "south": {"uv": [2, 15, 3, 16], "texture": "#0"}, - "west": {"uv": [2, 15, 3, 16], "texture": "#0"}, - "up": {"uv": [2, 15, 3, 16], "texture": "#0"}, - "down": {"uv": [2, 15, 3, 16], "texture": "#0"} + "north": {"uv": [2.968, 15.032, 2.032, 15.968], "texture": "#0"}, + "east": {"uv": [2.032, 15.032, 2.968, 15.968], "texture": "#0"}, + "south": {"uv": [2.032, 15.032, 2.968, 15.968], "texture": "#0"}, + "west": {"uv": [2.032, 15.032, 2.968, 15.968], "texture": "#0"}, + "up": {"uv": [2.032, 15.032, 2.968, 15.968], "texture": "#0"}, + "down": {"uv": [2.032, 15.032, 2.968, 15.968], "texture": "#0"} } }, { @@ -36,10 +37,12 @@ "from": [11, 2, 7.5], "to": [12, 4, 8.5], "faces": { - "east": {"uv": [11, 12, 12, 14], "texture": "#0"}, - "west": {"uv": [11, 12, 12, 14], "texture": "#0"}, - "up": {"uv": [11, 12, 12, 13], "texture": "#0"}, - "down": {"uv": [11, 13, 12, 14], "texture": "#0"} + "north": {"uv": [11.032, 12.032, 11.968, 13.968], "texture": "#0"}, + "east": {"uv": [11.032, 12.032, 11.968, 13.968], "texture": "#0"}, + "south": {"uv": [11.032, 12.032, 11.968, 13.968], "texture": "#0"}, + "west": {"uv": [11.032, 12.032, 11.968, 13.968], "texture": "#0"}, + "up": {"uv": [11.032, 12.032, 11.968, 12.968], "texture": "#0"}, + "down": {"uv": [11.032, 13.032, 11.968, 13.968], "texture": "#0"} } }, { @@ -47,10 +50,12 @@ "from": [4, 2, 7.5], "to": [5, 4, 8.5], "faces": { - "east": {"uv": [4, 12, 5, 14], "texture": "#0"}, - "west": {"uv": [4, 12, 5, 14], "texture": "#0"}, - "up": {"uv": [4, 12, 5, 13], "texture": "#0"}, - "down": {"uv": [4, 13, 5, 14], "texture": "#0"} + "north": {"uv": [4.032, 12.032, 4.968, 13.968], "texture": "#0"}, + "east": {"uv": [4.032, 12.032, 4.968, 13.968], "texture": "#0"}, + "south": {"uv": [4.032, 12.032, 4.968, 13.968], "texture": "#0"}, + "west": {"uv": [4.032, 12.032, 4.968, 13.968], "texture": "#0"}, + "up": {"uv": [4.032, 12.032, 4.968, 12.968], "texture": "#0"}, + "down": {"uv": [4.032, 13.032, 4.968, 13.968], "texture": "#0"} } }, { @@ -58,10 +63,12 @@ "from": [11, 6, 7.5], "to": [12, 8, 8.5], "faces": { - "east": {"uv": [11, 8, 12, 10], "texture": "#0"}, - "west": {"uv": [11, 8, 12, 10], "texture": "#0"}, - "up": {"uv": [11, 8, 12, 9], "texture": "#0"}, - "down": {"uv": [11, 9, 12, 10], "texture": "#0"} + "north": {"uv": [11.032, 8.032, 11.968, 9.968], "texture": "#0"}, + "east": {"uv": [11.032, 8.032, 11.968, 9.968], "texture": "#0"}, + "south": {"uv": [11.032, 8.032, 11.968, 9.968], "texture": "#0"}, + "west": {"uv": [11.032, 8.032, 11.968, 9.968], "texture": "#0"}, + "up": {"uv": [11.032, 8.032, 11.968, 8.968], "texture": "#0"}, + "down": {"uv": [11.032, 9.032, 11.968, 9.968], "texture": "#0"} } }, { @@ -69,10 +76,12 @@ "from": [4, 6, 7.5], "to": [5, 8, 8.5], "faces": { - "east": {"uv": [4, 8, 5, 10], "texture": "#0"}, - "west": {"uv": [4, 8, 5, 10], "texture": "#0"}, - "up": {"uv": [4, 8, 5, 9], "texture": "#0"}, - "down": {"uv": [4, 9, 5, 10], "texture": "#0"} + "north": {"uv": [4.032, 8.032, 4.968, 9.968], "texture": "#0"}, + "east": {"uv": [4.032, 8.032, 4.968, 9.968], "texture": "#0"}, + "south": {"uv": [4.032, 8.032, 4.968, 9.968], "texture": "#0"}, + "west": {"uv": [4.032, 8.032, 4.968, 9.968], "texture": "#0"}, + "up": {"uv": [4.032, 8.032, 4.968, 8.968], "texture": "#0"}, + "down": {"uv": [4.032, 9.032, 4.968, 9.968], "texture": "#0"} } }, { @@ -80,12 +89,12 @@ "from": [14, 0, 7.5], "to": [15, 10, 8.5], "faces": { - "north": {"uv": [15, 6, 14, 16], "texture": "#0"}, - "east": {"uv": [14, 6, 15, 16], "texture": "#0"}, - "south": {"uv": [14, 6, 15, 16], "texture": "#0"}, - "west": {"uv": [14, 6, 15, 16], "texture": "#0"}, - "up": {"uv": [14, 6, 15, 7], "texture": "#0"}, - "down": {"uv": [14, 15, 15, 16], "texture": "#0"} + "north": {"uv": [14.968, 6.032, 14.032, 15.968], "texture": "#0"}, + "east": {"uv": [14.032, 6.032, 14.968, 15.968], "texture": "#0"}, + "south": {"uv": [14.032, 6.032, 14.968, 15.968], "texture": "#0"}, + "west": {"uv": [14.032, 6.032, 14.968, 15.968], "texture": "#0"}, + "up": {"uv": [14.032, 6.032, 14.968, 6.968], "texture": "#0"}, + "down": {"uv": [14.032, 15.032, 14.968, 15.968], "texture": "#0"} } }, { @@ -93,12 +102,12 @@ "from": [12, 0, 7.5], "to": [13, 10, 8.5], "faces": { - "north": {"uv": [13, 6, 12, 16], "texture": "#0"}, - "east": {"uv": [12, 6, 13, 16], "texture": "#0"}, - "south": {"uv": [12, 6, 13, 16], "texture": "#0"}, - "west": {"uv": [12, 6, 13, 16], "texture": "#0"}, - "up": {"uv": [12, 6, 13, 7], "texture": "#0"}, - "down": {"uv": [12, 15, 13, 16], "texture": "#0"} + "north": {"uv": [12.968, 6.032, 12.032, 15.968], "texture": "#0"}, + "east": {"uv": [12.032, 6.032, 12.968, 15.968], "texture": "#0"}, + "south": {"uv": [12.032, 6.032, 12.968, 15.968], "texture": "#0"}, + "west": {"uv": [12.032, 6.032, 12.968, 15.968], "texture": "#0"}, + "up": {"uv": [12.032, 6.032, 12.968, 6.968], "texture": "#0"}, + "down": {"uv": [12.032, 15.032, 12.968, 15.968], "texture": "#0"} } }, { @@ -106,12 +115,12 @@ "from": [3, 0, 7.5], "to": [4, 10, 8.5], "faces": { - "north": {"uv": [4, 6, 3, 16], "texture": "#0"}, - "east": {"uv": [3, 6, 4, 16], "texture": "#0"}, - "south": {"uv": [3, 6, 4, 16], "texture": "#0"}, - "west": {"uv": [3, 6, 4, 16], "texture": "#0"}, - "up": {"uv": [3, 6, 4, 7], "texture": "#0"}, - "down": {"uv": [3, 15, 4, 16], "texture": "#0"} + "north": {"uv": [3.968, 6.032, 3.032, 15.968], "texture": "#0"}, + "east": {"uv": [3.032, 6.032, 3.968, 15.968], "texture": "#0"}, + "south": {"uv": [3.032, 6.032, 3.968, 15.968], "texture": "#0"}, + "west": {"uv": [3.032, 6.032, 3.968, 15.968], "texture": "#0"}, + "up": {"uv": [3.032, 6.032, 3.968, 6.968], "texture": "#0"}, + "down": {"uv": [3.032, 15.032, 3.968, 15.968], "texture": "#0"} } }, { @@ -119,12 +128,12 @@ "from": [1, 0, 7.5], "to": [2, 10, 8.5], "faces": { - "north": {"uv": [2, 6, 1, 16], "texture": "#0"}, - "east": {"uv": [1, 6, 2, 16], "texture": "#0"}, - "south": {"uv": [1, 6, 2, 16], "texture": "#0"}, - "west": {"uv": [1, 6, 2, 16], "texture": "#0"}, - "up": {"uv": [1, 6, 2, 7], "texture": "#0"}, - "down": {"uv": [1, 15, 2, 16], "texture": "#0"} + "north": {"uv": [1.968, 6.032, 1.032, 15.968], "texture": "#0"}, + "east": {"uv": [1.032, 6.032, 1.968, 15.968], "texture": "#0"}, + "south": {"uv": [1.032, 6.032, 1.968, 15.968], "texture": "#0"}, + "west": {"uv": [1.032, 6.032, 1.968, 15.968], "texture": "#0"}, + "up": {"uv": [1.032, 6.032, 1.968, 6.968], "texture": "#0"}, + "down": {"uv": [1.032, 15.032, 1.968, 15.968], "texture": "#0"} } }, { @@ -132,10 +141,12 @@ "from": [11, 11, 7.5], "to": [12, 13, 8.5], "faces": { - "east": {"uv": [11, 3, 12, 5], "texture": "#0"}, - "west": {"uv": [11, 3, 12, 5], "texture": "#0"}, - "up": {"uv": [11, 3, 12, 4], "texture": "#0"}, - "down": {"uv": [11, 4, 12, 5], "texture": "#0"} + "north": {"uv": [11.032, 3.032, 11.968, 4.968], "texture": "#0"}, + "east": {"uv": [11.032, 3.032, 11.968, 4.968], "texture": "#0"}, + "south": {"uv": [11.032, 3.032, 11.968, 4.968], "texture": "#0"}, + "west": {"uv": [11.032, 3.032, 11.968, 4.968], "texture": "#0"}, + "up": {"uv": [11.032, 3.032, 11.968, 3.968], "texture": "#0"}, + "down": {"uv": [11.032, 4.032, 11.968, 4.968], "texture": "#0"} } }, { @@ -143,10 +154,12 @@ "from": [4, 11, 7.5], "to": [5, 13, 8.5], "faces": { - "east": {"uv": [4, 3, 5, 5], "texture": "#0"}, - "west": {"uv": [4, 3, 5, 5], "texture": "#0"}, - "up": {"uv": [4, 3, 5, 4], "texture": "#0"}, - "down": {"uv": [4, 4, 5, 5], "texture": "#0"} + "north": {"uv": [11.032, 3.032, 11.968, 4.968], "texture": "#0"}, + "east": {"uv": [4.032, 3.032, 4.968, 4.968], "texture": "#0"}, + "south": {"uv": [11.032, 3.032, 11.968, 4.968], "texture": "#0"}, + "west": {"uv": [11.032, 3.032, 11.968, 4.968], "texture": "#0"}, + "up": {"uv": [4.032, 3.032, 4.968, 3.968], "texture": "#0"}, + "down": {"uv": [4.032, 4.032, 4.968, 4.968], "texture": "#0"} } }, { @@ -154,12 +167,12 @@ "from": [12, 10, 7.5], "to": [15, 15, 8.5], "faces": { - "north": {"uv": [15, 1, 12, 6], "texture": "#0"}, - "east": {"uv": [14, 1, 15, 6], "texture": "#0"}, - "south": {"uv": [12, 1, 15, 6], "texture": "#0"}, - "west": {"uv": [12, 1, 13, 6], "texture": "#0"}, - "up": {"uv": [12, 1, 15, 2], "texture": "#0"}, - "down": {"uv": [12, 5, 15, 6], "texture": "#0"} + "north": {"uv": [14.968, 1.032, 12.032, 5.968], "texture": "#0"}, + "east": {"uv": [14.032, 1.032, 14.968, 5.968], "texture": "#0"}, + "south": {"uv": [12.032, 1.032, 14.968, 5.968], "texture": "#0"}, + "west": {"uv": [12.032, 1.032, 12.968, 5.968], "texture": "#0"}, + "up": {"uv": [12.032, 1.032, 14.968, 1.968], "texture": "#0"}, + "down": {"uv": [12.032, 5.032, 14.968, 5.968], "texture": "#0"} } }, { @@ -167,25 +180,24 @@ "from": [1, 10, 7.5], "to": [4, 15, 8.5], "faces": { - "north": {"uv": [4, 1, 1, 6], "texture": "#0"}, - "east": {"uv": [3, 1, 4, 6], "texture": "#0"}, - "south": {"uv": [1, 1, 4, 6], "texture": "#0"}, - "west": {"uv": [1, 1, 2, 6], "texture": "#0"}, - "up": {"uv": [1, 1, 4, 2], "texture": "#0"}, - "down": {"uv": [1, 5, 4, 6], "texture": "#0"} + "north": {"uv": [3.968, 1.032, 1.032, 5.968], "texture": "#0"}, + "east": {"uv": [3.032, 1.032, 3.968, 5.968], "texture": "#0"}, + "south": {"uv": [1.032, 1.032, 3.968, 5.968], "texture": "#0"}, + "west": {"uv": [1.032, 1.032, 1.968, 5.968], "texture": "#0"}, + "up": {"uv": [1.032, 1.032, 3.968, 1.968], "texture": "#0"}, + "down": {"uv": [1.032, 5.032, 3.968, 5.968], "texture": "#0"} } }, { - "name": "translucent", + "name": "transparent", "from": [4, 1, 7.5], "to": [12, 14, 8.5], "faces": { - "north": {"uv": [12, 2, 4, 15], "texture": "#0"}, - "south": {"uv": [12, 2, 4, 15], "texture": "#0"}, - "up": {"uv": [4, 2, 12, 3], "texture": "#0"}, - "down": {"uv": [4, 14, 12, 15], "texture": "#0"} - }, - "portalcubed:render_type": "translucent" + "north": {"uv": [12, 2, 4, 15], "texture": "#1"}, + "south": {"uv": [12, 2, 4, 15], "texture": "#1"}, + "up": {"uv": [4, 2, 12, 3], "texture": "#1"}, + "down": {"uv": [4, 14, 12, 15], "texture": "#1"} + } } ], "gui_light": "front", @@ -219,5 +231,8 @@ "fixed": { "rotation": [0, 180, 0] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } } diff --git a/src/main/resources/assets/portalcubed/models/item/old_aperture_fizzler_emitter.json b/src/main/resources/assets/portalcubed/models/item/old_aperture_fizzler_emitter.json index b9963de4..12315056 100644 --- a/src/main/resources/assets/portalcubed/models/item/old_aperture_fizzler_emitter.json +++ b/src/main/resources/assets/portalcubed/models/item/old_aperture_fizzler_emitter.json @@ -1,8 +1,9 @@ { "credit": "Made by Cart3r using Blockbench.", "textures": { - "0": "portalcubed:item/old_aperture_fizzler_icon", - "particle": "portalcubed:item/old_aperture_fizzler_icon" + "0": "portalcubed:item/old_aperture_fizzler_frame", + "1": "portalcubed:item/old_aperture_fizzler_icon", + "particle": "portalcubed:item/old_aperture_fizzler_frame" }, "elements": [ { @@ -10,12 +11,12 @@ "from": [13, 0, 7.5], "to": [14, 1, 8.5], "faces": { - "north": {"uv": [14, 15, 13, 16], "texture": "#0"}, - "east": {"uv": [13, 15, 14, 16], "texture": "#0"}, - "south": {"uv": [13, 15, 14, 16], "texture": "#0"}, - "west": {"uv": [13, 15, 14, 16], "texture": "#0"}, - "up": {"uv": [13, 15, 14, 16], "texture": "#0"}, - "down": {"uv": [13, 15, 14, 16], "texture": "#0"} + "north": {"uv": [13.968, 15.032, 13.032, 15.968], "texture": "#0"}, + "east": {"uv": [13.032, 15.032, 13.968, 15.968], "texture": "#0"}, + "south": {"uv": [13.032, 15.032, 13.968, 15.968], "texture": "#0"}, + "west": {"uv": [13.032, 15.032, 13.968, 15.968], "texture": "#0"}, + "up": {"uv": [13.032, 15.032, 13.968, 15.968], "texture": "#0"}, + "down": {"uv": [13.032, 15.032, 13.968, 15.968], "texture": "#0"} } }, { @@ -23,12 +24,12 @@ "from": [2, 0, 7.5], "to": [3, 1, 8.5], "faces": { - "north": {"uv": [3, 15, 2, 16], "texture": "#0"}, - "east": {"uv": [2, 15, 3, 16], "texture": "#0"}, - "south": {"uv": [2, 15, 3, 16], "texture": "#0"}, - "west": {"uv": [2, 15, 3, 16], "texture": "#0"}, - "up": {"uv": [2, 15, 3, 16], "texture": "#0"}, - "down": {"uv": [2, 15, 3, 16], "texture": "#0"} + "north": {"uv": [2.968, 15.032, 2.032, 15.968], "texture": "#0"}, + "east": {"uv": [2.032, 15.032, 2.968, 15.968], "texture": "#0"}, + "south": {"uv": [2.032, 15.032, 2.968, 15.968], "texture": "#0"}, + "west": {"uv": [2.032, 15.032, 2.968, 15.968], "texture": "#0"}, + "up": {"uv": [2.032, 15.032, 2.968, 15.968], "texture": "#0"}, + "down": {"uv": [2.032, 15.032, 2.968, 15.968], "texture": "#0"} } }, { @@ -36,10 +37,12 @@ "from": [11, 2, 7.5], "to": [12, 4, 8.5], "faces": { - "east": {"uv": [11, 12, 12, 14], "texture": "#0"}, - "west": {"uv": [11, 12, 12, 14], "texture": "#0"}, - "up": {"uv": [11, 12, 12, 13], "texture": "#0"}, - "down": {"uv": [11, 13, 12, 14], "texture": "#0"} + "north": {"uv": [4.032, 12.032, 4.968, 13.968], "texture": "#0"}, + "east": {"uv": [11.032, 12.032, 11.968, 13.968], "texture": "#0"}, + "south": {"uv": [4.032, 12.032, 4.968, 13.968], "texture": "#0"}, + "west": {"uv": [11.032, 12.032, 11.968, 13.968], "texture": "#0"}, + "up": {"uv": [11.032, 12.032, 11.968, 12.968], "texture": "#0"}, + "down": {"uv": [11.032, 13.032, 11.968, 13.968], "texture": "#0"} } }, { @@ -47,10 +50,12 @@ "from": [4, 2, 7.5], "to": [5, 4, 8.5], "faces": { - "east": {"uv": [4, 12, 5, 14], "texture": "#0"}, - "west": {"uv": [4, 12, 5, 14], "texture": "#0"}, - "up": {"uv": [4, 12, 5, 13], "texture": "#0"}, - "down": {"uv": [4, 13, 5, 14], "texture": "#0"} + "north": {"uv": [11.032, 12.032, 11.968, 13.968], "texture": "#0"}, + "east": {"uv": [4.032, 12.032, 4.968, 13.968], "texture": "#0"}, + "south": {"uv": [11.032, 12.032, 11.968, 13.968], "texture": "#0"}, + "west": {"uv": [4.032, 12.032, 4.968, 13.968], "texture": "#0"}, + "up": {"uv": [4.032, 12.032, 4.968, 12.968], "texture": "#0"}, + "down": {"uv": [4.032, 13.032, 4.968, 13.968], "texture": "#0"} } }, { @@ -58,10 +63,12 @@ "from": [11, 6, 7.5], "to": [12, 8, 8.5], "faces": { - "east": {"uv": [11, 8, 12, 10], "texture": "#0"}, - "west": {"uv": [11, 8, 12, 10], "texture": "#0"}, - "up": {"uv": [11, 8, 12, 9], "texture": "#0"}, - "down": {"uv": [11, 9, 12, 10], "texture": "#0"} + "north": {"uv": [4.032, 8.032, 4.968, 9.968], "texture": "#0"}, + "east": {"uv": [11.032, 8.032, 11.968, 9.968], "texture": "#0"}, + "south": {"uv": [4.032, 8.032, 4.968, 9.968], "texture": "#0"}, + "west": {"uv": [11.032, 8.032, 11.968, 9.968], "texture": "#0"}, + "up": {"uv": [11.032, 8.032, 11.968, 8.968], "texture": "#0"}, + "down": {"uv": [11.032, 9.032, 11.968, 9.968], "texture": "#0"} } }, { @@ -69,10 +76,12 @@ "from": [4, 6, 7.5], "to": [5, 8, 8.5], "faces": { - "east": {"uv": [4, 8, 5, 10], "texture": "#0"}, - "west": {"uv": [4, 8, 5, 10], "texture": "#0"}, - "up": {"uv": [4, 8, 5, 9], "texture": "#0"}, - "down": {"uv": [4, 9, 5, 10], "texture": "#0"} + "north": {"uv": [11.032, 8.032, 11.968, 9.968], "texture": "#0"}, + "east": {"uv": [4.032, 8.032, 4.968, 9.968], "texture": "#0"}, + "south": {"uv": [11.032, 8.032, 11.968, 9.968], "texture": "#0"}, + "west": {"uv": [4.032, 8.032, 4.968, 9.968], "texture": "#0"}, + "up": {"uv": [4.032, 8.032, 4.968, 8.968], "texture": "#0"}, + "down": {"uv": [4.032, 9.032, 4.968, 9.968], "texture": "#0"} } }, { @@ -80,12 +89,12 @@ "from": [14, 0, 7.5], "to": [15, 10, 8.5], "faces": { - "north": {"uv": [15, 6, 14, 16], "texture": "#0"}, - "east": {"uv": [14, 6, 15, 16], "texture": "#0"}, - "south": {"uv": [14, 6, 15, 16], "texture": "#0"}, - "west": {"uv": [14, 6, 15, 16], "texture": "#0"}, - "up": {"uv": [14, 6, 15, 7], "texture": "#0"}, - "down": {"uv": [14, 15, 15, 16], "texture": "#0"} + "north": {"uv": [14.968, 6.032, 14.032, 15.968], "texture": "#0"}, + "east": {"uv": [14.032, 6.032, 14.968, 15.968], "texture": "#0"}, + "south": {"uv": [14.032, 6.032, 14.968, 15.968], "texture": "#0"}, + "west": {"uv": [14.032, 6.032, 14.968, 15.968], "texture": "#0"}, + "up": {"uv": [14.032, 6.032, 14.968, 6.968], "texture": "#0"}, + "down": {"uv": [14.032, 15.032, 14.968, 15.968], "texture": "#0"} } }, { @@ -93,12 +102,12 @@ "from": [12, 0, 7.5], "to": [13, 10, 8.5], "faces": { - "north": {"uv": [13, 6, 12, 16], "texture": "#0"}, - "east": {"uv": [12, 6, 13, 16], "texture": "#0"}, - "south": {"uv": [12, 6, 13, 16], "texture": "#0"}, - "west": {"uv": [12, 6, 13, 16], "texture": "#0"}, - "up": {"uv": [12, 6, 13, 7], "texture": "#0"}, - "down": {"uv": [12, 15, 13, 16], "texture": "#0"} + "north": {"uv": [12.968, 6.032, 12.032, 15.968], "texture": "#0"}, + "east": {"uv": [12.032, 6.032, 12.968, 15.968], "texture": "#0"}, + "south": {"uv": [12.032, 6.032, 12.968, 15.968], "texture": "#0"}, + "west": {"uv": [12.032, 6.032, 12.968, 15.968], "texture": "#0"}, + "up": {"uv": [12.032, 6.032, 12.968, 6.968], "texture": "#0"}, + "down": {"uv": [12.032, 15.032, 12.968, 15.968], "texture": "#0"} } }, { @@ -106,12 +115,12 @@ "from": [3, 0, 7.5], "to": [4, 10, 8.5], "faces": { - "north": {"uv": [4, 6, 3, 16], "texture": "#0"}, - "east": {"uv": [3, 6, 4, 16], "texture": "#0"}, - "south": {"uv": [3, 6, 4, 16], "texture": "#0"}, - "west": {"uv": [3, 6, 4, 16], "texture": "#0"}, - "up": {"uv": [3, 6, 4, 7], "texture": "#0"}, - "down": {"uv": [3, 15, 4, 16], "texture": "#0"} + "north": {"uv": [3.968, 6.032, 3.032, 15.968], "texture": "#0"}, + "east": {"uv": [3.032, 6.032, 3.968, 15.968], "texture": "#0"}, + "south": {"uv": [3.032, 6.032, 3.968, 15.968], "texture": "#0"}, + "west": {"uv": [3.032, 6.032, 3.968, 15.968], "texture": "#0"}, + "up": {"uv": [3.032, 6.032, 3.968, 6.968], "texture": "#0"}, + "down": {"uv": [3.032, 15.032, 3.968, 15.968], "texture": "#0"} } }, { @@ -119,12 +128,12 @@ "from": [1, 0, 7.5], "to": [2, 10, 8.5], "faces": { - "north": {"uv": [2, 6, 1, 16], "texture": "#0"}, - "east": {"uv": [1, 6, 2, 16], "texture": "#0"}, - "south": {"uv": [1, 6, 2, 16], "texture": "#0"}, - "west": {"uv": [1, 6, 2, 16], "texture": "#0"}, - "up": {"uv": [1, 6, 2, 7], "texture": "#0"}, - "down": {"uv": [1, 15, 2, 16], "texture": "#0"} + "north": {"uv": [1.968, 6.032, 1.032, 15.968], "texture": "#0"}, + "east": {"uv": [1.032, 6.032, 1.968, 15.968], "texture": "#0"}, + "south": {"uv": [1.032, 6.032, 1.968, 15.968], "texture": "#0"}, + "west": {"uv": [1.032, 6.032, 1.968, 15.968], "texture": "#0"}, + "up": {"uv": [1.032, 6.032, 1.968, 6.968], "texture": "#0"}, + "down": {"uv": [1.032, 15.032, 1.968, 15.968], "texture": "#0"} } }, { @@ -132,10 +141,12 @@ "from": [11, 11, 7.5], "to": [12, 13, 8.5], "faces": { - "east": {"uv": [11, 3, 12, 5], "texture": "#0"}, - "west": {"uv": [11, 3, 12, 5], "texture": "#0"}, - "up": {"uv": [11, 3, 12, 4], "texture": "#0"}, - "down": {"uv": [11, 4, 12, 5], "texture": "#0"} + "north": {"uv": [4.032, 3.032, 4.968, 4.968], "texture": "#0"}, + "east": {"uv": [11.032, 3.032, 11.968, 4.968], "texture": "#0"}, + "south": {"uv": [4.032, 3.032, 4.968, 4.968], "texture": "#0"}, + "west": {"uv": [11.032, 3.032, 11.968, 4.968], "texture": "#0"}, + "up": {"uv": [11.032, 3.032, 11.968, 3.968], "texture": "#0"}, + "down": {"uv": [11.032, 4.032, 11.968, 4.968], "texture": "#0"} } }, { @@ -143,10 +154,12 @@ "from": [4, 11, 7.5], "to": [5, 13, 8.5], "faces": { - "east": {"uv": [4, 3, 5, 5], "texture": "#0"}, - "west": {"uv": [4, 3, 5, 5], "texture": "#0"}, - "up": {"uv": [4, 3, 5, 4], "texture": "#0"}, - "down": {"uv": [4, 4, 5, 5], "texture": "#0"} + "north": {"uv": [11.032, 3.032, 11.968, 4.968], "texture": "#0"}, + "east": {"uv": [4.032, 3.032, 4.968, 4.968], "texture": "#0"}, + "south": {"uv": [11.032, 3.032, 11.968, 4.968], "texture": "#0"}, + "west": {"uv": [4.032, 3.032, 4.968, 4.968], "texture": "#0"}, + "up": {"uv": [4.032, 3.032, 4.968, 3.968], "texture": "#0"}, + "down": {"uv": [4.032, 4.032, 4.968, 4.968], "texture": "#0"} } }, { @@ -154,12 +167,12 @@ "from": [12, 10, 7.5], "to": [15, 15, 8.5], "faces": { - "north": {"uv": [15, 1, 12, 6], "texture": "#0"}, - "east": {"uv": [14, 1, 15, 6], "texture": "#0"}, - "south": {"uv": [12, 1, 15, 6], "texture": "#0"}, - "west": {"uv": [12, 1, 13, 6], "texture": "#0"}, - "up": {"uv": [12, 1, 15, 2], "texture": "#0"}, - "down": {"uv": [12, 5, 15, 6], "texture": "#0"} + "north": {"uv": [14.968, 1.032, 12.032, 5.968], "texture": "#0"}, + "east": {"uv": [14.032, 1.032, 14.968, 5.968], "texture": "#0"}, + "south": {"uv": [12.032, 1.032, 14.968, 5.968], "texture": "#0"}, + "west": {"uv": [12.032, 1.032, 12.968, 5.968], "texture": "#0"}, + "up": {"uv": [12.032, 1.032, 14.968, 1.968], "texture": "#0"}, + "down": {"uv": [12.032, 5.032, 14.968, 5.968], "texture": "#0"} } }, { @@ -167,25 +180,24 @@ "from": [1, 10, 7.5], "to": [4, 15, 8.5], "faces": { - "north": {"uv": [4, 1, 1, 6], "texture": "#0"}, - "east": {"uv": [3, 1, 4, 6], "texture": "#0"}, - "south": {"uv": [1, 1, 4, 6], "texture": "#0"}, - "west": {"uv": [1, 1, 2, 6], "texture": "#0"}, - "up": {"uv": [1, 1, 4, 2], "texture": "#0"}, - "down": {"uv": [1, 5, 4, 6], "texture": "#0"} + "north": {"uv": [3.968, 1.032, 1.032, 5.968], "texture": "#0"}, + "east": {"uv": [3.032, 1.032, 3.968, 5.968], "texture": "#0"}, + "south": {"uv": [1.032, 1.032, 3.968, 5.968], "texture": "#0"}, + "west": {"uv": [1.032, 1.032, 1.968, 5.968], "texture": "#0"}, + "up": {"uv": [1.032, 1.032, 3.968, 1.968], "texture": "#0"}, + "down": {"uv": [1.032, 5.032, 3.968, 5.968], "texture": "#0"} } }, { - "name": "translucent", + "name": "transparent", "from": [4, 1, 7.5], "to": [12, 14, 8.5], "faces": { - "north": {"uv": [12, 2, 4, 15], "texture": "#0"}, - "south": {"uv": [12, 2, 4, 15], "texture": "#0"}, - "up": {"uv": [4, 2, 12, 3], "texture": "#0"}, - "down": {"uv": [4, 14, 12, 15], "texture": "#0"} - }, - "portalcubed:render_type": "translucent" + "north": {"uv": [12, 2, 4, 15], "texture": "#1"}, + "south": {"uv": [12, 2, 4, 15], "texture": "#1"}, + "up": {"uv": [4, 2, 12, 3], "texture": "#1"}, + "down": {"uv": [4, 14, 12, 15], "texture": "#1"} + } } ], "gui_light": "front", @@ -219,5 +231,8 @@ "fixed": { "rotation": [0, 180, 0] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } } diff --git a/src/main/resources/assets/portalcubed/models/item/physics_repulsion_field_emitter.json b/src/main/resources/assets/portalcubed/models/item/physics_repulsion_field_emitter.json index 1f601ce3..607bfb11 100644 --- a/src/main/resources/assets/portalcubed/models/item/physics_repulsion_field_emitter.json +++ b/src/main/resources/assets/portalcubed/models/item/physics_repulsion_field_emitter.json @@ -1,8 +1,9 @@ { "credit": "Made by Cart3r using Blockbench.", "textures": { - "0": "portalcubed:item/portal_2_physics_repulsion_field_icon", - "particle": "portalcubed:item/portal_2_physics_repulsion_field_icon" + "0": "portalcubed:item/portal_2_fizzler_frame", + "1": "portalcubed:item/portal_2_physics_repulsion_field_icon", + "particle": "portalcubed:item/portal_2_fizzler_frame" }, "elements": [ { @@ -10,7 +11,9 @@ "from": [11, 3, 7.5], "to": [12, 12, 8.5], "faces": { + "north": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, "east": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, + "south": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, "west": {"uv": [11.032, 4.032, 11.968, 12.968], "texture": "#0"}, "up": {"uv": [11.032, 4.032, 11.968, 4.968], "texture": "#0"}, "down": {"uv": [11.032, 12.032, 11.968, 12.968], "texture": "#0"} @@ -21,7 +24,9 @@ "from": [4, 3, 7.5], "to": [5, 12, 8.5], "faces": { + "north": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, "east": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, + "south": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, "west": {"uv": [4.032, 4.032, 4.968, 12.968], "texture": "#0"}, "up": {"uv": [4.032, 4.032, 4.968, 4.968], "texture": "#0"}, "down": {"uv": [4.032, 12.032, 4.968, 12.968], "texture": "#0"} @@ -32,7 +37,9 @@ "from": [12, 1, 7.5], "to": [13, 14, 8.5], "faces": { + "north": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, "east": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, + "south": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, "west": {"uv": [12.032, 2.032, 12.968, 14.968], "texture": "#0"}, "up": {"uv": [12.032, 2.032, 12.968, 2.968], "texture": "#0"}, "down": {"uv": [12.032, 14.032, 12.968, 14.968], "texture": "#0"} @@ -43,7 +50,9 @@ "from": [3, 1, 7.5], "to": [4, 14, 8.5], "faces": { + "north": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, "east": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, + "south": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, "west": {"uv": [3.032, 2.032, 3.968, 14.968], "texture": "#0"}, "up": {"uv": [3.032, 2.032, 3.968, 2.968], "texture": "#0"}, "down": {"uv": [3.032, 14.032, 3.968, 14.968], "texture": "#0"} @@ -80,12 +89,11 @@ "from": [3, 0, 7.5], "to": [13, 15, 8.5], "faces": { - "north": {"uv": [13, 1, 3, 16], "texture": "#0"}, - "south": {"uv": [13, 1, 3, 16], "texture": "#0"}, - "up": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#0"}, - "down": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#0"} - }, - "portalcubed:render_type": "translucent" + "north": {"uv": [13, 1, 3, 16], "texture": "#1"}, + "south": {"uv": [13, 1, 3, 16], "texture": "#1"}, + "up": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#1"}, + "down": {"uv": [3.032, 1.032, 12.968, 1.968], "texture": "#1"} + } } ], "gui_light": "front", @@ -119,5 +127,8 @@ "fixed": { "rotation": [0, 180, 0] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } } diff --git a/src/main/resources/assets/portalcubed/models/item/portal_1_fizzler_emitter.json b/src/main/resources/assets/portalcubed/models/item/portal_1_fizzler_emitter.json index 31b86819..043aa87b 100644 --- a/src/main/resources/assets/portalcubed/models/item/portal_1_fizzler_emitter.json +++ b/src/main/resources/assets/portalcubed/models/item/portal_1_fizzler_emitter.json @@ -1,6 +1,266 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "portalcubed:item/portal_1_fizzler_icon" - } -} \ No newline at end of file + "credit": "Made by Cart3r using Blockbench.", + "textures": { + "0": "portalcubed:item/portal_1_fizzler_frame", + "1": "portalcubed:item/portal_1_fizzler_icon", + "particle": "portalcubed:item/portal_1_fizzler_frame" + }, + "elements": [ + { + "name": "portal_2_fizzler_icon_1", + "from": [12, 0, 7.5], + "to": [15, 15, 8.5], + "faces": { + "north": {"uv": [15, 1, 12, 16], "texture": "#0"}, + "east": {"uv": [14.032, 1.032, 14.968, 15.968], "texture": "#0"}, + "south": {"uv": [12, 1, 15, 16], "texture": "#0"}, + "west": {"uv": [12.032, 1.032, 12.968, 15.968], "texture": "#0"}, + "up": {"uv": [12.032, 1.032, 14.968, 1.968], "texture": "#0"}, + "down": {"uv": [12.032, 15.032, 14.968, 15.968], "texture": "#0"} + } + }, + { + "name": "portal_2_fizzler_icon_2", + "from": [11.99, 8.99, 7.49], + "to": [14.01, 10.01, 8.51], + "faces": { + "north": {"uv": [3.968, 6.032, 2.032, 6.968], "texture": "#1"}, + "south": {"uv": [2.032, 6.032, 3.968, 6.968], "texture": "#1"}, + "west": {"uv": [3.032, 6.032, 3.968, 6.968], "texture": "#1"} + } + }, + { + "name": "portal_3_fizzler_icon_3", + "from": [11.99, 6.99, 7.49], + "to": [14.01, 8.01, 8.51], + "faces": { + "north": {"uv": [3.968, 8.032, 2.032, 8.968], "texture": "#1"}, + "south": {"uv": [2.032, 8.032, 3.968, 8.968], "texture": "#1"}, + "west": {"uv": [3.032, 8.032, 3.968, 8.968], "texture": "#1"} + } + }, + { + "name": "portal_4_fizzler_icon_4", + "from": [9.99, 5.99, 7.49], + "to": [12.01, 7.01, 8.51], + "faces": { + "north": {"uv": [4.032, 9.032, 5.968, 9.968], "texture": "#1"}, + "east": {"uv": [4.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "south": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "west": {"uv": [5.968, 9.032, 5.032, 9.968], "texture": "#1"}, + "up": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "down": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"} + } + }, + { + "name": "portal_5_fizzler_icon_5", + "from": [8.99, 7.99, 7.49], + "to": [11.01, 9.01, 8.51], + "faces": { + "north": {"uv": [4.032, 9.032, 5.968, 9.968], "texture": "#1"}, + "east": {"uv": [4.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "south": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "west": {"uv": [5.968, 9.032, 5.032, 9.968], "texture": "#1"}, + "up": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "down": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"} + } + }, + { + "name": "portal_6_fizzler_icon_6", + "from": [5.99, 7.99, 7.49], + "to": [8.01, 9.01, 8.51], + "faces": { + "north": {"uv": [4.032, 9.032, 5.968, 9.968], "texture": "#1"}, + "east": {"uv": [4.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "south": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "west": {"uv": [5.968, 9.032, 5.032, 9.968], "texture": "#1"}, + "up": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "down": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"} + } + }, + { + "name": "portal_7_fizzler_icon_7", + "from": [4.99, 5.99, 7.49], + "to": [7.01, 7.01, 8.51], + "faces": { + "north": {"uv": [4.032, 9.032, 5.968, 9.968], "texture": "#1"}, + "east": {"uv": [4.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "south": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "west": {"uv": [5.968, 9.032, 5.032, 9.968], "texture": "#1"}, + "up": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "down": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"} + } + }, + { + "name": "portal_8_fizzler_icon_8", + "from": [4.99, 10.99, 7.49], + "to": [7.01, 12.01, 8.51], + "faces": { + "north": {"uv": [4.032, 9.032, 5.968, 9.968], "texture": "#1"}, + "east": {"uv": [4.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "south": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "west": {"uv": [5.968, 9.032, 5.032, 9.968], "texture": "#1"}, + "up": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "down": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"} + } + }, + { + "name": "portal_9_fizzler_icon_9", + "from": [3.99, 12.99, 7.49], + "to": [6.01, 14.01, 8.51], + "faces": { + "north": {"uv": [4.032, 9.032, 5.968, 9.968], "texture": "#1"}, + "east": {"uv": [4.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "south": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "west": {"uv": [5.968, 9.032, 5.032, 9.968], "texture": "#1"}, + "up": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "down": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"} + } + }, + { + "name": "portal_10_fizzler_icon_10", + "from": [8.99, 11.99, 7.49], + "to": [11.01, 13.01, 8.51], + "faces": { + "north": {"uv": [4.032, 9.032, 5.968, 9.968], "texture": "#1"}, + "east": {"uv": [4.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "south": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "west": {"uv": [5.968, 9.032, 5.032, 9.968], "texture": "#1"}, + "up": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "down": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"} + } + }, + { + "name": "portal_11_fizzler_icon_11", + "from": [7.99, 9.99, 7.49], + "to": [10.01, 11.01, 8.51], + "faces": { + "north": {"uv": [4.032, 9.032, 5.968, 9.968], "texture": "#1"}, + "east": {"uv": [4.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "south": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "west": {"uv": [5.968, 9.032, 5.032, 9.968], "texture": "#1"}, + "up": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "down": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"} + } + }, + { + "name": "portal_12_fizzler_icon_12", + "from": [6.99, 3.99, 7.49], + "to": [9.01, 5.01, 8.51], + "faces": { + "north": {"uv": [4.032, 9.032, 5.968, 9.968], "texture": "#1"}, + "east": {"uv": [4.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "south": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "west": {"uv": [5.968, 9.032, 5.032, 9.968], "texture": "#1"}, + "up": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "down": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"} + } + }, + { + "name": "portal_13_fizzler_icon_13", + "from": [3.99, 2.99, 7.49], + "to": [6.01, 4.01, 8.51], + "faces": { + "north": {"uv": [4.032, 9.032, 5.968, 9.968], "texture": "#1"}, + "east": {"uv": [4.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "south": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "west": {"uv": [5.968, 9.032, 5.032, 9.968], "texture": "#1"}, + "up": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "down": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"} + } + }, + { + "name": "portal_14_fizzler_icon_14", + "from": [4.99, 0.99, 7.49], + "to": [7.01, 2.01, 8.51], + "faces": { + "north": {"uv": [4.032, 9.032, 5.968, 9.968], "texture": "#1"}, + "east": {"uv": [4.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "south": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "west": {"uv": [5.968, 9.032, 5.032, 9.968], "texture": "#1"}, + "up": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "down": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"} + } + }, + { + "name": "portal_15_fizzler_icon_15", + "from": [9.99, 1.99, 7.49], + "to": [12.01, 3.01, 8.51], + "faces": { + "north": {"uv": [4.032, 9.032, 5.968, 9.968], "texture": "#1"}, + "east": {"uv": [4.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "south": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "west": {"uv": [5.968, 9.032, 5.032, 9.968], "texture": "#1"}, + "up": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"}, + "down": {"uv": [5.968, 9.032, 4.032, 9.968], "texture": "#1"} + } + }, + { + "name": "portal_4_fizzler_icon_4", + "from": [1.99, 6.99, 7.49], + "to": [4.01, 8.01, 8.51], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "faces": { + "north": {"uv": [12.032, 8.032, 13.968, 8.968], "texture": "#1"}, + "east": {"uv": [12.968, 8.032, 12.032, 8.968], "texture": "#1"}, + "south": {"uv": [13.968, 8.032, 12.032, 8.968], "texture": "#1"} + } + }, + { + "name": "portal_3_fizzler_icon_3", + "from": [1.99, 8.99, 7.49], + "to": [4.01, 10.01, 8.51], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "faces": { + "north": {"uv": [12.032, 6.032, 13.968, 6.968], "texture": "#1"}, + "east": {"uv": [12.968, 6.032, 12.032, 6.968], "texture": "#1"}, + "south": {"uv": [13.968, 6.032, 12.032, 6.968], "texture": "#1"} + } + }, + { + "name": "portal_2_fizzler_icon_0", + "from": [1, 0, 7.5], + "to": [4, 15, 8.5], + "faces": { + "north": {"uv": [4, 1, 1, 16], "texture": "#0"}, + "east": {"uv": [3.032, 1.032, 3.968, 15.968], "texture": "#0"}, + "south": {"uv": [1, 1, 4, 16], "texture": "#0"}, + "west": {"uv": [1.032, 1.032, 1.968, 15.968], "texture": "#0"}, + "up": {"uv": [1.032, 1.032, 3.968, 1.968], "texture": "#0"}, + "down": {"uv": [1.032, 15.032, 3.968, 15.968], "texture": "#0"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "translation": [0, 3, 1], + "scale": [0.55, 0.55, 0.55] + }, + "thirdperson_lefthand": { + "translation": [0, 3, 1], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson_righthand": { + "rotation": [0, -90, 25], + "translation": [1.13, 3.2, 1.13], + "scale": [0.68, 0.68, 0.68] + }, + "firstperson_lefthand": { + "rotation": [0, -90, 25], + "translation": [1.13, 3.2, 1.13], + "scale": [0.68, 0.68, 0.68] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "rotation": [0, 180, 0] + } + } +} diff --git a/src/main/resources/assets/portalcubed/models/item/portal_gun.json b/src/main/resources/assets/portalcubed/models/item/portal_gun.json index 7f152dae..f0ecfade 100644 --- a/src/main/resources/assets/portalcubed/models/item/portal_gun.json +++ b/src/main/resources/assets/portalcubed/models/item/portal_gun.json @@ -147,20 +147,6 @@ "down": {"uv": [5.516, 12.984, 6.484, 12.016], "rotation": 90, "texture": "#0"} } }, - { - "name": "cube inverted", - "from": [9.04, 4.4, 8.975], - "to": [7.04, 2.4, 5.025], - "rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]}, - "faces": { - "north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, - "east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, - "south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, - "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, - "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"}, - "down": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} - } - }, { "name": "cube inverted inverted", "from": [7.615, 3.3, 4.925], @@ -188,7 +174,7 @@ "rotation": {"angle": 45, "axis": "z", "origin": [7.96492, 0.81711, 5.49]}, "faces": { "up": {"uv": [6.532, 13.032, 10.984, 15.484], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10.984, 13.032, 6.532, 14.984], "rotation": 90, "texture": "#0"} + "down": {"uv": [10.984, 13.032, 6.532, 15.484], "rotation": 90, "texture": "#0"} } }, { @@ -235,6 +221,30 @@ "north": {"uv": [6.516, 6.984, 6.984, 5.516], "rotation": 180, "texture": "#0"}, "south": {"uv": [6.516, 6.984, 6.984, 5.516], "texture": "#0"} } + }, + { + "name": "cube inverted", + "from": [9.04, 4.4, 8.975], + "to": [7.04, 2.4, 5.025], + "rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]}, + "faces": { + "north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, + "east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, + "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} + } + }, + { + "name": "transparent", + "from": [7, 2.35, 5], + "to": [9, 4.35, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 3.35, 2.575]}, + "faces": { + "east": {"uv": [10.516, 15, 12.516, 16], "texture": "#1"}, + "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, + "up": {"uv": [10.516, 15, 12.516, 16], "rotation": 90, "texture": "#1"}, + "down": {"uv": [7.516, 3.016, 8.516, 5.016], "rotation": 180, "texture": "#0"} + } } ], "overrides": [ @@ -242,14 +252,12 @@ {"predicate": {"custom_model_data": 2}, "model": "portalcubed:item/portal_gun_atlas"}, {"predicate": {"custom_model_data": 3}, "model": "portalcubed:item/portal_gun_p_body"}, {"predicate": {"custom_model_data": 4}, "model": "portalcubed:item/portal_gun_reloaded"}, - {"predicate": {"custom_model_data": 101}, "model": "portalcubed:item/legacy_portal_gun"}, {"predicate": {"custom_model_data": 102}, "model": "portalcubed:item/legacy_portal_gun_atlas"}, {"predicate": {"custom_model_data": 103}, "model": "portalcubed:item/legacy_portal_gun_p_body"}, {"predicate": {"custom_model_data": 104}, "model": "portalcubed:item/legacy_portal_gun_reloaded"}, - {"predicate": {"custom_model_data": 201}, "model": "portalcubed:item/mel_portal_gun"}, - {"predicate": {"custom_model_data": 202}, "model": "portalcubed:item/beta_portal_gun"} + {"predicate": {"custom_model_data": 202}, "model": "portalcubed:item/2006_beta_portal_gun"} ], "display": { "thirdperson_righthand": { @@ -286,5 +294,8 @@ "rotation": [-90, -90, 0], "translation": [-1, 0.25, -7.75] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/portal_gun_atlas.json b/src/main/resources/assets/portalcubed/models/item/portal_gun_atlas.json index cc7def9a..36097e83 100644 --- a/src/main/resources/assets/portalcubed/models/item/portal_gun_atlas.json +++ b/src/main/resources/assets/portalcubed/models/item/portal_gun_atlas.json @@ -147,20 +147,6 @@ "down": {"uv": [5.516, 12.984, 6.484, 12.016], "rotation": 90, "texture": "#0"} } }, - { - "name": "cube inverted", - "from": [9.04, 4.4, 8.975], - "to": [7.04, 2.4, 5.025], - "rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]}, - "faces": { - "north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, - "east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, - "south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, - "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, - "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"}, - "down": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} - } - }, { "name": "cube inverted inverted", "from": [7.615, 3.3, 4.925], @@ -235,6 +221,30 @@ "north": {"uv": [6.516, 6.984, 6.984, 5.516], "rotation": 180, "texture": "#0"}, "south": {"uv": [6.516, 6.984, 6.984, 5.516], "texture": "#0"} } + }, + { + "name": "cube inverted", + "from": [9.04, 4.4, 8.975], + "to": [7.04, 2.4, 5.025], + "rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]}, + "faces": { + "north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, + "east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, + "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} + } + }, + { + "name": "transparent", + "from": [7, 2.35, 5], + "to": [9, 4.35, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 3.35, 2.575]}, + "faces": { + "east": {"uv": [10.516, 15, 12.516, 16], "texture": "#1"}, + "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, + "up": {"uv": [10.516, 15, 12.516, 16], "rotation": 90, "texture": "#1"}, + "down": {"uv": [7.516, 3.016, 8.516, 5.016], "rotation": 180, "texture": "#0"} + } } ], "display": { @@ -272,5 +282,8 @@ "rotation": [-90, -90, 0], "translation": [-1, 0.25, -7.75] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/portal_gun_p_body.json b/src/main/resources/assets/portalcubed/models/item/portal_gun_p_body.json index b85b6f4f..8f190df2 100644 --- a/src/main/resources/assets/portalcubed/models/item/portal_gun_p_body.json +++ b/src/main/resources/assets/portalcubed/models/item/portal_gun_p_body.json @@ -147,20 +147,6 @@ "down": {"uv": [5.516, 12.984, 6.484, 12.016], "rotation": 90, "texture": "#0"} } }, - { - "name": "cube inverted", - "from": [9.04, 4.4, 8.975], - "to": [7.04, 2.4, 5.025], - "rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]}, - "faces": { - "north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, - "east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, - "south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, - "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, - "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"}, - "down": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} - } - }, { "name": "cube inverted inverted", "from": [7.615, 3.3, 4.925], @@ -188,7 +174,7 @@ "rotation": {"angle": 45, "axis": "z", "origin": [7.96492, 0.81711, 5.49]}, "faces": { "up": {"uv": [6.532, 13.032, 10.984, 15.484], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10.984, 13.032, 6.532, 14.984], "rotation": 90, "texture": "#0"} + "down": {"uv": [10.984, 13.032, 6.532, 15.484], "rotation": 90, "texture": "#0"} } }, { @@ -235,6 +221,30 @@ "north": {"uv": [6.516, 6.984, 6.984, 5.516], "rotation": 180, "texture": "#0"}, "south": {"uv": [6.516, 6.984, 6.984, 5.516], "texture": "#0"} } + }, + { + "name": "cube inverted", + "from": [9.04, 4.4, 8.975], + "to": [7.04, 2.4, 5.025], + "rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]}, + "faces": { + "north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, + "east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, + "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} + } + }, + { + "name": "transparent", + "from": [7, 2.35, 5], + "to": [9, 4.35, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 3.35, 2.575]}, + "faces": { + "east": {"uv": [10.516, 15, 12.516, 16], "texture": "#1"}, + "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, + "up": {"uv": [10.516, 15, 12.516, 16], "rotation": 90, "texture": "#1"}, + "down": {"uv": [7.516, 3.016, 8.516, 5.016], "rotation": 180, "texture": "#0"} + } } ], "display": { @@ -272,5 +282,8 @@ "rotation": [-90, -90, 0], "translation": [-1, 0.25, -7.75] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/portal_gun_primary.json b/src/main/resources/assets/portalcubed/models/item/portal_gun_primary.json index 7f152dae..f0ecfade 100644 --- a/src/main/resources/assets/portalcubed/models/item/portal_gun_primary.json +++ b/src/main/resources/assets/portalcubed/models/item/portal_gun_primary.json @@ -147,20 +147,6 @@ "down": {"uv": [5.516, 12.984, 6.484, 12.016], "rotation": 90, "texture": "#0"} } }, - { - "name": "cube inverted", - "from": [9.04, 4.4, 8.975], - "to": [7.04, 2.4, 5.025], - "rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]}, - "faces": { - "north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, - "east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, - "south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, - "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, - "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"}, - "down": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} - } - }, { "name": "cube inverted inverted", "from": [7.615, 3.3, 4.925], @@ -188,7 +174,7 @@ "rotation": {"angle": 45, "axis": "z", "origin": [7.96492, 0.81711, 5.49]}, "faces": { "up": {"uv": [6.532, 13.032, 10.984, 15.484], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10.984, 13.032, 6.532, 14.984], "rotation": 90, "texture": "#0"} + "down": {"uv": [10.984, 13.032, 6.532, 15.484], "rotation": 90, "texture": "#0"} } }, { @@ -235,6 +221,30 @@ "north": {"uv": [6.516, 6.984, 6.984, 5.516], "rotation": 180, "texture": "#0"}, "south": {"uv": [6.516, 6.984, 6.984, 5.516], "texture": "#0"} } + }, + { + "name": "cube inverted", + "from": [9.04, 4.4, 8.975], + "to": [7.04, 2.4, 5.025], + "rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]}, + "faces": { + "north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, + "east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, + "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} + } + }, + { + "name": "transparent", + "from": [7, 2.35, 5], + "to": [9, 4.35, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 3.35, 2.575]}, + "faces": { + "east": {"uv": [10.516, 15, 12.516, 16], "texture": "#1"}, + "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, + "up": {"uv": [10.516, 15, 12.516, 16], "rotation": 90, "texture": "#1"}, + "down": {"uv": [7.516, 3.016, 8.516, 5.016], "rotation": 180, "texture": "#0"} + } } ], "overrides": [ @@ -242,14 +252,12 @@ {"predicate": {"custom_model_data": 2}, "model": "portalcubed:item/portal_gun_atlas"}, {"predicate": {"custom_model_data": 3}, "model": "portalcubed:item/portal_gun_p_body"}, {"predicate": {"custom_model_data": 4}, "model": "portalcubed:item/portal_gun_reloaded"}, - {"predicate": {"custom_model_data": 101}, "model": "portalcubed:item/legacy_portal_gun"}, {"predicate": {"custom_model_data": 102}, "model": "portalcubed:item/legacy_portal_gun_atlas"}, {"predicate": {"custom_model_data": 103}, "model": "portalcubed:item/legacy_portal_gun_p_body"}, {"predicate": {"custom_model_data": 104}, "model": "portalcubed:item/legacy_portal_gun_reloaded"}, - {"predicate": {"custom_model_data": 201}, "model": "portalcubed:item/mel_portal_gun"}, - {"predicate": {"custom_model_data": 202}, "model": "portalcubed:item/beta_portal_gun"} + {"predicate": {"custom_model_data": 202}, "model": "portalcubed:item/2006_beta_portal_gun"} ], "display": { "thirdperson_righthand": { @@ -286,5 +294,8 @@ "rotation": [-90, -90, 0], "translation": [-1, 0.25, -7.75] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/portal_gun_reloaded.json b/src/main/resources/assets/portalcubed/models/item/portal_gun_reloaded.json index f5c4f5a0..68d01dd4 100644 --- a/src/main/resources/assets/portalcubed/models/item/portal_gun_reloaded.json +++ b/src/main/resources/assets/portalcubed/models/item/portal_gun_reloaded.json @@ -147,20 +147,6 @@ "down": {"uv": [5.516, 12.984, 6.484, 12.016], "rotation": 90, "texture": "#0"} } }, - { - "name": "cube inverted", - "from": [9.04, 4.4, 8.975], - "to": [7.04, 2.4, 5.025], - "rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]}, - "faces": { - "north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, - "east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, - "south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, - "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, - "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"}, - "down": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} - } - }, { "name": "cube inverted inverted", "from": [7.615, 3.3, 4.925], @@ -188,7 +174,7 @@ "rotation": {"angle": 45, "axis": "z", "origin": [7.96492, 0.81711, 5.49]}, "faces": { "up": {"uv": [6.532, 13.032, 10.984, 15.484], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10.984, 13.032, 6.532, 14.984], "rotation": 90, "texture": "#0"} + "down": {"uv": [10.984, 13.032, 6.532, 15.484], "rotation": 90, "texture": "#0"} } }, { @@ -235,6 +221,30 @@ "north": {"uv": [6.516, 6.984, 6.984, 5.516], "rotation": 180, "texture": "#0"}, "south": {"uv": [6.516, 6.984, 6.984, 5.516], "texture": "#0"} } + }, + { + "name": "cube inverted", + "from": [9.04, 4.4, 8.975], + "to": [7.04, 2.4, 5.025], + "rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]}, + "faces": { + "north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, + "east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, + "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} + } + }, + { + "name": "transparent", + "from": [7, 2.35, 5], + "to": [9, 4.35, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 3.35, 2.575]}, + "faces": { + "east": {"uv": [10.516, 15, 12.516, 16], "texture": "#1"}, + "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, + "up": {"uv": [10.516, 15, 12.516, 16], "rotation": 90, "texture": "#1"}, + "down": {"uv": [7.516, 3.016, 8.516, 5.016], "rotation": 180, "texture": "#0"} + } } ], "display": { @@ -272,5 +282,8 @@ "rotation": [-90, -90, 0], "translation": [-1, 0.25, -7.75] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/portal_gun_secondary.json b/src/main/resources/assets/portalcubed/models/item/portal_gun_secondary.json index 7f152dae..f3411996 100644 --- a/src/main/resources/assets/portalcubed/models/item/portal_gun_secondary.json +++ b/src/main/resources/assets/portalcubed/models/item/portal_gun_secondary.json @@ -156,9 +156,7 @@ "north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, "east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, "south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, - "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, - "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"}, - "down": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} + "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} } }, { @@ -188,7 +186,7 @@ "rotation": {"angle": 45, "axis": "z", "origin": [7.96492, 0.81711, 5.49]}, "faces": { "up": {"uv": [6.532, 13.032, 10.984, 15.484], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10.984, 13.032, 6.532, 14.984], "rotation": 90, "texture": "#0"} + "down": {"uv": [10.984, 13.032, 6.532, 15.484], "rotation": 90, "texture": "#0"} } }, { @@ -235,6 +233,18 @@ "north": {"uv": [6.516, 6.984, 6.984, 5.516], "rotation": 180, "texture": "#0"}, "south": {"uv": [6.516, 6.984, 6.984, 5.516], "texture": "#0"} } + }, + { + "name": "transparent", + "from": [7, 2.35, 5], + "to": [9, 4.35, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 3.35, 2.575]}, + "faces": { + "east": {"uv": [10.516, 15, 12.516, 16], "texture": "#1"}, + "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, + "up": {"uv": [10.516, 15, 12.516, 16], "rotation": 90, "texture": "#1"}, + "down": {"uv": [7.516, 3.016, 8.516, 5.016], "rotation": 180, "texture": "#0"} + } } ], "overrides": [ @@ -242,14 +252,12 @@ {"predicate": {"custom_model_data": 2}, "model": "portalcubed:item/portal_gun_atlas"}, {"predicate": {"custom_model_data": 3}, "model": "portalcubed:item/portal_gun_p_body"}, {"predicate": {"custom_model_data": 4}, "model": "portalcubed:item/portal_gun_reloaded"}, - {"predicate": {"custom_model_data": 101}, "model": "portalcubed:item/legacy_portal_gun"}, {"predicate": {"custom_model_data": 102}, "model": "portalcubed:item/legacy_portal_gun_atlas"}, {"predicate": {"custom_model_data": 103}, "model": "portalcubed:item/legacy_portal_gun_p_body"}, {"predicate": {"custom_model_data": 104}, "model": "portalcubed:item/legacy_portal_gun_reloaded"}, - {"predicate": {"custom_model_data": 201}, "model": "portalcubed:item/mel_portal_gun"}, - {"predicate": {"custom_model_data": 202}, "model": "portalcubed:item/beta_portal_gun"} + {"predicate": {"custom_model_data": 202}, "model": "portalcubed:item/2006_beta_portal_gun"} ], "display": { "thirdperson_righthand": { @@ -286,5 +294,8 @@ "rotation": [-90, -90, 0], "translation": [-1, 0.25, -7.75] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/potatos_portal_gun.json b/src/main/resources/assets/portalcubed/models/item/potatos_portal_gun.json index 366b0849..731685be 100644 --- a/src/main/resources/assets/portalcubed/models/item/potatos_portal_gun.json +++ b/src/main/resources/assets/portalcubed/models/item/potatos_portal_gun.json @@ -149,20 +149,6 @@ "down": {"uv": [5.516, 12.984, 6.484, 12.016], "rotation": 90, "texture": "#0"} } }, - { - "name": "cube inverted", - "from": [9.04, 4.4, 8.975], - "to": [7.04, 2.4, 5.025], - "rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]}, - "faces": { - "north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, - "east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, - "south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, - "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, - "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"}, - "down": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} - } - }, { "name": "cube inverted inverted", "from": [7.615, 3.3, 4.925], @@ -190,7 +176,7 @@ "rotation": {"angle": 45, "axis": "z", "origin": [7.96492, 0.81711, 5.49]}, "faces": { "up": {"uv": [6.532, 13.032, 10.984, 15.484], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10.984, 13.032, 6.532, 14.984], "rotation": 90, "texture": "#0"} + "down": {"uv": [10.984, 13.032, 6.532, 15.484], "rotation": 90, "texture": "#0"} } }, { @@ -463,6 +449,30 @@ "faces": { "north": {"uv": [0.016, 0.016, 15.984, 15.984], "rotation": 90, "texture": "#3"} } + }, + { + "name": "cube inverted", + "from": [9.04, 4.4, 8.975], + "to": [7.04, 2.4, 5.025], + "rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]}, + "faces": { + "north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, + "east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, + "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} + } + }, + { + "name": "transparent", + "from": [7, 2.35, 5], + "to": [9, 4.35, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 3.35, 2.575]}, + "faces": { + "east": {"uv": [10.516, 15, 12.516, 16], "texture": "#1"}, + "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, + "up": {"uv": [10.516, 15, 12.516, 16], "rotation": 90, "texture": "#1"}, + "down": {"uv": [7.516, 3.016, 8.516, 5.016], "rotation": 180, "texture": "#0"} + } } ], "display": { @@ -522,13 +532,17 @@ 17, 18, 19, - 20, { "name": "potatos", "origin": [8, 8, 8], "color": 0, "nbt": "{}", - "children": [21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37] - } - ] -} \ No newline at end of file + "children": [20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36] + }, + 37, + 38 + ], + "portalcubed:render_types": { + "translucent": ["transparent"] + } +} diff --git a/src/main/resources/assets/portalcubed/models/item/radio.json b/src/main/resources/assets/portalcubed/models/item/radio.json index 6c146cea..ee3e136c 100644 --- a/src/main/resources/assets/portalcubed/models/item/radio.json +++ b/src/main/resources/assets/portalcubed/models/item/radio.json @@ -1,8 +1,10 @@ { "credit": "Made with Blockbench by Cart3r. ", - "texture_size": [64, 64], + "texture_size": [32, 32], "textures": { - "0": "portalcubed:entity/radio" + "0": "portalcubed:entity/radio", + "1": "portalcubed:entity/radio_e", + "particle": "portalcubed:entity/radio_e" }, "elements": [ { @@ -30,6 +32,18 @@ "up": {"uv": [1.508, 7.992, 4.992, 6.508], "rotation": 90, "texture": "#0"} } }, + { + "from": [6.5, 1, 4.5], + "to": [9.5, 5, 11.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 1, 8.5]}, + "faces": { + "north": {"uv": [0.008, 8.008, 1.492, 9.992], "texture": "#1"}, + "east": {"uv": [1.508, 8.008, 4.992, 9.992], "texture": "#1"}, + "south": {"uv": [5.008, 8.008, 6.492, 9.992], "texture": "#1"}, + "west": {"uv": [6.508, 8.008, 9.992, 9.992], "texture": "#1"}, + "up": {"uv": [1.508, 7.992, 4.992, 6.508], "rotation": 90, "texture": "#1"} + } + }, { "from": [7.5, 5, 6.5], "to": [8.5, 9, 6.5], diff --git a/src/main/resources/assets/portalcubed/models/item/space_core.json b/src/main/resources/assets/portalcubed/models/item/space_core.json index 79d9f1dd..820313c0 100644 --- a/src/main/resources/assets/portalcubed/models/item/space_core.json +++ b/src/main/resources/assets/portalcubed/models/item/space_core.json @@ -2,7 +2,9 @@ "credit": "Made with Blockbench by Cart3r. ", "texture_size": [32, 32], "textures": { - "0": "portalcubed:entity/portal_2_cores" + "0": "portalcubed:entity/portal_2_cores", + "1": "portalcubed:entity/portal_2_cores_e", + "particle": "portalcubed:entity/portal_2_cores_e" }, "elements": [ { @@ -90,7 +92,14 @@ "from": [6.5, 1.5, 5.075], "to": [9.5, 4.5, 6.075], "faces": { - "north": {"uv": [12.5, 12, 14, 13.5], "texture": "#0"} + "north": {"uv": [12.5, 5, 14, 6.5], "texture": "#0"} + } + }, + { + "from": [6.5, 1.5, 5.075], + "to": [9.5, 4.5, 6.075], + "faces": { + "north": {"uv": [12.5, 5, 14, 6.5], "texture": "#1"} } } ], @@ -133,4 +142,4 @@ "scale": [1.21484, 1.21484, 1.21484] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/storage_cube.json b/src/main/resources/assets/portalcubed/models/item/storage_cube.json index c23ca415..4b6f9c26 100644 --- a/src/main/resources/assets/portalcubed/models/item/storage_cube.json +++ b/src/main/resources/assets/portalcubed/models/item/storage_cube.json @@ -2,7 +2,9 @@ "credit": "Made with Blockbench by Cart3r. ", "texture_size": [64, 64], "textures": { - "2": "portalcubed:entity/storage_cube" + "1": "portalcubed:entity/storage_cube_e", + "2": "portalcubed:entity/storage_cube", + "particle": "portalcubed:entity/storage_cube_e" }, "elements": [ { @@ -10,12 +12,25 @@ "to": [13, 10, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2.5, 13.5, 5, 16], "texture": "#2"}, - "east": {"uv": [0, 13.5, 2.5, 16], "texture": "#2"}, - "south": {"uv": [7.5, 13.5, 10, 16], "texture": "#2"}, - "west": {"uv": [5, 13.5, 7.5, 16], "texture": "#2"}, - "up": {"uv": [5, 13.5, 2.5, 11], "texture": "#2"}, - "down": {"uv": [7.5, 11, 5, 13.5], "texture": "#2"} + "north": {"uv": [2.5, 2.5, 5, 5], "texture": "#2"}, + "east": {"uv": [0, 2.5, 2.5, 5], "texture": "#2"}, + "south": {"uv": [7.5, 2.5, 10, 5], "texture": "#2"}, + "west": {"uv": [5, 2.5, 7.5, 5], "texture": "#2"}, + "up": {"uv": [5, 2.5, 2.5, 0], "texture": "#2"}, + "down": {"uv": [7.5, 0, 5, 2.5], "texture": "#2"} + } + }, + { + "from": [3, 0, 3], + "to": [13, 10, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [2.5, 2.5, 5, 5], "texture": "#1"}, + "east": {"uv": [0, 2.5, 2.5, 5], "texture": "#1"}, + "south": {"uv": [7.5, 2.5, 10, 5], "texture": "#1"}, + "west": {"uv": [5, 2.5, 7.5, 5], "texture": "#1"}, + "up": {"uv": [5, 2.5, 2.5, 0], "texture": "#1"}, + "down": {"uv": [7.5, 0, 5, 2.5], "texture": "#1"} } }, { @@ -71,4 +86,4 @@ "scale": [0.94922, 0.94922, 0.94922] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/sounds.json b/src/main/resources/assets/portalcubed/sounds.json index 56e7227c..e9cd29e4 100644 --- a/src/main/resources/assets/portalcubed/sounds.json +++ b/src/main/resources/assets/portalcubed/sounds.json @@ -366,7 +366,8 @@ "portalcubed:bullet/concrete_impact_bullet2", "portalcubed:bullet/concrete_impact_bullet3", "portalcubed:bullet/concrete_impact_bullet4" - ] + ], + "subtitle": "subtitles.portalcubed.impact.concrete" }, "bullet/glass": { "sounds": [ @@ -374,7 +375,8 @@ "portalcubed:bullet/glass_impact_bullet2", "portalcubed:bullet/glass_impact_bullet3", "portalcubed:bullet/glass_impact_bullet4" - ] + ], + "subtitle": "subtitles.portalcubed.impact.glass" }, "bullet/metal": { "sounds": [ @@ -382,7 +384,8 @@ "portalcubed:bullet/metal_solid_impact_bullet2", "portalcubed:bullet/metal_solid_impact_bullet3", "portalcubed:bullet/metal_solid_impact_bullet4" - ] + ], + "subtitle": "subtitles.portalcubed.impact.metal" }, "radio": { @@ -506,4 +509,4 @@ "portalcubed:object_use_stop_01" ] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/textures/block/portal_1_elevator_wall_lower.png b/src/main/resources/assets/portalcubed/textures/block/portal_1_elevator_wall_lower.png index 59e3bea884df71d62c766520cf41a34f336bcab4..956b9e44eef6a46bd48aecf5ef4c03bf2d0b1a5a 100644 GIT binary patch literal 5904 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 Xh5XSF|0$|Y00000NkvXXu0mjfrd5Ls diff --git a/src/main/resources/assets/portalcubed/textures/block/portal_1_elevator_wall_middle_top.png b/src/main/resources/assets/portalcubed/textures/block/portal_1_elevator_wall_middle_top.png index 4df09ebfc75908358d8e53de431047b3fb94733a..039f7225ec14ab58b0009eba00c1c1dc4dc433a0 100644 GIT binary patch delta 2504 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 diff --git a/src/main/resources/assets/portalcubed/textures/block/portal_1_elevator_wall_top.png b/src/main/resources/assets/portalcubed/textures/block/portal_1_elevator_wall_top.png index 7689e6d6a95283463b4860f9a6850a2a3b8a0bbc..3b6b7d80bf8241cd7e3df9df5d73f3645d8641d9 100644 GIT binary patch delta 2228 zcmV;l2ut_%DxfWpBmv`*B_My6Kl(s!T+Vgfu^6Y3Mux3Tpb-%D3S=xx)x-Wklk&hA{rdG?2 z?6yg6KW77Z_9i%79qAB!L|;g|fPB^gv=@rg5wClR8oe%7X8 z$5mUaFwoeD8-$+^cqU$hN5k=je{^-mCOEY0M%yk6idYscR~; zhjDpialYko2JID8E9i_f;uM{9fu^c1sI-iJGz5;jai*GNx@og5rU0U&Mgc8RQDmo4 zKvJY)hZx*AO{V}^R4Y(SSsJo*u$UP(&Tz$uu1Z&fp=999;FW(rKGmlKdmpuAjFyut z;G$8TK%ouj9}R|q5z}{4c_#QepO3+-1%o`(ESO-@SuGct%}rc(5^XV%(XOgDp>79A z5kfP-7z+lpM^zaQM1d$6gG34lN`Ow*Q3eBsnJPe%v(|$gR0m??onYorVp?Xbs@5sX z)}vfy6fVeej-h{_-~<{9DqGeK~)>V9jjSXfibhhQk`HAzUuZ zSWb9w2FA!45FWr97=y3}XIhMNG?*KlVLw7uFaabFa;h1OfkD>{aW{v%&749O{}Uc-cnud7oYys01DAFuDdy|(JzgKyjI$Z*?m@)s!XTlL@3ED-9?P#D*q z*iq2$a-x?HP32Q0$C;OksljGOSxk3yxqEIYZ_-WMW3kVn63#I7INnzFTYXaU1^Zpg zc4xvQtCkI`$ObIWs!CylwIwfs2?{K&j084CrrdwjlrcZ)S=)uHA!g}5&A_QN_m&Mf zy3g2~gi+iHl1^2hSZfqzc6^Byn=}5IA4k)sZQ7U!mrbmqifmLluk9H z)}Hjh;de5)(TM_+9@t@dScdgxs_^?7`D?gnKj5Ry@r^Qt} z96z^bPq1aL6=IV*n~M0SN%f$AU##C1?c0CVj<E%_jK4PW$=R195E)pUqjW4br{rZHE^7JJ#vSu%dgnzmj3VHx&LER{sK{ zvE|vCK5#zyeKi=JY+`R*YW|gUC&m5p?mXS`x#aw<>47?%;KZX!POk$><%q(W% zIlk`UGi+qj^Tc6dvDC$K7qhaV5>FFH6jh^qA%Ewx!g-6cTCKD8J^2em1#Kn6b(*6{ zUa*DHI2K zUu^qh3<&H3t%hxXAKP~81n@rtS6atkYXY;Mq>RG?f}D2x@1U> zx3jG-ftrEjTq}Wi2o?G&D3aVlZW4V`7tG z38*MJHZwOiI5RdlHZd?VF(L{eARtFcO;9>kWpZbmrW_d(mbY(pvGB7eTIx#RhFf&v!IXW~qIx#gZFf=+avu6qj0h5plTqI#)HZU_a zVrDHiGd3_SG+{F~EjeK_I4xr^H8^ECI5}luIbo9!3rP+!FfA}MR53X^G&ediHnV37 zXb2WZNNNE9000JJOGiWiU;tnMU}Y3$N|WUi9|;Nr7cUTrQmZMG4HPJUC`m*?R5;6} zQ#($?Fc5vQY!WXhD#fbaM-brzaTdC+xhxVDR=oK$2ZV`E1%y2VrXz zrdTb(fAbH%3r0PTKm7%5YE)XmSlf=#8AOga*#7_#ey4r>S!P%O0000?jQVXBE8!BoM=L7|(e-=;iliuw6syr7CGVWv~Eo zr7HU}){E>t3)G8QzHOdM|$)k&D6KnO4i* z*=|v|e%5$);>cS(Eo<*xL_e^$9{#KYXfGV6B3TYS1;_g_m4S(yA*1m$W}`IYXG}tC z=hG=nBopvrF*KfLI$ncHKmgLXH%j_+=B;loAHBHVF-v2U-p1q`)~*1#kB_rQFXTH6 zPS%3k1LmGq?auZ~Imv&a=om2PK76}#DCf?1^6t+qwvTS;?!AUSjfNG;I{3nEqYhJM z5A*Wy;#}o$L#aa426V<9aR;4rK}=O$kZBqHNDS^fS*nz%Q=4s}0*ICyd$i0&v6;dE zk|Gx~g29fPI(rjMMQE@oGlmc#Cl;F9#<^XgpsUiAFqH|)2upu{e5-dS_C9inNQcu` zz{MjwfkG4L9}T8~5$fBiG97%}kJsSUfI*pV4lpq3td@!_bOo20L>o*Lv@7e$*R239 z!qx&XWWa!SWP}_Ld1g-pM+Oj-0G*BH3x&w(6d2lmDqPje~@FEOgBvC4>X z#)F$^63DVv5I=w32E5Uqsplue2OhnT=6B8SW@L`DiXZ9 z>T9U6rbZ2+)NGUHns1@SmO4VMn{K;w*S+eY$DU5sHm!e8_Xn)eW{oFPW1>GX9b@&Wr* zD`tCwl2J>BDzX8G$EZqvgEb|u01HSkKLH|vJRyIVm$Om#%fel(xVZ;TP`755$;aa#|MEg6TWjJb?xQV$m;u~Q15%_^3Yt!G%-%tgpwS*op}6)N~rfLU3l zL&SMj&(2BxfDv9%cpA~UOe1@SQrkxtGN2Z_Z(2g@DIiiS!&O&nHKjq-(mjKd1&EzWAW z%3Am2FAU_gl@!-$jv$65#F2mq8C8@}hJ^^N8Yw1{v>$cxhnoHbxny#cz{s(H3RFl< zKlmT~?$*ptO*%<|DA4s{+aIHVe-~)fZ2SAzwi_pa_Zhg-+Wtx%nEfQZ*4DyDK>s#y zaoyJBJ>YT&7=F?vLuyJpUYbHa54@kzH)Vl=TcCH%>8-Vo(+40;T`k`L2Zz8|fwI?K z-rdvL+rMX8{rv!3B66O_&vA}VK^}@VPQ2h zEn#CgW@b1vIWlE1Gm}yYs3I^7Ah;u0+K9~I~6E@D@jB_R5;6}Q#(!rF%W%g z+1MMB*k>nz%y-X003uO&OL^sUkP1-x-e2J5d70pA%13BC717m)d5KyEE5rjsV-@Jowf%GDC| xH+%4%k=StjX&1DqA+>_BcGJdIplFM|_YcEUrhPpiQ0V{w002ovPDHLkV1i@&%z*#^ diff --git a/src/main/resources/assets/portalcubed/textures/block/portal_1_elevator_wall_upper.png b/src/main/resources/assets/portalcubed/textures/block/portal_1_elevator_wall_upper.png index 5ef5c3ba9d2feec7ef1818721dd3b4f29b3e640b..7e376915180bc2d73f48922b0871e82adfbd1038 100644 GIT binary patch literal 5857 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 delta 797 zcmV+&1LFMQEr17*Ba;IL6Mra?eUUv#!$25@-=<1MDh_rKamY}etcZ#@N)(G=p|llR zbuhW~51KS2DK3tJYr(;v#j1mgv#t)Vf*|+<;_Bk0=prS4mlRsWc*k)M?|tvf-FJY{ zs4&gyngBH2HdAp)%;r|b&?^L*L7L+-vy4P~F$3T6b&mkw?_xa5zklw}(WmAu1_VUn zIcAtP@dokCrfqQECyua^tP-CSkC}8q;zzD49=~xex-9U_h?z;v6Gw=}Vh1Z7%u1$4 zJWU)`HJ$Q>tj8+nEzVk{##;B}FAV4Pl{D9B4I_>vB#?v%1vQjWfsGjLIw=-XbT0Y$ zhg^S>Tnf3$VB}ap6@MCJ*AM;&zk6#HrY60lump6!IL^li5ZVQrb;tQWcAVx35PSx% z^tQj+0A@c)ueY`65zxO4TwJ#`We>RA0S2E8*_2%=NJ}UbfcG={rW`PE3-qpeeQTZL z^a03Fua<9sgF|4nNZIQ?@9ydB+rKrf{`~+QOLB!gWTiX+01yBMVoOIv04@M704`~_ zOh1z)6(0!#0s{;lL!j12lT8&Ue^^OGK~y-)m6I(`13?gmA1=G?9&H*_56O?g;E*Up z6A(BIe}vGGkRT8hh(dzEV)!8qrV^62`*q0~~FcP_cMjXp5Tql#PjuM@-3 b1t0tXA(r+w#MURy00000NkvXXu0mjfSGQ_; diff --git a/src/main/resources/assets/portalcubed/textures/entity/companion_cube.png b/src/main/resources/assets/portalcubed/textures/entity/companion_cube.png index d5d6aa603b2f24cce98f3d861ab1f8c3c80ba2ca..c118feffd7a33ffd9d27fc27752bf882aca70ac7 100644 GIT binary patch delta 7002 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 delta 7219 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 z z03eaU5y_#2rcxLd^3z^mGe-<1I$;#9PIPn>3&x4g4;D_SOMslVK_!Tz?R~ViwLnoq_>=zJ5GPy!q?utn zF@vetD2mzdDE!|xy*PiO^P?UoTmW=O$E$_evW||S{%F@isi(oZ|uTHayXc@xu2C{{!UHPtwK<;Y0uc002ovPDHLkV1k91 B;Ya`g diff --git a/src/main/resources/assets/portalcubed/textures/entity/storage_cube.png b/src/main/resources/assets/portalcubed/textures/entity/storage_cube.png index 4bff45be37882824e2ba908e520f1d9f77494003..f2802457885dacd5316174fa9e422d5ac28479f1 100644 GIT binary patch delta 6888 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 diff --git a/src/main/resources/assets/portalcubed/textures/item/beta_portal_gun.png b/src/main/resources/assets/portalcubed/textures/item/2006_beta_portal_gun.png similarity index 100% rename from src/main/resources/assets/portalcubed/textures/item/beta_portal_gun.png rename to src/main/resources/assets/portalcubed/textures/item/2006_beta_portal_gun.png diff --git a/src/main/resources/assets/portalcubed/textures/item/old_aperture_death_fizzler_icon.png b/src/main/resources/assets/portalcubed/textures/item/old_aperture_death_fizzler_icon.png index e814b8ff226cf37b49d1c8f8f2ec522ca81f72a6..0eba5bf014229e95264398821b12e20420c6de01 100644 GIT binary patch literal 5349 zcmeHKX;>3i7Y>MkY$}2UwI&3tpkxmriG)Rh5Haj3BHLs#2@$f81PCaWf<**HBCaed zDiu*tiVG+eML;UzR&YfGQ9)1^5f!o6Nx<#-`p4(_`p?NTlbLhRdCxiTIrrX~4L)A( zhI%vf5D0`J%Y*3$|4&h!y4vs+IrsrUASUt?0s`fJKpaXU74rm95K0~|fl!b_z(XJu z_l_=KxuwV2;BUTZnN}8J!;|pYOUqJLjLw?ssg9QhukPC3xC8i$x7ROFOnZUCK|q`Iwl{?xNhz zh<5O{sv7FaKnEF4&RA3>audww1WgmouW!K2%)Y!|-+iT!!MHI*>S!Oj`yAJo+|`_v zxU;Af%$Pe!NxHPzu#@o1LCDN*cNeK=P2Eugjf#xFV&()ktv@untZUM?!=1gC8s`V? zKBZfwMGJlLqCC1CN*3eWNR{=D=%(leF=vRYvlbk$ zy%S`(Bx6~>zK_MASGnmC?B0bZYiE~dcxEOoj%!`IBP33Es@8O8*CBIbd79q9tbpl@ z1Cn-wPNLf^YV^d+8mPK=7j|V!3*|27sVF`FaEdj}S{C?nKd9n|F1Kj zSQ%VFn3?w_l^f_fN6gr{BBu2(XHhtB+GV6pvJwbi_Q2Ud_uW%#c^royVL{It@h&$X z@Gifx2hG=(Bhhb6PcLZdrlwwIMnUbm#Sj*`YOWXaK8f?yxartL%dYmT{ihWZ_P6%iSTGq0^`8QH8iyq0yip>Oty9WMETCALi3 zmA^d=N@O$Z+LDf#8|0m`T}AhO`TY(4>o(>#{TRFlE6KSzgPeXaSTp$Y zsk6*K7Z_7Vvy5kM(6oBb4s6sndB_~y`(u1YedNK8N08^Ax#kP=%qkHJl{Z8&xkXiL zicW@Tx>xB=Ki&K`?d>tGd!aj5+ut){^`|&L$r+rv-ZimqZmnPQ3`h4XyS8sZS_M~H zy|a!TbPJw$VwRu{aD2{t7}a=pc+;)sGrCRE?xLI`{@j8z!}My`tru@whb__Y-CbUT zxlhWQddc^m)tffO@UD(yFDj~AvK)I~D)p(}ewPzAZ)(luH`Zp`V_%jQnw!qU4O*V_ zl<*qcrIN`SVNt6qBukBE+CD)q-`JI})tMi(t-^Kc&B*qZ%?%|#r*u2*>#rXYZE9Vh zTsEEg*y|p;&~|PwhFsOjyz8Z)Y9L?!UidD|ac6r?_NI5)(1a=R!jz#W`=FAxolR zQ)rb1@??I-T2bTRd5{wl76!>eh4G84GmpLGj!rZ-D@^Tr;%rW&4YZXb`+6C@tr`pWR|k|uYWmnUc+`R%%ISI9 zp;Ol(H4MT7Ilt}p!13B>=X%>adP27H*>LfQ zl}$}&O^0?!)>~!I?+xO-3?qF9QWV#3um<3i-nk&vDce$D>^;rhWa<7j7CpaL$7hrU z9V)%W7}j@<7tU#n$+1iWCrz@lSh&a#3JAAYe0Wj%29p<;9NxQTI%KO&mff30pRS;tsOh^Vw z1roVHEJCR;0ggCE&OoE#an#57gc3IU6TC<^&H~H_P60@81S}pW6ym#NvQBkFX%3h#}*N_81z0V2>e^?C=yk38Im>fEtPm(ie%PLI5tOKnU<5oJ7P|52y&I zyZEpeXd)K>S>h7~$a$~0Kt~gHic_=_2g#6`zicbQCMj;WX_5_NZ9gRw*epXrr zNo8;^s!$1dENKi`RTw&)4ooee>Qop&Z2@OPca=hbTr3R`i=!B5RZu9ErMkgU4r68U z5XfMScva7jcfCIpJ@zy<38Dn*Arwm8xO4yWx$xmk;cVa* zQfGs*9w*c0>uBO4AQe-1*arcR!IJ{;Bsz&oCsEM2@nmtTIsGwP2i*Vg;hzf$(Cgtzl z^?##F@AKylB!b_7;^2>&3WEoh@Q08#$J3pO2v_|e6W(H2GD+gGLWV%-Pg9*5h@3n# zSg0dsvE6h!^(N^2WCdxu7s4V>7Sknw+5m=|MVwE=_J?{lENXi#Or2a@Z2bsNxDa_e zv&{~XYf(-n;o-xu{D*pay7d&G^4)(S-kV=JfnWmqQ02H6UDD7l%*_ zGN8A&8!Yi&OUvdzE2|BNM#eBPkQ$I$kRB8Rx;i`m+u51@@9V3?Fa*X1$$`}1HDL1O zdYlG;xqwAhjq4zybs$iLMbHgJRSm>j49pe_#gSa{(-- zP{IIa8lfu4KAjJz92?=HZv4M!y08*k6 j!waxn1{cHu&~qaI`;AdY?WMjM00000NkvXXu0mjffbm?{ diff --git a/src/main/resources/assets/portalcubed/textures/item/old_aperture_fizzler_frame.png b/src/main/resources/assets/portalcubed/textures/item/old_aperture_fizzler_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..c092ddc7e488322b41cf3741535d3df6368680b7 GIT binary patch literal 5592 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/portalcubed/textures/item/old_aperture_fizzler_icon.png b/src/main/resources/assets/portalcubed/textures/item/old_aperture_fizzler_icon.png index 52ff915ad789bfc39481fbb377d4498df9283e23..fa449cd7bc3bdb530156f6647985226f66b23cbd 100644 GIT binary patch literal 5389 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 diff --git a/src/main/resources/assets/portalcubed/textures/item/portal_1_fizzler_frame.png b/src/main/resources/assets/portalcubed/textures/item/portal_1_fizzler_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..12a5bed425d077006be6e19155886b6f086c3ca0 GIT binary patch literal 5790 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 IT*DIo13Ubv4FCWD literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/portalcubed/textures/item/portal_1_fizzler_icon.png b/src/main/resources/assets/portalcubed/textures/item/portal_1_fizzler_icon.png index d538765d07b7efd9e05624fde3885eb16ded5432..3f28b0c03139e006c926a2fdb0a38c6497d32611 100644 GIT binary patch delta 1919 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 diff --git a/src/main/resources/assets/portalcubed/textures/item/portal_2_death_fizzler_icon.png b/src/main/resources/assets/portalcubed/textures/item/portal_2_death_fizzler_icon.png index 79b2115d58d1600e80ea81ce60464138f64a61e8..7620bcbf081543dae89cb11ef2895322ff12e86c 100644 GIT binary patch delta 1878 zcmV-c2dVgnD#|L5M1O6T>!=R=&njjKAOV8q@OjSc;4Oa&j7jWHx^w%!_{7LENQFv5 zR_%ZPcJ&W_MC_Gy5`6St<7cCdlpq9s{PMgTZRdSG=u^1p)qX)xF-ATfBQ1S{9$(;!Lre>iJ%66dLgZtR%hqaHp6ybF z$KSG$cixD_-I5mZ5pp1H1@Wu{XfG6}A$J6HE6(S0DghHUHmq@HUMP9|nbXkYu9+1k z>Z#(Xa(o0{gGxXE(zqNYy@UB2n@5b^{65*1hLhgLAGe&!KG37dF<J~xeBB!h{PBKGJv22=){&X7%8hV zAj?{Z{C^P}kVDC_v(7p1#03{!^6W?Dc`tq(&q-LUIPoG9ltf8^gAFeDAR&YpQl!W@ zzFkC}#t>sn2~HC%C#+7GkW!}1*=Co0mK<_aITfT&vBec%q=XVns#Lk6z^kuPLya{x z(~wHdHrITU7FuknBh@;0+gbX)rf9Lq9@QI08sF$f;&91_o_2yuD(rjxJFqV@DZ|plU|-;e88 z#~xLMu)HIQ4gtr@b&XFO#d;^fN=r>*UdB{|HG4(*E0F31%8x+0cE-$4K|yLKZnVA^ zVf+lBdIgA1%Q4?^m|J3P4%O%Z$Eqaf?0=JTu6bn%=?=8tWtF<5mpL5eD%?5IHppkF zVp>AUH)!gSUw;Sfb*+cjIBMdcsHUu9wr3U)x@GLEH-$9Q18x<{3WceoRIkinSbi1 zMEi)$80Xf8TYgsq=#lpVuJi($`nU$J(Ch`8%o3Sw-lu-y@)fdpB1^OSe|c^k$3{Aj z4K>dV{<#F6vMSyWVpurx$ZXhXzN>8oG-Ic4`+GN{-5+_Bx+}f35O;{`^&tJWQ%!S< zp3mA=<+nXRy@}lnT?_fzdt|*nT1HQlyP@5-c0m0f2TlDL#Y+&scBQit)HewSENSI^ z>A8GQo%)&E$0v=rRT!3=E_CUgYQz}dYf=3NdtVmAKq{c?0004mlK}-7e?T0?UsI)0 zDh?JDb;wYiEQpFYN)?M>p|llRbuhW~3z{?}DK3tJYr(;f#j1mgv#t)Vf*|+-;_Bk0 z=prTlFDbN$@!+^0@9sVB-T^|R!c?s^#*d7t}p^eTCie*r#`c#i3YMZ7^gvuWv^_ld)-Bq_w_#N!5Ckob}7vdeFr ziw+AsGi+p1^Tc6dvDm?K2eXo)5>FFH6jh^qA?vcjd5g1Jsj=2Q`3pmNZ6(chnj?r~ z2?-=2LPiZ`RA3=Wt44~66z#`6{6mgENiLaOWiWCqpb8a|;|KqPf8X7jg{et5DHH>` zUu^qh6bS4B&AM%WAKP~G1n@rtS6bU&Z2+^Mq}SV8G?f`>Nx@1U> zT3B0I5-5xij=+X@$R0^-u^w)>hA|YpK_D& z(DYsa01fwPR9JLavzP{j0wiWQG&f~7WjHN4HfCZiG+|+6En+w{F)d?bH8e9cW@Ioo zFfx-t38)S^HZw6eGBq$XI5aUdIJ5T&SOJr83S1;OGC473G%++SWi)1FEi^bdIW1v0 zF*Yq^F=b;gV=**hW@9ju@Cr!|F)%GKGgL4$Ix{djH88VB3up)yM33zC00006VoOIv z0AK)M0AOVlW=fOA6CVi*0|y>5hDlBjlkF2ISVKufK~y-)V_={VFd}ol7Zmgoqlt6E zgkr1)FfcGM{EUeSz^9pg$&wAod?u=TfsiZEZKsM0MhzGi1`M*KOipeD09mjU8dOWg QSpWb407*qoM6N<$f&qI|YXATM delta 1999 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 E0|(oY761SM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/portalcubed/textures/item/portal_2_fizzler_icon.png b/src/main/resources/assets/portalcubed/textures/item/portal_2_fizzler_icon.png index ad7c12f26010bf223c974ea9559e34453c86e32e..c243d68cd8d0dfc41e722155e944dc330aff0d88 100644 GIT binary patch delta 1929 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%0AUCG1ATB42-`-Gt zkJ`(qw%mu1J#p@?+qk=H8$DCi-WAs_I>AN-O?Pq$s3@y%S;6s;AKV<&6DmGTAQAgQ zJ(kGZl9*4$Td%!atNaeo8L28;=LvU*^r@maU-=Q{Wjww-MrKbl4+Z2->&k)_U9^j{ zJKcYUUKAgtpq{<%Tb1m|PGp>}TSGdyY!kE}c}49k!h2BB@D2}FO~$h*>o&lpqx$j9 z+&eC~f-&uMo^Yt|mclX1l0yLRW1$i2_}q}|qd zDF8K_(6ynR4for|)|bz@1|?l0`|k?it#SNZoa$Pg!QT?`yV13^Rnc!XixfYcH(E(u zjik?{4{!SV&W?i*{~vD7>JzoHpy&>NZJR;lS8HVH)=SAtl{dYl4^g|G{h3})(93@T z`o+PicK*e8c}LHA7rs0T)Q3{2-QCObQk5^&s6L$vZ=l9k;`8AUE|yJ;@Vyq*f15-Q z!1*`D-T(jrglR)VP)S2WAaHVTW@&6?004NLeUUv#!$2IxUsI)0Dh?JDb;wYiEQpFY zN)?M>p|llRbuhW~3z{?}DK3tJYr%iPkHxBki?gl{u7V)=0pjZ7r060g{x2!Ci1FaK zAMfrx?%n}Hqrz0PYXVR;%SgpzVm7xb23`?_9{~(tSYoE0NH1pKIlk`U`Uu^qh6bS4B&AM%W zAKP~G1n@rtS6bU&Z2+^Mq}Nf~TI2}m+XgPK+nT%wTAwcEBNy16AGV)kB@x{_=tPcxyaxQ=vSkBu+{4lX zqmNGjQDN{476xePfj(jI*3T~m+281S0X;3?%nRuG09QCL;tG8pBm?ld0sxurQwyLM RM=t;X002ovPDHLkV1gT%)R+JO delta 2305 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/portalcubed/textures/item/portal_2_matter_inquisition_field_icon.png b/src/main/resources/assets/portalcubed/textures/item/portal_2_matter_inquisition_field_icon.png index 8f69c827933a30983ef5d2e78be5d724b7123651..0ed1b3fd31a0ca135a218ac6f35c7bb67120f8e3 100644 GIT binary patch delta 1811 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 AUH||9 diff --git a/src/main/resources/assets/portalcubed/textures/item/portal_2_physics_repulsion_field_icon.png b/src/main/resources/assets/portalcubed/textures/item/portal_2_physics_repulsion_field_icon.png index 2676bd1c6745ed3fdf8d4e1977603f6eec8c0fa4..6a412a35d1f1e763239d4498ccc842d0a21f4d69 100644 GIT binary patch delta 1976 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 diff --git a/src/main/resources/assets/portalcubed/textures/item/portal_gun.png b/src/main/resources/assets/portalcubed/textures/item/portal_gun.png index 4ede904272a2a80d25a4750defe347f606745918..f6a5d5a71a139306bd89345f07a7c29384e3428c 100644 GIT binary patch delta 3589 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 Ix?|*j041K89{>OV delta 3401 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 diff --git a/src/main/resources/assets/portalcubed/textures/item/portal_gun_atlas.png b/src/main/resources/assets/portalcubed/textures/item/portal_gun_atlas.png index e9f9d8546b7fc535c1b2390692b27bfcedb40db3..7085e4d61675720ec246141b6996270622c64550 100644 GIT binary patch delta 3798 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 M07*qoM6N<$f_Wk_6#xJL delta 3603 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 Zd;yantg@f9^%DR9002ovPDHLkV1f$1$O8ZX diff --git a/src/main/resources/assets/portalcubed/textures/item/portal_gun_p_body.png b/src/main/resources/assets/portalcubed/textures/item/portal_gun_p_body.png index 38dedf9828ad4e07d59b584bf98f963d306767aa..b7bc4aa2dfe7c71380b5643d6be0ccb183377553 100644 GIT binary patch delta 3854 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

+ZPft!v_S4X|-&k=+OJz@F@ z2#d@&iE$GuqpTZ7r1O$*J-Z*h^&p)-)}B$Y6Nx?mH|lx*-U-w3d{Y{|-nYVAs2Z@k zQd453sOe+UxoI;9Ki$?DOiQRCZzcN@puBA&-_f<2DMd!7uk@NvLOV zcmB3|FNBVtxt)X7hoU~0S8;UcNmT;8)kIIiej#Qzi?@v?Y=V!IN*dLf4!_YOfp9KV zJ#@6WO6B-PnP%oKi|-}Je5yfz*=m7?o=tV++T486mXa;9tADq@;xnDtVFMLgIi-vl z#G$EJ4{UN88K(k&?aD^=g-r^&Wi~l!Dt{kAa&5IX>%oR`tv{gewvA8u zfo1C=dq)RT$$u-S?O|2ENv8rj(+G%&W;~+BDP(dCKQbV;QhVz@hHx%XSx8Y2UvEN5 zCV>oeBSy+)IA6Df#7(QZvt_Hz=c;tKn#$sKKNu}{2%f)R6I3U8CU%6ar8kO{Gc8$) zBIyWcr~)WCX>}6mGGFJwZ)d|_x8{|5{GvEgOI1%)$A6{gyx=rVLMiTLttOAv@NoLS z>rT?<= z%e3eCb+G@m8>&Z`UuRGAPZR%c7r&p1`7e919!oOibb$c+6t{Ym|Xe=O&XFE7e~Rh;NZt%)xpJC zR|i)?5c~jfb#YR3krMxx6k5c1aNLh~_a1le0HI!Hs@X9CsG4OYV^J}aT@?eb2%sAS z5HTV#Q;(+>)9@T$_we!cF2b|C&;2=im7K`{pGZ8%bbrGl-XNaYv~M{K$3LaarNK#aS&^S@WL! zg~6P*lHxkeVZ^Y6I1<#6j4Dbf!$O2sjT93}+K+npha7)`Tr#;zVB}ap1u7)R5B>+g zyEXGulYeefFbZ_O*!IUL5ZDD8HQW9^w(Z6V;C}|Lw3fe82WCG>ueG%B5zw~{TwJ#_ zc@MbU0S2FR$&eh$PgBU}f%h}|rYz8Z3-qkHy*2l7`T(SpVqs=7GBGwSV`MjGEi^DP zW-Vf5Ff}bPGB#l`W;HN2G&VVtx(uieI5;^oI5#ykGcz(XHaC-S4H*G2lZp*Evmg#( z1+!ojU5q9YL(l%c_kCNC=B82yDHnS#ujI%MkHKPi7g5CkyNDO1<39V(zh ziwH7|!Z2x2;GM`5FS-uSWA3PEejUE7~j~g5%hu)yy_d>t7^Uyes^{)R!6qY<$wYI`LB_lET>JDc=N#>jG)Z_H?DP5D z>oR_Fa-xrqk997%{_y^#uGVXPkzMHz?_cV4nQP8Dq?C|Sf^&Xja5%6LP)ao!Nj}ov zK7UfzH`TLRD-8O54*+Jr{HVWjRFbQ-duB#bMchS#Ab?T|(-&`>!>2FadZH>}@_@Ov z5curXYh(M(UdGF^Y!KMu06##IB%m;aVThtAwjD6*It;@`nY=dlq?Fd7*Voq=kH=1E zM-LC0a@{399c;qXhR$??F@`M5EIpHU!+$VrD(3guA2%ggl{iWcor&C|mrS~BuT50i zR4asV-Ygef4}w0FQecAzxX7-YX!OkbBu88ZshqkDwv7Y8yR$P$RYO!ILO*ai;WNg- z7;6qT*CxznsAw&v+#(n%W2tI9eg4d9JkA_wQ)rv}+ek3RU~;@mzCC%=tWDi0ihnFh z-$}(T1llpDr0jBts^vB=*phUaJE@gAp4o(`3gS4{aUAQ>Xr%8#WL{Si9k9r2?>(A+ zz15_)oc{zbB_aT{&vH_+DXtd|Sme3dDkY-{Z!WkNRSBgO20`C)W-kZ!5ylu?Q%^3q ze)9bfc=FA6kgCSJvoo|2`C z4-pCp%??FT-0Q2!3IQ1(1bwTS&|KIxA5N!Jiy7}F7ul6gm$|Oi>n0b{Wvp4^SncA2`F!sEXGl;Zy2!3Hq2khU-I~4$@qd$l0f57r UgrY=G5dZ)H07*qoM6N<$f(%3mT>t<8 diff --git a/src/main/resources/assets/portalcubed/textures/item/portal_gun_reloaded.png b/src/main/resources/assets/portalcubed/textures/item/portal_gun_reloaded.png index f806b170a0f97a14be060dd892c2c19dcec269b7..4db6a54f00dc608d9e0d5325ca5ee9cc82399a29 100644 GIT binary patch delta 3736 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 KMNUMnLSTa4cH}Am diff --git a/src/main/resources/assets/portalcubed/textures/item/toxic_goo_bucket.png b/src/main/resources/assets/portalcubed/textures/item/toxic_goo_bucket.png index 928b0738618bd7eadb8dfd3bc6a44a23c60c06b4..3245a220ff8949265745e501e15c9ae528ad3dd4 100644 GIT binary patch delta 2253 zcmaKsdo&XaAIGQUPGLmCNDLdh*)4L}WWX;Z@A>`nJLmT~zx(+%8rB$P>adGrC~o1-o{^y7&>$a{ zKNA!l9n1tVqgXxwK-74nYru_Ju*}w5{a+F{L`et5SAR@S(lef3uH&oo78ZWK9y1n` zhA2_3x*Pxcb5Wp4vsWnG>j!_)GPUwb@6FdSL~Xkn>&HYG`_#2Jm-vOdWw^yT8-5|T z*<-BeWuj`wGW%6lP8>b%ASqrLwBIHcq?)W!*m}gS?a(yNqV1CD&BkuV?`X+$`2l9G zUaRvxgz(ik{NpFFdtyzVfnPh2lufO-L_xE9#R+JcL zvDVDhpx|P|gCb8hnl8C~whA?!INeqjT-$qWyZq(kFSdsHc-A?*yvLa4)5)r}fPOdY zU-A@Q+zFm@lg3<)1l%frcZ0-jc^t!+R~W3OtyJN9^HFt+^x;mj8$SAecBRY2xYeG0 zW*AL`khqEJ_K|B(YgU;H1tKlJDDs)PXomQ`J>UB5lis{ zn`2VMG7lQ=5)ZW68pRuSv-PSe@fM&5s}IKvK0@;mU6ffyMh;cIm`EH*!X6l>A5;MCa`8 z`h#u*zocMU3U08yu608wvQajfNx+eowGvfOY&VjYP0Gq5$mA^crO7-z|_wc7^qfsw#$_iOw0WeO?nXJUr4c$N8!MBvBzv*|73+ zFV*0iO**w|m=ac&MDcraSvenluJX$@%J-Spr4rr)e$2NGO2Eyvg?NI=ICa*c5`Myw zJxr&X(FVYJp1xww$D%nicpVF?)d7F_O3{^2LjB>AEnE6U8A81s0S^AE7V)nthKbcUR{*eE{aS1!uNOL}>QpGn-81+R8^d4n#F?Bd@uq z3;2%MPZ=$drDq@}>B>sG_TZ+2WVP6YiiX@{dvlnL4XQjz^bzU7V7a@G0{Iv5VKN3< zyqD<$&zNC9n(z!{DC6)!P(a#2yP@~(`7Wl{gS0V~;25mw^&@6Ghh*tFgli6v8Bikz* z-fRy@kJ=kv`{mAr_)o3YBg`sqSz`pl_^XqIc2bDYbIs9 zcK&2Squ>lLa{KG4kMdAs_fVJj1KHo!Z+E=Abl+tn&~f&1#)9nOFB*lL2HQtVVsBN6 z`$gt?Rol1~yhUMKG_+17W`ZE zoWm7i%pA4QP&ieQ-R1W4fN3GQ`rwMLj_1KS^-8x{rHZQ>w`5^T)|}bL*tQ?TJ=4ze#XnVB`(x z$E}K+q7K9HSBlF!f3<5q>0i_MxUKWsV-us!;(e<5{HJ&s_F0FeVGj=g5aF;01SeYp z;lHA_BUJ@)Sw~2_ErHe=}m_t`U5Qu=31Uga2E5LyrhOMSF!q*OH#&s~E3_^va>B$E^fqCR^%H%#Dl)w5r@0 z6>nK-zOd}iDWO0Arv+QTQeR5;ZIN(NwnTm1C~9&vYd%hsuqOSTKe^Qtx4OvzrG^< z@=A}yxV~Ndl((`K4^Ze0z1U{bz5xL2Mb#UNrS8(fVHhX`49A2b5I8gx<%z^Wy}Xzh zsFx264#(gaK1`$!moHHP#-Y(DI1YwJV-Yx{iMA971hTPpaKgJXL&I1>fo9qWBRI?m ziQ?8sVrl*hG)1Z(KDR6L%CxL8i(+thuC@;e zg~Oo#Q?HfK=wrvV0BW+O#6?uayj^&?JD+P|OSGh5 z`)asP$(>HX9(FS{Au%(TEJL#Lg#^Orv?#gRv2F}KByvs_|Ng~1C}hfy?xJv2IzNka zReq2yXGd75ky}qcE7&MpEi90ZwX1j?*sNA{L7zF-QDRVi(hwqxh2&q@Y6pu0y4yf? z9<*AvYfD@Q!SEZ(b(zNTRi6=u?;#W`oxiph51C(*Bu*4fG2v zrUMEzr-!f{z=a>{9wZWSL}b8K-lR*+yyMb)(W3cxOF~vR^gu{jUQoRpq=8DL41QgU z!CvE+6zwA_v2*1kT+^oZ|r5$;?>Cbn3DEOK>E;$yZLpS7&_{} zmtAl0WCa_^Oy|_;V2Nkpc&Zhouk$?ry%sa#p_+H|Y_0sAY%iD!162RP{=@d!qeGLw ZcX58jb=tm5;O}f3U~5e#KCq&5{stHc0Pg?* delta 2023 zcmVc32`20>lH9rv3Y?n}6^yks9lQ`sn?E$3`1D zfzV?;X^wQ*Iqo0FNj&h)wZLErW?4VgZ~2o?$AczHpxh@#T7ULJeq4xl>(`s2ZAgYk z45DsDaVrvD3$zuab*#fj4WEyY+nVcn5?!AegM_L3QgZ)o1ENw%oZbUS-+y(fGRH0Y8zjK%YMXJ_i+Hz7ek? zs|!%8M>#UyLXjA7b+S|`QKvTNLIo~bZiWL0=E5?WDuE*x8Ti@pQs*F1DsW^e6Lu?n z`9jldJc^mt6qYMN6y;Z7nBRZRyBm5Rr9gD(6)X6~Jb!`>HwJQJgcuN^zJuy!fY0~- z3|s{Wx)J43A`yYjOGS3{(FtS%Ef92=SGiEATLD4@(+gnxm;(_4sQ@U! zbr#DR2#|AJ;Urr@6$Mrvrm-c^6lKR?8}QN0fP_Pp1z-~;0W51B@+VkD4kahfI_JC# zPF-}#i+{J?dGCWCO)&)t)&v)P2th*(Nky$X^%_()YKj~MP18jmL(~{!O0b!rIbnB# zKuVdjWSgDIK8LJ1=2VbA#THk52}MgRsdANy{!x7mRcoxNQ9~*<+g$T4G;Oh^j#TSn zy6vv}9=i6}(}miG^~?JPYP3<~iPR7b7i!>!aDS?x(N5gJ41lq*1jNID013?lvqQ;R z9>@*Mj)?Xrj^U&mm{l5x0YTe{U8fT}!wb=Y-2cMO1p9y+|0!~2K=&qcUvYbeS{>I= znTV|_96>z<)ra+_i8YPO?#pa`xA5-#cNDei&AVGTJzp{JSiNyN?$t@-g6HYcA?f&F zJ%630gzud*uQ~ByTuNWd4Xul+bz~hXs+&c@B|iwVr3K29i42H~Anj8PZmF=O6sl?R zaz3ifKY&qM67!Sv2KW<4{LN~{pAj{! zZ^$wr%l^t=`LRqN3t+X8p7h?c(D_cvUp%=>m3mq>=&$#q|B+kfQ(=ayF!QAq{eOK^ zQNInF*-CgZvzDT*wU11H)j#vQ#&LoGBi_H@pLvEWE}Ac)|0&bV>nZnrrWyX;rI(Z5 zyjlgdT)NAbj6{B!TVh=*uKXJJ{B;4O-{NN8zm1;eo0|SN0`v&~tMl_-`#tdhcQGp&D)BUNSWz{~7qSj3oVPful{#zRlfN*K*H+S8r#XT+mXJUaB4pH2Mg=uQ zXw^tDk)r*Wi+|YmC&?v~s|-et1yrFzvVZ;HfAG6ovoJO3Bn4tX&x>V!i~{~$pw+Of z?_LGI19hRoj000g5X|rGk zi2@`vGcz}4H)LWhW-wx7Ei_~_HZ5UhGcYYUIbk<3G&nP1W@coQ4GE|yI50RdGBY$V zGcq_ZGBhFzARr(|Nlj2XR%LQ?X>V>lA~G&9FfKDNlidk8vvUgN0kby^UCr>=l5Lg)ilTf?aD3fQ6uw zca6xPt$MY&SjUGbikM6$IGKx+xwN-EzPBzS1Kon*aL9N(ZXP1QU@#zxA^_qz1|UsS z9v<%j=yto!9UQ{<{hD?Yj983&Py!q(n&S2S`ES5-xoiYnUycepMu3!3EEWp@R;!f} z;&~pk*{rlkwHZ`xR4e{!K}sp6(`gNoB#E*5zkH^X;|H`Fbu82>Kn(x@002ovPDHLk FV1iR$!*~Dy diff --git a/src/main/resources/data/portalcubed/tags/blocks/portal_nonsolid.json b/src/main/resources/data/portalcubed/tags/blocks/portal_nonsolid.json index 1dbef22a..83ceee12 100644 --- a/src/main/resources/data/portalcubed/tags/blocks/portal_nonsolid.json +++ b/src/main/resources/data/portalcubed/tags/blocks/portal_nonsolid.json @@ -23,6 +23,7 @@ "portalcubed:propulsion_gel", "portalcubed:reflection_gel", "portalcubed:adhesion_gel", + "portalcubed:faith_plate_target", "minecraft:iron_bars", "minecraft:oak_fence_gate", "minecraft:birch_fence_gate", @@ -40,4 +41,4 @@ "minecraft:chain", "minecraft:bamboo" ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/portalcubed/tags/blocks/portal_solid.json b/src/main/resources/data/portalcubed/tags/blocks/portal_solid.json index 9184e56e..77cb95af 100644 --- a/src/main/resources/data/portalcubed/tags/blocks/portal_solid.json +++ b/src/main/resources/data/portalcubed/tags/blocks/portal_solid.json @@ -11,6 +11,7 @@ "minecraft:lava", "minecraft:nether_portal", "minecraft:end_portal", + "#minecraft:all_signs", "portalcubed:portal_1_smooth_gray_panel_facade", "portalcubed:portal_1_smooth_gray_half_panel_facade", "portalcubed:dirty_portal_1_smooth_gray_panel_facade", @@ -34,4 +35,4 @@ "portalcubed:old_ap_blue_panel_facade" ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/portalcubed/tags/blocks/portalable_gels.json b/src/main/resources/data/portalcubed/tags/blocks/portalable_gels.json index 65f1e2e0..d4cab3f5 100644 --- a/src/main/resources/data/portalcubed/tags/blocks/portalable_gels.json +++ b/src/main/resources/data/portalcubed/tags/blocks/portalable_gels.json @@ -14,4 +14,4 @@ "portalcubed:old_ap_white_panel_facade", "portalcubed:old_ap_white_checkered_panel_facade" ] -} \ No newline at end of file +} diff --git a/src/main/resources/portal_blocks.json b/src/main/resources/portal_blocks.json index 34b92e84..f5f1719c 100644 --- a/src/main/resources/portal_blocks.json +++ b/src/main/resources/portal_blocks.json @@ -1397,7 +1397,7 @@ }, "old_ap_floor_button": { "type": "provided", - "render_layer": "translucent" + "render_layer": "cutout" }, "matter_inquisition_field": { "type": "provided",