diff --git a/src/main/java/io/github/fusionflux/portalcubed/content/PortalCubedItems.java b/src/main/java/io/github/fusionflux/portalcubed/content/PortalCubedItems.java index c1f728bd..5b6a5982 100644 --- a/src/main/java/io/github/fusionflux/portalcubed/content/PortalCubedItems.java +++ b/src/main/java/io/github/fusionflux/portalcubed/content/PortalCubedItems.java @@ -17,6 +17,7 @@ import io.github.fusionflux.portalcubed.content.prop.PropDispenseBehavior; import io.github.fusionflux.portalcubed.content.prop.PropItem; import io.github.fusionflux.portalcubed.content.prop.PropType; +import io.github.fusionflux.portalcubed.data.tags.PortalCubedBannerPatternTags; import io.github.fusionflux.portalcubed.framework.item.BucketDispenseBehaviour; import io.github.fusionflux.portalcubed.framework.registration.item.ItemBuilder; import net.fabricmc.fabric.api.loot.v3.LootTableEvents; @@ -30,6 +31,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.food.Foods; import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.BannerPatternItem; import net.minecraft.world.item.BucketItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; @@ -54,6 +56,10 @@ public class PortalCubedItems { public static final Item RAW_MAGNESIUM = REGISTRAR.items.create("raw_magnesium", Item::new) .build(); + public static final BannerPatternItem APERTURE_BANNER_PATTERN = REGISTRAR.items.create("aperture_banner_pattern", s -> new BannerPatternItem(PortalCubedBannerPatternTags.APERTURE, s)) + .properties(s -> s.stacksTo(1)) + .build(); + public static final CrowbarItem CROWBAR = REGISTRAR.items.create("crowbar", CrowbarItem::new) .properties(s -> s.stacksTo(1)) .build(); diff --git a/src/main/java/io/github/fusionflux/portalcubed/content/PortalCubedTabs.java b/src/main/java/io/github/fusionflux/portalcubed/content/PortalCubedTabs.java index 0d492179..39115cca 100644 --- a/src/main/java/io/github/fusionflux/portalcubed/content/PortalCubedTabs.java +++ b/src/main/java/io/github/fusionflux/portalcubed/content/PortalCubedTabs.java @@ -244,6 +244,7 @@ public class PortalCubedTabs { output.accept(PortalCubedItems.LEMONADE); output.accept(PortalCubedItems.LEMON_BOAT); output.accept(PortalCubedItems.LEMON_CHEST_BOAT); + output.accept(PortalCubedItems.APERTURE_BANNER_PATTERN); output.accept(PortalCubedItems.GOO_BUCKET); output.accept(PortalCubedItems.ADVANCED_KNEE_REPLACEMENTS); output.accept(PortalCubedItems.LONG_FALL_BOOTS); @@ -433,6 +434,7 @@ public static void init() { entries.addAfter(Items.RAW_IRON, PortalCubedItems.RAW_MAGNESIUM); entries.addAfter(Items.IRON_NUGGET, PortalCubedItems.MAGNESIUM_NUGGET); entries.addAfter(Items.IRON_INGOT, PortalCubedItems.MAGNESIUM_INGOT); + entries.addAfter(Items.GUSTER_BANNER_PATTERN, PortalCubedItems.APERTURE_BANNER_PATTERN); }); ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.FOOD_AND_DRINKS).register(entries -> { diff --git a/src/main/java/io/github/fusionflux/portalcubed/data/tags/PortalCubedBannerPatternTags.java b/src/main/java/io/github/fusionflux/portalcubed/data/tags/PortalCubedBannerPatternTags.java new file mode 100644 index 00000000..cdc88ed0 --- /dev/null +++ b/src/main/java/io/github/fusionflux/portalcubed/data/tags/PortalCubedBannerPatternTags.java @@ -0,0 +1,14 @@ +package io.github.fusionflux.portalcubed.data.tags; + +import io.github.fusionflux.portalcubed.PortalCubed; +import net.minecraft.core.registries.Registries; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.entity.BannerPattern; + +public class PortalCubedBannerPatternTags { + public static final TagKey APERTURE = create("pattern_item/aperture"); + + private static TagKey create(String name) { + return TagKey.create(Registries.BANNER_PATTERN, PortalCubed.id(name)); + } +} diff --git a/src/main/resources/assets/portalcubed/items/aperture_banner_pattern.json b/src/main/resources/assets/portalcubed/items/aperture_banner_pattern.json new file mode 100644 index 00000000..c729fa3f --- /dev/null +++ b/src/main/resources/assets/portalcubed/items/aperture_banner_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "portalcubed:item/aperture_banner_pattern" + } +} diff --git a/src/main/resources/assets/portalcubed/items/blueprint_portal_gun.json b/src/main/resources/assets/portalcubed/items/blueprint_portal_gun.json index 4fa7e166..05dd9a8f 100644 --- a/src/main/resources/assets/portalcubed/items/blueprint_portal_gun.json +++ b/src/main/resources/assets/portalcubed/items/blueprint_portal_gun.json @@ -9,7 +9,7 @@ }, { "type": "minecraft:dye", - "default": -1 + "default": -11169857 }, { "type": "portalcubed:portal_gun", diff --git a/src/main/resources/assets/portalcubed/items/peashooter.json b/src/main/resources/assets/portalcubed/items/peashooter.json index 6e1364f0..a3d9a369 100644 --- a/src/main/resources/assets/portalcubed/items/peashooter.json +++ b/src/main/resources/assets/portalcubed/items/peashooter.json @@ -9,7 +9,7 @@ }, { "type": "minecraft:dye", - "default": -1 + "default": -4658378 }, { "type": "portalcubed:portal_gun", diff --git a/src/main/resources/assets/portalcubed/lang/en_us.json b/src/main/resources/assets/portalcubed/lang/en_us.json index 0fa6b4a2..af717c02 100644 --- a/src/main/resources/assets/portalcubed/lang/en_us.json +++ b/src/main/resources/assets/portalcubed/lang/en_us.json @@ -382,6 +382,8 @@ "advancement.portalcubed.portal_gun.title": "Thinking with Portals", "advancement.portalcubed.portal_gun.description": "Obtain a Portal Gun", + "advancement.portalcubed.dyed_portal_gun.title": "Pretty Painted Portal Producer", + "advancement.portalcubed.dyed_portal_gun.description": "Dye the shell of a Portal Gun", "advancement.portalcubed.portal_gun_fox.title": "You Shouldn't be Eating That", "advancement.portalcubed.portal_gun_fox.description": "Give a Portal Gun to a Fox", "advancement.portalcubed.construction_cannon.title": "Trust me, I'm an Engineer", @@ -392,14 +394,18 @@ "advancement.portalcubed.lemonade.title": "Burn Life's House Down!", "advancement.portalcubed.lemonade.description": "Create and use a combustible lemon", - "advancement.portalcubed.sign_here.title": "Sign Here", - "advancement.portalcubed.sign_here.description": "Place a Signage block", - + "advancement.portalcubed.configure_test_element.title": "Give it a good whack", + "advancement.portalcubed.configure_test_element.description": "Use a Hammer to configure a test element", + "advancement.portalcubed.stalemate_associate.title": "Certified Stalemate Associate", + "advancement.portalcubed.stalemate_associate.description": "Configure a Pedestal Button", "advancement.portalcubed.hammer_time.title": "Stop - Hammer Time!", - "advancement.portalcubed.hammer_time.description": "Use a Hammer to configure a test element", + "advancement.portalcubed.hammer_time.description": "Change the timer of a test element", "advancement.portalcubed.crossover_episode.title": "Crossover Episode", "advancement.portalcubed.crossover_episode.description": "Obtain a Crowbar", + "advancement.portalcubed.sign_here.title": "Sign Here", + "advancement.portalcubed.sign_here.description": "Place a Signage block", + "advancement.portalcubed.radio.title": "Tunes to Test to", "advancement.portalcubed.radio.description": "Obtain a Radio", "advancement.portalcubed.cubes.title": "Cubes to Keep You Company", @@ -465,6 +471,42 @@ "item.portalcubed.crowbar": "Crowbar", "item.portalcubed.construction_cannon": "Construction Cannon", + "item.portalcubed.aperture_banner_pattern": "Aperture Banner Pattern", + "block.portalcubed.banner.aperture.white": "White Aperture", + "block.portalcubed.banner.aperture.light_gray": "Light Gray Aperture", + "block.portalcubed.banner.aperture.gray": "Gray Aperture", + "block.portalcubed.banner.aperture.black": "Black Aperture", + "block.portalcubed.banner.aperture.brown": "Brown Aperture", + "block.portalcubed.banner.aperture.red": "Red Aperture", + "block.portalcubed.banner.aperture.orange": "Orange Aperture", + "block.portalcubed.banner.aperture.yellow": "Yellow Aperture", + "block.portalcubed.banner.aperture.lime": "Lime Aperture", + "block.portalcubed.banner.aperture.green": "Green Aperture", + "block.portalcubed.banner.aperture.blue": "Blue Aperture", + "block.portalcubed.banner.aperture.cyan": "Cyan Aperture", + "block.portalcubed.banner.aperture.light_blue": "Light Blue Aperture", + "block.portalcubed.banner.aperture.purple": "Purple Aperture", + "block.portalcubed.banner.aperture.magenta": "Magenta Aperture", + "block.portalcubed.banner.aperture.pink": "Pink Aperture", + + "block.portalcubed.banner.oval.white": "White Oval", + "block.portalcubed.banner.oval.light_gray": "Light Gray Oval", + "block.portalcubed.banner.oval.gray": "Gray Oval", + "block.portalcubed.banner.oval.black": "Black Oval", + "block.portalcubed.banner.oval.brown": "Brown Oval", + "block.portalcubed.banner.oval.red": "Red Oval", + "block.portalcubed.banner.oval.orange": "Orange Oval", + "block.portalcubed.banner.oval.yellow": "Yellow Oval", + "block.portalcubed.banner.oval.lime": "Lime Oval", + "block.portalcubed.banner.oval.green": "Green Oval", + "block.portalcubed.banner.oval.blue": "Blue Oval", + "block.portalcubed.banner.oval.cyan": "Cyan Oval", + "block.portalcubed.banner.oval.light_blue": "Light Blue Oval", + "block.portalcubed.banner.oval.purple": "Purple Oval", + "block.portalcubed.banner.oval.magenta": "Magenta Oval", + "block.portalcubed.banner.oval.pink": "Pink Oval", + + "item.portalcubed.storage_cube": "Weighted Storage Cube", "item.portalcubed.storage_cube.2": "Dirty Weighted Storage Cube", "item.portalcubed.portal_1_storage_cube": "Portal 1 Weighted Storage Cube", @@ -995,6 +1037,8 @@ "death.attack.landing_damage": "%1$s was hit on the head by a falling %2$s", "death.attack.landing_damage.player": "%1$s was hit on the head by a falling %2$s trying to escape %3$s", "death.attack.landing_damage.item": "%1$s was hit on the head by a falling %2$s trying to escape %3$s wielding %4$s", + "death.attack.submerged_the_operational_end_of_the_device": "%1$s submerged the operational end of the device", + "death.attack.submerged_the_operational_end_of_the_device.player": "%1$s submerged the operational end of the device trying to escape %2$s", "death.attack.lemonade": "%s combusted", "death.attack.lemonade.player": "%1$s combusted due to %2$s's lemonade", diff --git a/src/main/resources/assets/portalcubed/models/block/aged_small_signage_bottom_left.json b/src/main/resources/assets/portalcubed/models/block/aged_small_signage_bottom_left.json index 8240fee5..f4a1c833 100644 --- a/src/main/resources/assets/portalcubed/models/block/aged_small_signage_bottom_left.json +++ b/src/main/resources/assets/portalcubed/models/block/aged_small_signage_bottom_left.json @@ -2,7 +2,7 @@ "credit": "Made by Cart3r using Blockbench.", "textures": { "0": "portalcubed:signage/aged_small_signage_blank", - "particle": "portalcubed:signage/aged_small_signage_blank", + "particle": "portalcubed:signage/aged_large_signage_blank", "signage_bottom_left": "#portalcubed:dynamic" }, "elements": [ diff --git a/src/main/resources/assets/portalcubed/models/block/aged_small_signage_bottom_right.json b/src/main/resources/assets/portalcubed/models/block/aged_small_signage_bottom_right.json index 64606417..a41ec1a4 100644 --- a/src/main/resources/assets/portalcubed/models/block/aged_small_signage_bottom_right.json +++ b/src/main/resources/assets/portalcubed/models/block/aged_small_signage_bottom_right.json @@ -2,7 +2,7 @@ "credit": "Made by Cart3r using Blockbench.", "textures": { "0": "portalcubed:signage/aged_small_signage_blank", - "particle": "portalcubed:signage/aged_small_signage_blank", + "particle": "portalcubed:signage/aged_large_signage_blank", "signage_bottom_right": "#portalcubed:dynamic" }, "elements": [ diff --git a/src/main/resources/assets/portalcubed/models/block/aged_small_signage_top_left.json b/src/main/resources/assets/portalcubed/models/block/aged_small_signage_top_left.json index 19167c20..1bcecc0f 100644 --- a/src/main/resources/assets/portalcubed/models/block/aged_small_signage_top_left.json +++ b/src/main/resources/assets/portalcubed/models/block/aged_small_signage_top_left.json @@ -2,7 +2,7 @@ "credit": "Made by Cart3r using Blockbench.", "textures": { "0": "portalcubed:signage/aged_small_signage_blank", - "particle": "portalcubed:signage/aged_small_signage_blank", + "particle": "portalcubed:signage/aged_large_signage_blank", "signage_top_left": "#portalcubed:dynamic" }, "elements": [ diff --git a/src/main/resources/assets/portalcubed/models/block/aged_small_signage_top_right.json b/src/main/resources/assets/portalcubed/models/block/aged_small_signage_top_right.json index 86b7e004..6776a198 100644 --- a/src/main/resources/assets/portalcubed/models/block/aged_small_signage_top_right.json +++ b/src/main/resources/assets/portalcubed/models/block/aged_small_signage_top_right.json @@ -2,7 +2,7 @@ "credit": "Made by Cart3r using Blockbench.", "textures": { "0": "portalcubed:signage/aged_small_signage_blank", - "particle": "portalcubed:signage/aged_small_signage_blank", + "particle": "portalcubed:signage/aged_large_signage_blank", "signage_top_right": "#portalcubed:dynamic" }, "elements": [ diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left.json index d93bcd78..5acc0795 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left.json @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"}, - "west": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"} + "east": {"uv": [2, 4, 4, 8], "texture": "#0"}, + "west": {"uv": [0, 4, 2, 8], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left_open.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left_open.json index 7a057c7b..aa07db24 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left_open.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left_open.json @@ -11,11 +11,11 @@ "from": [0.99, -0.01, -12.01], "to": [5.01, 16.01, 4.01], "faces": { - "north": {"uv": [7, 3.995, 7.5025, 8], "texture": "#0"}, - "east": {"uv": [10.0025, 4, 8, 8.005], "texture": "#0"}, - "south": {"uv": [6.0025, 0, 5.5, 4.005], "texture": "#0"}, - "west": {"uv": [12, 3.995, 14.0025, 8], "texture": "#0"}, - "down": {"uv": [7, 0, 7.5025, 4.005], "texture": "#0"} + "north": {"uv": [7, 4, 7.5, 8], "texture": "#0"}, + "east": {"uv": [10, 4, 8, 8], "texture": "#0"}, + "south": {"uv": [6, 0, 5.5, 4], "texture": "#0"}, + "west": {"uv": [12, 4, 14, 8], "texture": "#0"}, + "down": {"uv": [7, 0, 7.5, 4], "texture": "#0"} } }, { @@ -31,8 +31,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"}, - "west": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"} + "east": {"uv": [2, 4, 4, 8], "texture": "#0"}, + "west": {"uv": [0, 4, 2, 8], "texture": "#0"} } }, { @@ -46,4 +46,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left_unlocked.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left_unlocked.json index 73b3c7eb..e0b7375f 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_left_unlocked.json @@ -23,8 +23,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"}, - "west": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"} + "east": {"uv": [2, 4, 4, 8], "texture": "#0"}, + "west": {"uv": [0, 4, 2, 8], "texture": "#0"} } }, { @@ -41,9 +41,9 @@ "from": [1, 0, 0], "to": [5, 16, 16], "faces": { - "south": {"uv": [0.992, 0.008, 0.008, 3.992], "texture": "#2", "cullface": "north"}, - "west": {"uv": [4.008, 4.008, 7.992, 7.992], "texture": "#2"} + "south": {"uv": [1, 0, 0, 4], "texture": "#2", "cullface": "north"}, + "west": {"uv": [4, 4, 8, 8], "texture": "#2"} } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right.json index e9bb7cde..750eb477 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right.json @@ -30,8 +30,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"}, - "west": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"} + "east": {"uv": [0, 4, 2, 8], "texture": "#0"}, + "west": {"uv": [2, 4, 4, 8], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right_open.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right_open.json index ed51ecfe..4038b8d8 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right_open.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right_open.json @@ -8,14 +8,14 @@ }, "elements": [ { - "from": [0.99, -0.01, 11.99], - "to": [5.01, 16.01, 28.01], + "from": [1, 0, 12], + "to": [5, 16, 28], "faces": { - "north": {"uv": [5.5, 3.995, 6.0025, 8], "texture": "#0", "cullface": "north"}, - "east": {"uv": [8, 4, 10.0025, 8.005], "texture": "#0"}, - "south": {"uv": [7, 3.995, 7.5025, 8], "texture": "#0", "cullface": "south"}, - "west": {"uv": [13.9975, 3.995, 16, 8], "texture": "#0"}, - "down": {"uv": [7, 0, 7.5025, 4.005], "texture": "#0", "cullface": "down"} + "north": {"uv": [5.5, 4, 6, 8], "texture": "#0", "cullface": "north"}, + "east": {"uv": [8, 4, 10, 8], "texture": "#0"}, + "south": {"uv": [7, 4, 7.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [14, 4, 16, 8], "texture": "#0"}, + "down": {"uv": [7, 0, 7.5, 4], "texture": "#0", "cullface": "down"} } }, { @@ -30,8 +30,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"}, - "west": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"} + "east": {"uv": [0, 4, 2, 8], "texture": "#0"}, + "west": {"uv": [2, 4, 4, 8], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right_unlocked.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right_unlocked.json index 33872bc5..69c03df0 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_bottom_right_unlocked.json @@ -30,8 +30,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"}, - "west": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"} + "east": {"uv": [0, 4, 2, 8], "texture": "#0"}, + "west": {"uv": [2, 4, 4, 8], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_left.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_left.json index 34c2dfa4..9b2c6e12 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_left.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_left.json @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 0, 4.0025, 4.005], "texture": "#0"}, - "west": {"uv": [0, 0, 2.0025, 4.005], "texture": "#0"} + "east": {"uv": [2, 0, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 4], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_left_open.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_left_open.json index ac39989b..6dde6e82 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_left_open.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_left_open.json @@ -10,11 +10,11 @@ "from": [0.99, -0.01, -12.01], "to": [5.01, 16.01, 4.01], "faces": { - "north": {"uv": [7, 0, 7.5025, 4.005], "texture": "#0"}, - "east": {"uv": [10.0025, 0, 8, 4.005], "texture": "#0"}, - "south": {"uv": [7.0025, 0, 6.5, 4.005], "texture": "#0"}, - "west": {"uv": [8, 0, 10.0025, 4.005], "texture": "#0"}, - "up": {"uv": [7, 4, 7.5025, 8.005], "texture": "#0"} + "north": {"uv": [7, 0, 7.5, 4], "texture": "#0"}, + "east": {"uv": [10, 0, 8, 4], "texture": "#0"}, + "south": {"uv": [7, 0, 6.5, 4], "texture": "#0"}, + "west": {"uv": [8, 0, 10, 4], "texture": "#0"}, + "up": {"uv": [7, 4, 7.5, 8], "texture": "#0"} } }, { @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 0, 4.0025, 4.005], "texture": "#0"}, - "west": {"uv": [0, 0, 2.0025, 4.005], "texture": "#0"} + "east": {"uv": [2, 0, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 4], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_left_unlocked.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_left_unlocked.json index 34c2dfa4..9b2c6e12 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_left_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_left_unlocked.json @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 0, 4.0025, 4.005], "texture": "#0"}, - "west": {"uv": [0, 0, 2.0025, 4.005], "texture": "#0"} + "east": {"uv": [2, 0, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 4], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_right.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_right.json index d58bd080..3c0a1f9d 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_right.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_right.json @@ -29,8 +29,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 0, 2.0025, 4.005], "texture": "#0"}, - "west": {"uv": [2, 0, 4.0025, 4.005], "texture": "#0"} + "east": {"uv": [0, 0, 2, 4], "texture": "#0"}, + "west": {"uv": [2, 0, 4, 4], "texture": "#0"} } }, { @@ -43,4 +43,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_right_open.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_right_open.json index 591c735c..1c1b70db 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_right_open.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_right_open.json @@ -11,26 +11,26 @@ "from": [0.99, -0.01, 11.99], "to": [5.01, 16.01, 28.01], "faces": { - "north": {"uv": [6, 0, 6.5025, 4.005], "texture": "#0"}, - "east": {"uv": [11.9975, 0, 14, 4.005], "texture": "#0"}, - "south": {"uv": [7, 0, 7.5025, 4.005], "texture": "#0"}, - "west": {"uv": [13.9975, 0, 16, 4.005], "texture": "#0"}, - "up": {"uv": [7, 4, 7.5025, 8.005], "texture": "#0"} + "north": {"uv": [6, 0, 6.5, 4], "texture": "#0"}, + "east": {"uv": [12, 0, 14, 4], "texture": "#0"}, + "south": {"uv": [7, 0, 7.5, 4], "texture": "#0"}, + "west": {"uv": [14, 0, 16, 4], "texture": "#0"}, + "up": {"uv": [7, 4, 7.5, 8], "texture": "#0"} } }, { "from": [0.98, -0.02, 11.98], "to": [5.02, 16.02, 28.02], "faces": { - "west": {"uv": [11.99, 0, 16, 4.01], "texture": "#1"} + "west": {"uv": [12, 0, 16, 4], "texture": "#1"} } }, { "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 0, 2.0025, 4.005], "texture": "#0"}, - "west": {"uv": [2, 0, 4.0025, 4.005], "texture": "#0"} + "east": {"uv": [0, 0, 2, 4], "texture": "#0"}, + "west": {"uv": [2, 0, 4, 4], "texture": "#0"} } }, { @@ -43,4 +43,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_right_unlocked.json b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_right_unlocked.json index cf45eeb8..215a8685 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_right_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_chamber_door_top_right_unlocked.json @@ -29,8 +29,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 0, 2.0025, 4.005], "texture": "#0"}, - "west": {"uv": [2, 0, 4.0025, 4.005], "texture": "#0"} + "east": {"uv": [0, 0, 2, 4], "texture": "#0"}, + "west": {"uv": [2, 0, 4, 4], "texture": "#0"} } }, { @@ -43,4 +43,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_left.json b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_left.json index 54f6a09d..d199bf00 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_left.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_left.json @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"}, - "west": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"} + "east": {"uv": [2, 4, 4, 8], "texture": "#0"}, + "west": {"uv": [0, 4, 2, 8], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_left_open.json b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_left_open.json index 8014c91d..565e542b 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_left_open.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_left_open.json @@ -11,19 +11,19 @@ "from": [0.99, -0.01, -12.01], "to": [5.01, 16.01, 4.01], "faces": { - "north": {"uv": [7, 11.99, 7.5025, 15.995], "texture": "#0"}, + "north": {"uv": [7, 11.995, 7.5025, 16], "texture": "#0"}, "east": {"uv": [10.0025, 11.995, 8, 16], "texture": "#0"}, - "south": {"uv": [6.0025, 7.995, 5.5, 12], "texture": "#0"}, - "west": {"uv": [12, 11.99, 14.0025, 15.995], "texture": "#0"}, - "down": {"uv": [7, 7.995, 7.5025, 12], "texture": "#0"} + "south": {"uv": [6.0025, 8, 5.5, 12.005], "texture": "#0"}, + "west": {"uv": [12, 11.995, 14.0025, 16], "texture": "#0"}, + "down": {"uv": [7, 8, 7.5025, 12.005], "texture": "#0"} } }, { "from": [0.97, -0.03, -12.03], "to": [5.03, 16.03, 4.03], "faces": { - "south": {"uv": [1, 7.995, 0, 11.995], "texture": "#1"}, - "west": {"uv": [4, 11.995, 8, 15.995], "texture": "#1"} + "south": {"uv": [1, 8, 0, 12], "texture": "#1"}, + "west": {"uv": [4, 12, 8, 16], "texture": "#1"} } }, { @@ -31,8 +31,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"}, - "west": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"} + "east": {"uv": [2, 4, 4, 8], "texture": "#0"}, + "west": {"uv": [0, 4, 2, 8], "texture": "#0"} } }, { @@ -46,4 +46,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_left_unlocked.json b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_left_unlocked.json index 36251aa8..8c856280 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_left_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_left_unlocked.json @@ -23,8 +23,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"}, - "west": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"} + "east": {"uv": [2, 4, 4, 8], "texture": "#0"}, + "west": {"uv": [0, 4, 2, 8], "texture": "#0"} } }, { @@ -41,9 +41,9 @@ "from": [1, 0, 0], "to": [5, 16, 16], "faces": { - "south": {"uv": [0.992, 8.008, 0.008, 11.992], "texture": "#2", "cullface": "north"}, - "west": {"uv": [4.008, 12.008, 7.992, 15.992], "texture": "#2"} + "south": {"uv": [1, 8, 0, 12], "texture": "#2", "cullface": "north"}, + "west": {"uv": [4, 12, 8, 16], "texture": "#2"} } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_right.json b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_right.json index 0c3411ae..573c0e66 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_right.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_right.json @@ -30,8 +30,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"}, - "west": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"} + "east": {"uv": [0, 4, 2, 8], "texture": "#0"}, + "west": {"uv": [2, 4, 4, 8], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_right_open.json b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_right_open.json index 8d37bff5..703ffe41 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_right_open.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_right_open.json @@ -11,27 +11,27 @@ "from": [0.99, -0.01, 11.99], "to": [5.01, 16.01, 28.01], "faces": { - "north": {"uv": [5.5, 11.99, 6.0025, 15.995], "texture": "#0", "cullface": "north"}, - "east": {"uv": [8, 11.995, 10.0025, 16], "texture": "#0"}, - "south": {"uv": [7, 11.99, 7.5025, 15.995], "texture": "#0", "cullface": "south"}, - "west": {"uv": [13.9975, 11.99, 16, 15.995], "texture": "#0"}, - "down": {"uv": [7, 7.995, 7.5025, 12], "texture": "#0", "cullface": "down"} + "north": {"uv": [5.5, 12, 6, 16], "texture": "#0", "cullface": "north"}, + "east": {"uv": [8, 12, 10, 16], "texture": "#0"}, + "south": {"uv": [7, 12, 7.5, 16], "texture": "#0", "cullface": "south"}, + "west": {"uv": [14, 12, 16, 16], "texture": "#0"}, + "down": {"uv": [7, 8, 7.5, 12], "texture": "#0", "cullface": "down"} } }, { "from": [0.98, -0.02, 11.98], "to": [5.02, 16.02, 28.02], "faces": { - "north": {"uv": [0, 11.995, 1, 15.995], "texture": "#1"}, - "west": {"uv": [8, 11.995, 12, 15.995], "texture": "#1"} + "north": {"uv": [0, 12, 1, 16], "texture": "#1"}, + "west": {"uv": [8, 12, 12, 16], "texture": "#1"} } }, { "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"}, - "west": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"} + "east": {"uv": [0, 4, 2, 8], "texture": "#0"}, + "west": {"uv": [2, 4, 4, 8], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_right_unlocked.json b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_right_unlocked.json index e29c8bbc..ef24327d 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_right_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_bottom_right_unlocked.json @@ -30,8 +30,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 3.995, 2.0025, 8], "texture": "#0"}, - "west": {"uv": [2, 3.995, 4.0025, 8], "texture": "#0"} + "east": {"uv": [0, 4, 2, 8], "texture": "#0"}, + "west": {"uv": [2, 4, 4, 8], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_left.json b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_left.json index 7dcfb32c..649bc5ca 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_left.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_left.json @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 0, 4.0025, 4.005], "texture": "#0"}, - "west": {"uv": [0, 0, 2.0025, 4.005], "texture": "#0"} + "east": {"uv": [2, 0, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 4], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_left_open.json b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_left_open.json index 07037e3a..8893a0ab 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_left_open.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_left_open.json @@ -10,11 +10,11 @@ "from": [0.99, -0.01, -12.01], "to": [5.01, 16.01, 4.01], "faces": { - "north": {"uv": [7, 7.995, 7.5025, 12], "texture": "#0"}, - "east": {"uv": [10.0025, 7.995, 8, 12], "texture": "#0"}, - "south": {"uv": [7.0025, 7.995, 6.5, 12], "texture": "#0"}, - "west": {"uv": [8, 7.995, 10.0025, 12], "texture": "#0"}, - "up": {"uv": [7, 11.995, 7.5025, 16], "texture": "#0"} + "north": {"uv": [7, 8, 7.5, 12], "texture": "#0"}, + "east": {"uv": [10, 8, 8, 12], "texture": "#0"}, + "south": {"uv": [7, 8, 6.5, 12], "texture": "#0"}, + "west": {"uv": [8, 8, 10, 12], "texture": "#0"}, + "up": {"uv": [7, 12, 7.5, 16], "texture": "#0"} } }, { @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 0, 4.0025, 4.005], "texture": "#0"}, - "west": {"uv": [0, 0, 2.0025, 4.005], "texture": "#0"} + "east": {"uv": [2, 0, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 4], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_left_unlocked.json b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_left_unlocked.json index 7dcfb32c..649bc5ca 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_left_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_left_unlocked.json @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 0, 4.0025, 4.005], "texture": "#0"}, - "west": {"uv": [0, 0, 2.0025, 4.005], "texture": "#0"} + "east": {"uv": [2, 0, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 4], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_right.json b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_right.json index 61058335..23bae515 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_right.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_right.json @@ -30,8 +30,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 0, 2.0025, 4.005], "texture": "#0"}, - "west": {"uv": [2, 0, 4.0025, 4.005], "texture": "#0"} + "east": {"uv": [0, 0, 2, 4], "texture": "#0"}, + "west": {"uv": [2, 0, 4, 4], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_right_open.json b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_right_open.json index bddbe571..c5a81554 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_right_open.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_right_open.json @@ -11,27 +11,27 @@ "from": [0.99, -0.01, 11.99], "to": [5.01, 16.01, 28.01], "faces": { - "north": {"uv": [6, 7.995, 6.5025, 12], "texture": "#0"}, - "east": {"uv": [11.9975, 7.995, 14, 12], "texture": "#0"}, - "south": {"uv": [7, 7.995, 7.5025, 12], "texture": "#0"}, - "west": {"uv": [13.9975, 7.995, 16, 12], "texture": "#0"}, - "up": {"uv": [7, 11.995, 7.5025, 16], "texture": "#0"} + "north": {"uv": [6, 8, 6.5, 12], "texture": "#0"}, + "east": {"uv": [12, 8, 14, 12], "texture": "#0"}, + "south": {"uv": [7, 8, 7.5, 12], "texture": "#0"}, + "west": {"uv": [14, 8, 16, 12], "texture": "#0"}, + "up": {"uv": [7, 12, 7.5, 16], "texture": "#0"} } }, { "from": [0.98, -0.02, 11.98], "to": [5.02, 16.02, 28.02], "faces": { - "north": {"uv": [1, 8, 2.01, 12.01], "texture": "#1"}, - "west": {"uv": [11.99, 7.995, 16, 12.005], "texture": "#1"} + "north": {"uv": [1, 8, 2, 12], "texture": "#1"}, + "west": {"uv": [12, 8, 16, 12], "texture": "#1"} } }, { "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 0, 2.0025, 4.005], "texture": "#0"}, - "west": {"uv": [2, 0, 4.0025, 4.005], "texture": "#0"} + "east": {"uv": [0, 0, 2, 4], "texture": "#0"}, + "west": {"uv": [2, 0, 4, 4], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_right_unlocked.json b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_right_unlocked.json index 76ea509c..301afe1c 100644 --- a/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_right_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/gray_octopus_chamber_door_top_right_unlocked.json @@ -30,8 +30,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 0, 2.0025, 4.005], "texture": "#0"}, - "west": {"uv": [2, 0, 4.0025, 4.005], "texture": "#0"} + "east": {"uv": [0, 0, 2, 4], "texture": "#0"}, + "west": {"uv": [2, 0, 4, 4], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_left.json b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_left.json index dda6cd70..11d65932 100644 --- a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_left.json +++ b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_left.json @@ -39,9 +39,9 @@ "to": [0, 0, 0], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [11.992, 15.992, 8.008, 12.008], "texture": "#0"}, - "west": {"uv": [8.008, 15.992, 11.992, 12.008], "texture": "#0"} + "east": {"uv": [12, 16, 8, 12], "texture": "#0"}, + "west": {"uv": [8, 16, 12, 12], "texture": "#0"} } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_left_open.json b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_left_open.json index 13f34d20..c8c645ba 100644 --- a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_left_open.json +++ b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_left_open.json @@ -21,7 +21,7 @@ "from": [0.95, 4.99, 1.99], "to": [0.97, 16.01, 8.01], "faces": { - "west": {"uv": [13, 13.245, 14.505, 16], "texture": "#0"} + "west": {"uv": [13, 13.25, 14.5, 16], "texture": "#0"} } }, { @@ -39,9 +39,9 @@ "to": [0, 0, 0], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [11.992, 15.992, 8.008, 12.008], "texture": "#0"}, - "west": {"uv": [8.008, 15.992, 11.992, 12.008], "texture": "#0"} + "east": {"uv": [12, 16, 8, 12], "texture": "#0"}, + "west": {"uv": [8, 16, 12, 12], "texture": "#0"} } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_right.json b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_right.json index 4877baf6..45ebeeb4 100644 --- a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_right.json +++ b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_right.json @@ -37,9 +37,9 @@ "from": [6, 16, 16], "to": [0, 0, 0], "faces": { - "east": {"uv": [8.008, 15.992, 11.992, 12.008], "texture": "#0"}, - "west": {"uv": [11.992, 15.992, 8.008, 12.008], "texture": "#0"} + "east": {"uv": [8, 16, 12, 12], "texture": "#0"}, + "west": {"uv": [12, 16, 8, 12], "texture": "#0"} } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_right_open.json b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_right_open.json index e1b6860d..be2e2aa6 100644 --- a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_right_open.json +++ b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_bottom_right_open.json @@ -21,7 +21,7 @@ "from": [0.95, 4.99, 7.99], "to": [0.97, 16.01, 14.01], "faces": { - "west": {"uv": [14.495, 13.245, 16, 16], "texture": "#0"} + "west": {"uv": [14.5, 13.25, 16, 16], "texture": "#0"} } }, { @@ -37,9 +37,9 @@ "from": [6, 16, 16], "to": [0, 0, 0], "faces": { - "east": {"uv": [8.008, 15.992, 11.992, 12.008], "texture": "#0"}, - "west": {"uv": [11.992, 15.992, 8.008, 12.008], "texture": "#0"} + "east": {"uv": [8, 16, 12, 12], "texture": "#0"}, + "west": {"uv": [12, 16, 8, 12], "texture": "#0"} } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_left.json b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_left.json index 9f49c0b4..7e726a0e 100644 --- a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_left.json +++ b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_left.json @@ -21,7 +21,7 @@ "from": [0.95, 0, 10], "to": [0.95, 1, 16], "faces": { - "west": {"uv": [14.5, 13, 13, 13.25], "texture": "#0"} + "west": {"uv": [13, 13, 14.5, 13.25], "texture": "#0"} } }, { @@ -39,9 +39,9 @@ "to": [0, 0, 0], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [11.992, 11.992, 8.008, 8.008], "texture": "#0"}, - "west": {"uv": [8.008, 11.992, 11.992, 8.008], "texture": "#0"} + "east": {"uv": [12, 12, 8, 8], "texture": "#0"}, + "west": {"uv": [8, 12, 12, 8], "texture": "#0"} } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_left_open.json b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_left_open.json index 97b5ab30..7fd209c8 100644 --- a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_left_open.json +++ b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_left_open.json @@ -21,7 +21,7 @@ "from": [0.95, -0.01, 1.99], "to": [0.97, 1.01, 8.01], "faces": { - "west": {"uv": [14.505, 13, 13, 13.255], "texture": "#0"} + "west": {"uv": [13, 13, 14.5, 13.25], "texture": "#0"} } }, { @@ -39,9 +39,9 @@ "to": [0, 0, 0], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [11.992, 11.992, 8.008, 8.008], "texture": "#0"}, - "west": {"uv": [8.008, 11.992, 11.992, 8.008], "texture": "#0"} + "east": {"uv": [12, 12, 8, 8], "texture": "#0"}, + "west": {"uv": [8, 12, 12, 8], "texture": "#0"} } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_right.json b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_right.json index 4af025f5..a5bbe441 100644 --- a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_right.json +++ b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_right.json @@ -37,9 +37,9 @@ "from": [6, 16, 16], "to": [0, 0, 0], "faces": { - "east": {"uv": [8.008, 11.992, 11.992, 8.008], "texture": "#0"}, - "west": {"uv": [11.992, 11.992, 8.008, 8.008], "texture": "#0"} + "east": {"uv": [8, 12, 12, 8], "texture": "#0"}, + "west": {"uv": [12, 12, 8, 8], "texture": "#0"} } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_right_open.json b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_right_open.json index e87874c8..5c985a53 100644 --- a/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_right_open.json +++ b/src/main/resources/assets/portalcubed/models/block/old_ap_chamber_door_top_right_open.json @@ -21,7 +21,7 @@ "from": [0.95, -0.01, 7.99], "to": [0.97, 1.01, 14.01], "faces": { - "west": {"uv": [14.495, 13, 16, 13.255], "texture": "#0"} + "west": {"uv": [14.5, 13, 16, 13.25], "texture": "#0"} } }, { @@ -37,9 +37,9 @@ "from": [6, 16, 16], "to": [0, 0, 0], "faces": { - "east": {"uv": [8.008, 11.992, 11.992, 8.008], "texture": "#0"}, - "west": {"uv": [11.992, 11.992, 8.008, 8.008], "texture": "#0"} + "east": {"uv": [8, 12, 12, 8], "texture": "#0"}, + "west": {"uv": [12, 12, 8, 8], "texture": "#0"} } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/small_signage_bottom_left.json b/src/main/resources/assets/portalcubed/models/block/small_signage_bottom_left.json index 43799a0b..c9f6475c 100644 --- a/src/main/resources/assets/portalcubed/models/block/small_signage_bottom_left.json +++ b/src/main/resources/assets/portalcubed/models/block/small_signage_bottom_left.json @@ -2,7 +2,7 @@ "credit": "Made by Cart3r using Blockbench.", "textures": { "0": "portalcubed:signage/small_signage_blank", - "particle": "portalcubed:signage/small_signage_blank", + "particle": "portalcubed:signage/large_signage_blank", "signage_bottom_left": "#portalcubed:dynamic" }, "elements": [ diff --git a/src/main/resources/assets/portalcubed/models/block/small_signage_bottom_right.json b/src/main/resources/assets/portalcubed/models/block/small_signage_bottom_right.json index dbff71bc..149e8dff 100644 --- a/src/main/resources/assets/portalcubed/models/block/small_signage_bottom_right.json +++ b/src/main/resources/assets/portalcubed/models/block/small_signage_bottom_right.json @@ -2,7 +2,7 @@ "credit": "Made by Cart3r using Blockbench.", "textures": { "0": "portalcubed:signage/small_signage_blank", - "particle": "portalcubed:signage/small_signage_blank", + "particle": "portalcubed:signage/large_signage_blank", "signage_bottom_right": "#portalcubed:dynamic" }, "elements": [ diff --git a/src/main/resources/assets/portalcubed/models/block/small_signage_top_left.json b/src/main/resources/assets/portalcubed/models/block/small_signage_top_left.json index 9d08abff..36bd8df1 100644 --- a/src/main/resources/assets/portalcubed/models/block/small_signage_top_left.json +++ b/src/main/resources/assets/portalcubed/models/block/small_signage_top_left.json @@ -2,7 +2,7 @@ "credit": "Made by Cart3r using Blockbench.", "textures": { "0": "portalcubed:signage/small_signage_blank", - "particle": "portalcubed:signage/small_signage_blank", + "particle": "portalcubed:signage/large_signage_blank", "signage_top_left": "#portalcubed:dynamic" }, "elements": [ diff --git a/src/main/resources/assets/portalcubed/models/block/small_signage_top_right.json b/src/main/resources/assets/portalcubed/models/block/small_signage_top_right.json index 39640567..3e697979 100644 --- a/src/main/resources/assets/portalcubed/models/block/small_signage_top_right.json +++ b/src/main/resources/assets/portalcubed/models/block/small_signage_top_right.json @@ -2,7 +2,7 @@ "credit": "Made by Cart3r using Blockbench.", "textures": { "0": "portalcubed:signage/small_signage_blank", - "particle": "portalcubed:signage/small_signage_blank", + "particle": "portalcubed:signage/large_signage_blank", "signage_top_right": "#portalcubed:dynamic" }, "elements": [ diff --git a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_left.json b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_left.json index 3a825e24..799964fa 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_left.json +++ b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_left.json @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 11.995, 4.0025, 16], "texture": "#0"}, - "west": {"uv": [0, 11.995, 2.0025, 16], "texture": "#0"} + "east": {"uv": [2, 12, 4, 16], "texture": "#0"}, + "west": {"uv": [0, 12, 2, 16], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_left_open.json b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_left_open.json index 8377ff33..c7c1ae47 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_left_open.json +++ b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_left_open.json @@ -11,11 +11,11 @@ "from": [0.99, -0.01, -12.01], "to": [5.01, 16.01, 4.01], "faces": { - "north": {"uv": [7, 3.995, 7.5025, 8], "texture": "#0"}, - "east": {"uv": [10.0025, 4, 8, 8.005], "texture": "#0"}, - "south": {"uv": [6.0025, 0, 5.5, 4.005], "texture": "#0"}, - "west": {"uv": [12, 3.995, 14.0025, 8], "texture": "#0"}, - "down": {"uv": [7, 0, 7.5025, 4.005], "texture": "#0"} + "north": {"uv": [7, 4, 7.5, 8], "texture": "#0"}, + "east": {"uv": [10, 4, 8, 8], "texture": "#0"}, + "south": {"uv": [6, 0, 5.5, 4], "texture": "#0"}, + "west": {"uv": [12, 4, 14, 8], "texture": "#0"}, + "down": {"uv": [7, 0, 7.5, 4], "texture": "#0"} } }, { @@ -31,8 +31,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 11.995, 4.0025, 16], "texture": "#0"}, - "west": {"uv": [0, 11.995, 2.0025, 16], "texture": "#0"} + "east": {"uv": [2, 12, 4, 16], "texture": "#0"}, + "west": {"uv": [0, 12, 2, 16], "texture": "#0"} } }, { @@ -46,4 +46,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_left_unlocked.json b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_left_unlocked.json index bb4e870f..7454e9c6 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_left_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_left_unlocked.json @@ -23,8 +23,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 11.995, 4.0025, 16], "texture": "#0"}, - "west": {"uv": [0, 11.995, 2.0025, 16], "texture": "#0"} + "east": {"uv": [2, 12, 4, 16], "texture": "#0"}, + "west": {"uv": [0, 12, 2, 16], "texture": "#0"} } }, { @@ -41,9 +41,9 @@ "from": [1, 0, 0], "to": [5, 16, 16], "faces": { - "south": {"uv": [0.992, 0.008, 0.008, 3.992], "texture": "#2", "cullface": "north"}, - "west": {"uv": [4.008, 4.008, 7.992, 7.992], "texture": "#2"} + "south": {"uv": [1, 0, 0, 4], "texture": "#2", "cullface": "north"}, + "west": {"uv": [4, 4, 8, 8], "texture": "#2"} } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_right.json b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_right.json index 926f3c58..31d982b6 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_right.json +++ b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_right.json @@ -30,8 +30,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 11.995, 2.0025, 16], "texture": "#0"}, - "west": {"uv": [2, 11.995, 4.0025, 16], "texture": "#0"} + "east": {"uv": [0, 12, 2, 15.995], "texture": "#0"}, + "west": {"uv": [2, 12, 4, 15.995], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_right_open.json b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_right_open.json index 338f61a5..f8ac4c8f 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_right_open.json +++ b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_right_open.json @@ -11,11 +11,11 @@ "from": [0.99, -0.01, 11.99], "to": [5.01, 16.01, 28.01], "faces": { - "north": {"uv": [5.5, 3.995, 6.0025, 8], "texture": "#0", "cullface": "north"}, - "east": {"uv": [8, 4, 10.0025, 8.005], "texture": "#0"}, - "south": {"uv": [7, 3.995, 7.5025, 8], "texture": "#0", "cullface": "south"}, - "west": {"uv": [13.9975, 3.995, 16, 8], "texture": "#0"}, - "down": {"uv": [7, 0, 7.5025, 4.005], "texture": "#0", "cullface": "down"} + "north": {"uv": [5.5, 4, 6, 8], "texture": "#0", "cullface": "north"}, + "east": {"uv": [8, 4, 10, 8], "texture": "#0"}, + "south": {"uv": [7, 4, 7.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [14, 4, 16, 8], "texture": "#0"}, + "down": {"uv": [7, 0, 7.5, 4], "texture": "#0", "cullface": "down"} } }, { @@ -30,8 +30,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 11.995, 2.0025, 16], "texture": "#0"}, - "west": {"uv": [2, 11.995, 4.0025, 16], "texture": "#0"} + "east": {"uv": [0, 12, 2, 16], "texture": "#0"}, + "west": {"uv": [2, 12, 4, 16], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_right_unlocked.json b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_right_unlocked.json index 64bd69a8..344e928b 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_right_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_bottom_right_unlocked.json @@ -30,8 +30,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 11.995, 2.0025, 16], "texture": "#0"}, - "west": {"uv": [2, 11.995, 4.0025, 16], "texture": "#0"} + "east": {"uv": [0, 12, 2, 16], "texture": "#0"}, + "west": {"uv": [2, 12, 4, 16], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_left.json b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_left.json index d0b4e439..f84d83ab 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_left.json +++ b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_left.json @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 8, 4.0025, 12.005], "texture": "#0"}, - "west": {"uv": [0, 8, 2.0025, 12.005], "texture": "#0"} + "east": {"uv": [2, 8, 4, 12], "texture": "#0"}, + "west": {"uv": [0, 8, 2, 12], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_left_open.json b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_left_open.json index 7708e88d..f5ebc3b0 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_left_open.json +++ b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_left_open.json @@ -10,11 +10,11 @@ "from": [0.99, -0.01, -12.01], "to": [5.01, 16.01, 4.01], "faces": { - "north": {"uv": [7, 0, 7.5025, 4.005], "texture": "#0"}, - "east": {"uv": [10.0025, 0, 8, 4.005], "texture": "#0"}, - "south": {"uv": [7.0025, 0, 6.5, 4.005], "texture": "#0"}, - "west": {"uv": [8, 0, 10.0025, 4.005], "texture": "#0"}, - "up": {"uv": [7, 4, 7.5025, 8.005], "texture": "#0"} + "north": {"uv": [7, 0, 7.5, 4], "texture": "#0"}, + "east": {"uv": [10, 0, 8, 4], "texture": "#0"}, + "south": {"uv": [7, 0, 6.5, 4], "texture": "#0"}, + "west": {"uv": [8, 0, 10, 4], "texture": "#0"}, + "up": {"uv": [7, 4, 7.5, 8], "texture": "#0"} } }, { @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 8, 4.0025, 12.005], "texture": "#0"}, - "west": {"uv": [0, 8, 2.0025, 12.005], "texture": "#0"} + "east": {"uv": [2, 8, 4, 12], "texture": "#0"}, + "west": {"uv": [0, 8, 2, 12], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_left_unlocked.json b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_left_unlocked.json index b4b4362b..232bd0a8 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_left_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_left_unlocked.json @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 8, 4.0025, 12.005], "texture": "#0"}, - "west": {"uv": [0, 8, 2.0025, 12.005], "texture": "#0"} + "east": {"uv": [2, 8, 4, 12], "texture": "#0"}, + "west": {"uv": [0, 8, 2, 12], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_right.json b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_right.json index 0da31edf..8be3ca14 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_right.json +++ b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_right.json @@ -29,8 +29,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 8, 2.0025, 12.005], "texture": "#0"}, - "west": {"uv": [2, 8, 4.0025, 12.005], "texture": "#0"} + "east": {"uv": [0, 8, 2, 12], "texture": "#0"}, + "west": {"uv": [2, 8, 4, 12], "texture": "#0"} } }, { @@ -43,4 +43,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_right_open.json b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_right_open.json index bf37cd71..cd9b6921 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_right_open.json +++ b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_right_open.json @@ -11,26 +11,26 @@ "from": [0.99, -0.01, 11.99], "to": [5.01, 16.01, 28.01], "faces": { - "north": {"uv": [6, 0, 6.5025, 4.005], "texture": "#0"}, - "east": {"uv": [11.9975, 0, 14, 4.005], "texture": "#0"}, - "south": {"uv": [7, 0, 7.5025, 4.005], "texture": "#0"}, - "west": {"uv": [13.9975, 0, 16, 4.005], "texture": "#0"}, - "up": {"uv": [7, 4, 7.5025, 8.005], "texture": "#0"} + "north": {"uv": [6, 0, 6.5, 4], "texture": "#0"}, + "east": {"uv": [12, 0, 14, 4], "texture": "#0"}, + "south": {"uv": [7, 0, 7.5, 4], "texture": "#0"}, + "west": {"uv": [14, 0, 16, 4], "texture": "#0"}, + "up": {"uv": [7, 4, 7.5, 8], "texture": "#0"} } }, { "from": [0.98, -0.02, 11.98], "to": [5.02, 16.02, 28.02], "faces": { - "west": {"uv": [11.99, 0, 16, 4.01], "texture": "#1"} + "west": {"uv": [12, 0, 16, 4], "texture": "#1"} } }, { "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 8, 2.0025, 12.005], "texture": "#0"}, - "west": {"uv": [2, 8, 4.0025, 12.005], "texture": "#0"} + "east": {"uv": [0, 8, 2, 12], "texture": "#0"}, + "west": {"uv": [2, 8, 4, 12], "texture": "#0"} } }, { @@ -43,4 +43,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_right_unlocked.json b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_right_unlocked.json index 6bc91890..f30f7675 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_right_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/white_chamber_door_top_right_unlocked.json @@ -29,8 +29,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 8, 2.0025, 12.005], "texture": "#0"}, - "west": {"uv": [2, 8, 4.0025, 12.005], "texture": "#0"} + "east": {"uv": [0, 8, 2, 12], "texture": "#0"}, + "west": {"uv": [2, 8, 4, 12], "texture": "#0"} } }, { @@ -43,4 +43,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_left.json b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_left.json index d3438485..0f31ac5f 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_left.json +++ b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_left.json @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 11.995, 4.0025, 16], "texture": "#0"}, - "west": {"uv": [0, 11.995, 2.0025, 16], "texture": "#0"} + "east": {"uv": [2, 12, 4, 16], "texture": "#0"}, + "west": {"uv": [0, 12, 2, 16], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_left_open.json b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_left_open.json index 7af9b5e4..0ae0d03a 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_left_open.json +++ b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_left_open.json @@ -11,19 +11,19 @@ "from": [0.99, -0.01, -12.01], "to": [5.01, 16.01, 4.01], "faces": { - "north": {"uv": [7, 11.99, 7.5025, 15.995], "texture": "#0"}, - "east": {"uv": [10.0025, 11.995, 8, 16], "texture": "#0"}, - "south": {"uv": [6.0025, 7.995, 5.5, 12], "texture": "#0"}, - "west": {"uv": [12, 11.99, 14.0025, 15.995], "texture": "#0"}, - "down": {"uv": [7, 7.995, 7.5025, 12], "texture": "#0"} + "north": {"uv": [7, 12, 7.5, 16], "texture": "#0"}, + "east": {"uv": [10, 12, 8, 16], "texture": "#0"}, + "south": {"uv": [6, 8, 5.5, 12], "texture": "#0"}, + "west": {"uv": [12, 12, 14, 16], "texture": "#0"}, + "down": {"uv": [7, 8, 7.5, 12], "texture": "#0"} } }, { "from": [0.97, -0.03, -12.03], "to": [5.03, 16.03, 4.03], "faces": { - "south": {"uv": [1, 7.995, 0, 11.995], "texture": "#1"}, - "west": {"uv": [4, 11.995, 8, 15.995], "texture": "#1"} + "south": {"uv": [1, 8, 0, 12], "texture": "#1"}, + "west": {"uv": [4, 12, 8, 16], "texture": "#1"} } }, { @@ -31,8 +31,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 11.995, 4.0025, 16], "texture": "#0"}, - "west": {"uv": [0, 11.995, 2.0025, 16], "texture": "#0"} + "east": {"uv": [2, 12, 4, 16], "texture": "#0"}, + "west": {"uv": [0, 12, 2, 16], "texture": "#0"} } }, { @@ -46,4 +46,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_left_unlocked.json b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_left_unlocked.json index ece143e9..4a01b68f 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_left_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_left_unlocked.json @@ -23,8 +23,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 11.995, 4.0025, 16], "texture": "#0"}, - "west": {"uv": [0, 11.995, 2.0025, 16], "texture": "#0"} + "east": {"uv": [2, 12, 4, 16], "texture": "#0"}, + "west": {"uv": [0, 12, 2, 16], "texture": "#0"} } }, { @@ -41,9 +41,9 @@ "from": [1, 0, 0], "to": [5, 16, 16], "faces": { - "south": {"uv": [0.992, 8.008, 0.008, 11.992], "texture": "#2", "cullface": "north"}, - "west": {"uv": [4.008, 12.008, 7.992, 15.992], "texture": "#2"} + "south": {"uv": [1, 8, 0, 12], "texture": "#2", "cullface": "north"}, + "west": {"uv": [4, 12, 8, 16], "texture": "#2"} } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_right.json b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_right.json index ac48e328..ef5c4352 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_right.json +++ b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_right.json @@ -30,8 +30,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 11.995, 2.0025, 16], "texture": "#0"}, - "west": {"uv": [2, 11.995, 4.0025, 16], "texture": "#0"} + "east": {"uv": [0, 12, 2, 16], "texture": "#0"}, + "west": {"uv": [2, 12, 4, 16], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_right_open.json b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_right_open.json index a98f1935..0bd04389 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_right_open.json +++ b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_right_open.json @@ -11,27 +11,27 @@ "from": [0.99, -0.01, 11.99], "to": [5.01, 16.01, 28.01], "faces": { - "north": {"uv": [5.5, 11.99, 6.0025, 15.995], "texture": "#0", "cullface": "north"}, - "east": {"uv": [8, 11.995, 10.0025, 16], "texture": "#0"}, - "south": {"uv": [7, 11.99, 7.5025, 15.995], "texture": "#0", "cullface": "south"}, - "west": {"uv": [13.9975, 11.99, 16, 15.995], "texture": "#0"}, - "down": {"uv": [7, 7.995, 7.5025, 12], "texture": "#0", "cullface": "down"} + "north": {"uv": [5.5, 12, 6, 16], "texture": "#0", "cullface": "north"}, + "east": {"uv": [8, 12, 10, 16], "texture": "#0"}, + "south": {"uv": [7, 12, 7.5, 16], "texture": "#0", "cullface": "south"}, + "west": {"uv": [14, 12, 16, 16], "texture": "#0"}, + "down": {"uv": [7, 8, 7.5, 12], "texture": "#0", "cullface": "down"} } }, { "from": [0.98, -0.02, 11.98], "to": [5.02, 16.02, 28.02], "faces": { - "north": {"uv": [0, 11.995, 1, 15.995], "texture": "#1"}, - "west": {"uv": [8, 11.995, 12, 15.995], "texture": "#1"} + "north": {"uv": [0, 12, 1, 16], "texture": "#1"}, + "west": {"uv": [8, 12, 12, 16], "texture": "#1"} } }, { "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 11.995, 2.0025, 16], "texture": "#0"}, - "west": {"uv": [2, 11.995, 4.0025, 16], "texture": "#0"} + "east": {"uv": [0, 12, 2, 16], "texture": "#0"}, + "west": {"uv": [2, 12, 4, 16], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_right_unlocked.json b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_right_unlocked.json index e28e9ddd..ac6be2c7 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_right_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_bottom_right_unlocked.json @@ -30,8 +30,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 11.995, 2.0025, 16], "texture": "#0"}, - "west": {"uv": [2, 11.995, 4.0025, 16], "texture": "#0"} + "east": {"uv": [0, 12, 2, 16], "texture": "#0"}, + "west": {"uv": [2, 12, 4, 16], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_left.json b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_left.json index f0374074..f5a03652 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_left.json +++ b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_left.json @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 8, 4.0025, 12.005], "texture": "#0"}, - "west": {"uv": [0, 8, 2.0025, 12.005], "texture": "#0"} + "east": {"uv": [2, 8, 4, 12], "texture": "#0"}, + "west": {"uv": [0, 8, 2, 12], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_left_open.json b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_left_open.json index 48a80a34..f8d3dd73 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_left_open.json +++ b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_left_open.json @@ -10,11 +10,11 @@ "from": [0.99, -0.01, -12.01], "to": [5.01, 16.01, 4.01], "faces": { - "north": {"uv": [7, 8, 7.5025, 12.005], "texture": "#0"}, - "east": {"uv": [10.0025, 8, 8, 12.005], "texture": "#0"}, - "south": {"uv": [7.0025, 8, 6.5, 12.005], "texture": "#0"}, - "west": {"uv": [8, 8, 10.0025, 12.005], "texture": "#0"}, - "up": {"uv": [7, 11.995, 7.5025, 16], "texture": "#0"} + "north": {"uv": [7, 8, 7.5, 12], "texture": "#0"}, + "east": {"uv": [10, 8, 8, 12], "texture": "#0"}, + "south": {"uv": [7, 8, 6.5, 12], "texture": "#0"}, + "west": {"uv": [8, 8, 10, 12], "texture": "#0"}, + "up": {"uv": [7, 12, 7.5, 16], "texture": "#0"} } }, { @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 8, 4.0025, 12.005], "texture": "#0"}, - "west": {"uv": [0, 8, 2.0025, 12.005], "texture": "#0"} + "east": {"uv": [2, 8, 4, 12], "texture": "#0"}, + "west": {"uv": [0, 8, 2, 12], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_left_unlocked.json b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_left_unlocked.json index cc6318b1..07390f15 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_left_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_left_unlocked.json @@ -22,8 +22,8 @@ "to": [6.01, 16.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { - "east": {"uv": [2, 8, 4.0025, 12.005], "texture": "#0"}, - "west": {"uv": [0, 8, 2.0025, 12.005], "texture": "#0"} + "east": {"uv": [2, 8, 4, 12], "texture": "#0"}, + "west": {"uv": [0, 8, 2, 12], "texture": "#0"} } }, { @@ -37,4 +37,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_right.json b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_right.json index def3c126..da59cbcf 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_right.json +++ b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_right.json @@ -30,8 +30,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 8, 2.0025, 12.005], "texture": "#0"}, - "west": {"uv": [2, 8, 4.0025, 12.005], "texture": "#0"} + "east": {"uv": [0, 8, 2, 12], "texture": "#0"}, + "west": {"uv": [2, 8, 4, 12], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_right_open.json b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_right_open.json index 458d2a59..2392a3cc 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_right_open.json +++ b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_right_open.json @@ -11,27 +11,27 @@ "from": [0.99, -0.01, 11.99], "to": [5.01, 16.01, 28.01], "faces": { - "north": {"uv": [6, 7.995, 6.5025, 12], "texture": "#0"}, - "east": {"uv": [11.9975, 7.995, 14, 12], "texture": "#0"}, - "south": {"uv": [7, 7.995, 7.5025, 12], "texture": "#0"}, - "west": {"uv": [13.9975, 7.995, 16, 12], "texture": "#0"}, - "up": {"uv": [7, 11.995, 7.5025, 16], "texture": "#0"} + "north": {"uv": [6, 8, 6.5, 12], "texture": "#0"}, + "east": {"uv": [12, 8, 14, 12], "texture": "#0"}, + "south": {"uv": [7, 8, 7.5, 12], "texture": "#0"}, + "west": {"uv": [14, 8, 16, 12], "texture": "#0"}, + "up": {"uv": [7, 12, 7.5, 16], "texture": "#0"} } }, { "from": [0.98, -0.02, 11.98], "to": [5.02, 16.02, 28.02], "faces": { - "north": {"uv": [1, 8, 2.01, 12.01], "texture": "#1"}, - "west": {"uv": [11.99, 7.995, 16, 12.005], "texture": "#1"} + "north": {"uv": [1, 8, 2, 12], "texture": "#1"}, + "west": {"uv": [12, 8, 16, 12], "texture": "#1"} } }, { "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 8, 2.0025, 12.005], "texture": "#0"}, - "west": {"uv": [2, 8, 4.0025, 12.005], "texture": "#0"} + "east": {"uv": [0, 8, 2, 12], "texture": "#0"}, + "west": {"uv": [2, 8, 4, 12], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_right_unlocked.json b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_right_unlocked.json index d81bc2c6..b5989aad 100644 --- a/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_right_unlocked.json +++ b/src/main/resources/assets/portalcubed/models/block/white_octopus_chamber_door_top_right_unlocked.json @@ -30,8 +30,8 @@ "from": [-0.01, -0.01, -0.01], "to": [6.01, 16.01, 16.01], "faces": { - "east": {"uv": [0, 8, 2.0025, 12.005], "texture": "#0"}, - "west": {"uv": [2, 8, 4.0025, 12.005], "texture": "#0"} + "east": {"uv": [0, 8, 2, 12], "texture": "#0"}, + "west": {"uv": [2, 8, 4, 12], "texture": "#0"} } }, { @@ -44,4 +44,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/portalcubed/models/item/aperture_banner_pattern.json b/src/main/resources/assets/portalcubed/models/item/aperture_banner_pattern.json new file mode 100644 index 00000000..cf3b0a5f --- /dev/null +++ b/src/main/resources/assets/portalcubed/models/item/aperture_banner_pattern.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "portalcubed:item/aperture_banner_pattern" + } +} diff --git a/src/main/resources/assets/portalcubed/models/portal_gun/default/blueprint_portal_gun.json b/src/main/resources/assets/portalcubed/models/portal_gun/default/blueprint_portal_gun.json index 43d54ef2..0323c154 100644 --- a/src/main/resources/assets/portalcubed/models/portal_gun/default/blueprint_portal_gun.json +++ b/src/main/resources/assets/portalcubed/models/portal_gun/default/blueprint_portal_gun.json @@ -13,12 +13,12 @@ "to": [10.5, 5.5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1]}, "faces": { - "north": {"uv": [10.516, 9.516, 12.984, 11.984], "texture": "#0"}, - "east": {"uv": [9.984, 13.532, 6.516, 15.984], "texture": "#0"}, - "south": {"uv": [13.516, 13.516, 15.984, 15.984], "texture": "#0"}, - "west": {"uv": [6.516, 13.532, 9.984, 15.984], "texture": "#0"}, - "up": {"uv": [10.516, 15.984, 12.984, 12.516], "texture": "#0"}, - "down": {"uv": [13.516, 9.516, 15.984, 12.984], "texture": "#0"} + "north": {"uv": [10.516, 9.516, 12.984, 11.984], "texture": "#0", "tintindex": 1}, + "east": {"uv": [9.984, 13.532, 6.516, 15.984], "texture": "#0", "tintindex": 1}, + "south": {"uv": [13.516, 13.516, 15.984, 15.984], "texture": "#0", "tintindex": 1}, + "west": {"uv": [6.516, 13.532, 9.984, 15.984], "texture": "#0", "tintindex": 1}, + "up": {"uv": [10.516, 15.984, 12.984, 12.516], "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.516, 9.516, 15.984, 12.984], "texture": "#0", "tintindex": 1} } }, { @@ -27,11 +27,11 @@ "to": [10, 3, 9], "rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -2]}, "faces": { - "north": {"uv": [9.516, 8.016, 11.484, 8.984], "texture": "#0"}, - "east": {"uv": [15.984, 8.016, 12.016, 8.984], "texture": "#0"}, - "west": {"uv": [12.016, 8.016, 15.984, 8.984], "texture": "#0"}, - "up": {"uv": [5.984, 15.984, 4.016, 12.016], "texture": "#0"}, - "down": {"uv": [3.484, 15.984, 1.516, 12.016], "texture": "#0"} + "north": {"uv": [9.516, 8.016, 11.484, 8.984], "texture": "#0", "tintindex": 1}, + "east": {"uv": [15.984, 8.016, 12.016, 8.984], "texture": "#0", "tintindex": 1}, + "west": {"uv": [12.016, 8.016, 15.984, 8.984], "texture": "#0", "tintindex": 1}, + "up": {"uv": [5.984, 15.984, 4.016, 12.016], "texture": "#0", "tintindex": 1}, + "down": {"uv": [3.484, 15.984, 1.516, 12.016], "texture": "#0", "tintindex": 1} } }, { @@ -40,11 +40,11 @@ "to": [10, 5, 5], "rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1]}, "faces": { - "north": {"uv": [8.016, 11.016, 9.984, 11.984], "texture": "#0"}, - "east": {"uv": [7.016, 8.016, 8.984, 8.984], "texture": "#0"}, - "south": {"uv": [8.016, 9.516, 9.984, 10.484], "texture": "#0"}, - "west": {"uv": [7.016, 8.016, 8.984, 8.984], "texture": "#0"}, - "up": {"uv": [5.984, 11.484, 4.016, 9.516], "texture": "#0"} + "north": {"uv": [8.016, 11.016, 9.984, 11.984], "texture": "#0", "tintindex": 1}, + "east": {"uv": [7.016, 8.016, 8.984, 8.984], "texture": "#0", "tintindex": 1}, + "south": {"uv": [8.016, 9.516, 9.984, 10.484], "texture": "#0", "tintindex": 1}, + "west": {"uv": [7.016, 8.016, 8.984, 8.984], "texture": "#0", "tintindex": 1}, + "up": {"uv": [5.984, 11.484, 4.016, 9.516], "texture": "#0", "tintindex": 1} } }, { @@ -53,11 +53,11 @@ "to": [6.49, 2.365, -1.01], "rotation": {"angle": 45, "axis": "z", "origin": [8, 3.875, -0.45]}, "faces": { - "north": {"uv": [7.5, 12, 6.5, 11], "texture": "#0"}, - "east": {"uv": [6.5, 10.5, 7.5, 9.5], "texture": "#0"}, - "west": {"uv": [7.5, 10.5, 6.5, 9.5], "texture": "#0"}, - "up": {"uv": [7.5, 10.5, 6.5, 9.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [6.5, 10.5, 7.5, 9.5], "rotation": 90, "texture": "#0"} + "north": {"uv": [7.5, 12, 6.5, 11], "texture": "#0", "tintindex": 1}, + "east": {"uv": [6.5, 10.5, 7.5, 9.5], "texture": "#0", "tintindex": 1}, + "west": {"uv": [7.5, 10.5, 6.5, 9.5], "texture": "#0", "tintindex": 1}, + "up": {"uv": [7.5, 10.5, 6.5, 9.5], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [6.5, 10.5, 7.5, 9.5], "rotation": 90, "texture": "#0", "tintindex": 1} } }, { @@ -66,10 +66,10 @@ "to": [8.51, 4.385, 1.06], "rotation": {"angle": 45, "axis": "z", "origin": [8, 3.875, -0.45]}, "faces": { - "east": {"uv": [7.5, 9.5, 6.5, 10.5], "texture": "#0"}, - "west": {"uv": [6.5, 9.5, 7.5, 10.5], "texture": "#0"}, - "up": {"uv": [6.5, 9.5, 7.5, 10.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [7.5, 9.5, 6.5, 10.5], "rotation": 90, "texture": "#0"} + "east": {"uv": [7.5, 9.5, 6.5, 10.5], "texture": "#0", "tintindex": 1}, + "west": {"uv": [6.5, 9.5, 7.5, 10.5], "texture": "#0", "tintindex": 1}, + "up": {"uv": [6.5, 9.5, 7.5, 10.5], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [7.5, 9.5, 6.5, 10.5], "rotation": 90, "texture": "#0", "tintindex": 1} } }, { @@ -78,9 +78,9 @@ "to": [7.49, 0.49, 15.99], "rotation": {"angle": 0, "axis": "y", "origin": [0, 1, 6]}, "faces": { - "north": {"uv": [14.5, 2, 15, 0], "texture": "#0"}, - "up": {"uv": [16, 1, 15.5, 2], "texture": "#0"}, - "down": {"uv": [16, 0, 15.5, 1], "texture": "#0"} + "north": {"uv": [14.5, 2, 15, 0], "texture": "#0", "tintindex": 1}, + "up": {"uv": [16, 1, 15.5, 2], "texture": "#0", "tintindex": 1}, + "down": {"uv": [16, 0, 15.5, 1], "texture": "#0", "tintindex": 1} } }, { @@ -89,9 +89,9 @@ "to": [8.51, 4.51, 18.01], "rotation": {"angle": 0, "axis": "y", "origin": [0, 1, 6]}, "faces": { - "south": {"uv": [14.5, 0, 15, 2], "texture": "#0"}, - "up": {"uv": [15.5, 0, 16, 1], "texture": "#0"}, - "down": {"uv": [15.5, 1, 16, 2], "texture": "#0"} + "south": {"uv": [14.5, 0, 15, 2], "texture": "#0", "tintindex": 1}, + "up": {"uv": [15.5, 0, 16, 1], "texture": "#0", "tintindex": 1}, + "down": {"uv": [15.5, 1, 16, 2], "texture": "#0", "tintindex": 1} } }, { @@ -100,8 +100,8 @@ "to": [5.5, 2.575, 12], "rotation": {"angle": 22.5, "axis": "z", "origin": [6.5, 2.575, 5.5]}, "faces": { - "up": {"uv": [8, 2.5, 16, 4.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [16, 2.5, 8, 4.5], "rotation": 90, "texture": "#0"} + "up": {"uv": [8, 2.5, 16, 4.5], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [16, 2.5, 8, 4.5], "rotation": 90, "texture": "#0", "tintindex": 1} } }, { @@ -110,8 +110,8 @@ "to": [13.96492, 3.81711, 9.99], "rotation": {"angle": 45, "axis": "z", "origin": [7.96492, 0.81711, 5.49]}, "faces": { - "up": {"uv": [12, 5, 15.5, 7], "rotation": 90, "texture": "#0"}, - "down": {"uv": [15.5, 5, 12, 7], "rotation": 90, "texture": "#0"} + "up": {"uv": [12, 5, 15.5, 7], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [15.5, 5, 12, 7], "rotation": 90, "texture": "#0", "tintindex": 1} } }, { @@ -120,8 +120,8 @@ "to": [5, 3.075, -4], "rotation": {"angle": 22.5, "axis": "z", "origin": [6.5, 2.575, 5.5]}, "faces": { - "north": {"uv": [0.016, 12.016, 0.484, 13.484], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0.016, 13.484, 0.484, 12.016], "rotation": 90, "texture": "#0"} + "north": {"uv": [0.016, 12.016, 0.484, 13.484], "rotation": 90, "texture": "#0", "tintindex": 1}, + "south": {"uv": [0.016, 13.484, 0.484, 12.016], "rotation": 90, "texture": "#0", "tintindex": 1} } }, { @@ -130,8 +130,8 @@ "to": [14.5, 2.575, 12], "rotation": {"angle": -22.5, "axis": "z", "origin": [9.5, 2.575, 5.5]}, "faces": { - "up": {"uv": [8, 4.5, 16, 2.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [16, 4.5, 8, 2.5], "rotation": 90, "texture": "#0"} + "up": {"uv": [8, 4.5, 16, 2.5], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [16, 4.5, 8, 2.5], "rotation": 90, "texture": "#0", "tintindex": 1} } }, { @@ -140,8 +140,8 @@ "to": [7.999, 9.02125, 2.99], "rotation": {"angle": 0, "axis": "y", "origin": [7.9995, 4.54813, -2.2675]}, "faces": { - "east": {"uv": [11.5, 5, 8, 7], "texture": "#0"}, - "west": {"uv": [8, 5, 11.5, 7], "texture": "#0"} + "east": {"uv": [11.5, 5, 8, 7], "texture": "#0", "tintindex": 1}, + "west": {"uv": [8, 5, 11.5, 7], "texture": "#0", "tintindex": 1} } }, { @@ -150,8 +150,8 @@ "to": [14, 3.075, -4], "rotation": {"angle": -22.5, "axis": "z", "origin": [9.5, 2.575, 5.5]}, "faces": { - "north": {"uv": [0.016, 13.484, 0.484, 12.016], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0.016, 12.016, 0.484, 13.484], "rotation": 90, "texture": "#0"} + "north": {"uv": [0.016, 13.484, 0.484, 12.016], "rotation": 90, "texture": "#0", "tintindex": 1}, + "south": {"uv": [0.016, 12.016, 0.484, 13.484], "rotation": 90, "texture": "#0", "tintindex": 1} } }, { @@ -160,8 +160,8 @@ "to": [8.5, 8.575, -4.025], "rotation": {"angle": 0, "axis": "y", "origin": [7.9995, 4.54813, -2.2675]}, "faces": { - "north": {"uv": [0.016, 13.484, 0.484, 12.016], "rotation": 180, "texture": "#0"}, - "south": {"uv": [0.016, 12.016, 0.484, 13.484], "texture": "#0"} + "north": {"uv": [0.016, 13.484, 0.484, 12.016], "rotation": 180, "texture": "#0", "tintindex": 1}, + "south": {"uv": [0.016, 12.016, 0.484, 13.484], "texture": "#0", "tintindex": 1} } }, { @@ -170,11 +170,11 @@ "to": [4.98, 0.98, 8.48], "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 13]}, "faces": { - "north": {"uv": [2.984, 10.484, 0.016, 8.016], "texture": "#0"}, - "east": {"uv": [3.516, 2.468, 7.968, 0.016], "texture": "#0"}, - "south": {"uv": [0.016, 7.484, 2.984, 5.016], "texture": "#0"}, - "west": {"uv": [7.968, 2.468, 3.516, 0.016], "texture": "#0"}, - "down": {"uv": [2.984, 0.016, 0.016, 4.484], "texture": "#0"} + "north": {"uv": [2.984, 10.484, 0.016, 8.016], "texture": "#0", "tintindex": 1}, + "east": {"uv": [3.516, 2.468, 7.968, 0.016], "texture": "#0", "tintindex": 1}, + "south": {"uv": [0.016, 7.484, 2.984, 5.016], "texture": "#0", "tintindex": 1}, + "west": {"uv": [7.968, 2.468, 3.516, 0.016], "texture": "#0", "tintindex": 1}, + "down": {"uv": [2.984, 0.016, 0.016, 4.484], "texture": "#0", "tintindex": 1} } }, { @@ -183,11 +183,11 @@ "to": [11.02, 6.02, 17.52], "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 13]}, "faces": { - "north": {"uv": [0.016, 5.016, 2.984, 7.484], "texture": "#0"}, - "east": {"uv": [7.968, 0.016, 3.516, 2.468], "texture": "#0"}, - "south": {"uv": [2.984, 8.016, 0.016, 10.484], "texture": "#0"}, - "west": {"uv": [3.516, 0.016, 7.968, 2.468], "texture": "#0"}, - "up": {"uv": [0.016, 0.016, 2.984, 4.484], "texture": "#0"} + "north": {"uv": [0.016, 5.016, 2.984, 7.484], "texture": "#0", "tintindex": 1}, + "east": {"uv": [7.968, 0.016, 3.516, 2.468], "texture": "#0", "tintindex": 1}, + "south": {"uv": [2.984, 8.016, 0.016, 10.484], "texture": "#0", "tintindex": 1}, + "west": {"uv": [3.516, 0.016, 7.968, 2.468], "texture": "#0", "tintindex": 1}, + "up": {"uv": [0.016, 0.016, 2.984, 4.484], "texture": "#0", "tintindex": 1} } }, { @@ -196,11 +196,11 @@ "to": [10.51, 4.51, 7.01], "rotation": {"angle": 0, "axis": "y", "origin": [16, 1, -1.5]}, "faces": { - "north": {"uv": [10.984, 0.016, 8.516, 1.984], "texture": "#0"}, - "east": {"uv": [6.984, 3, 3.516, 4.968], "texture": "#0"}, - "south": {"uv": [13.984, 0.016, 11.516, 1.984], "texture": "#0"}, - "west": {"uv": [3.516, 3, 6.984, 4.968], "texture": "#0"}, - "down": {"uv": [5.984, 5.516, 3.532, 8.968], "texture": "#0"} + "north": {"uv": [10.984, 0.016, 8.516, 1.984], "texture": "#0", "tintindex": 1}, + "east": {"uv": [6.984, 3, 3.516, 4.968], "texture": "#0", "tintindex": 1}, + "south": {"uv": [13.984, 0.016, 11.516, 1.984], "texture": "#0", "tintindex": 1}, + "west": {"uv": [3.516, 3, 6.984, 4.968], "texture": "#0", "tintindex": 1}, + "down": {"uv": [5.984, 5.516, 3.532, 8.968], "texture": "#0", "tintindex": 1} } }, { @@ -209,11 +209,11 @@ "to": [5.49, 0.49, -0.01], "rotation": {"angle": 0, "axis": "y", "origin": [16, 1, -1.5]}, "faces": { - "north": {"uv": [13.984, 1.984, 11.516, 0.016], "texture": "#0"}, - "east": {"uv": [3.516, 4.968, 6.984, 3], "texture": "#0"}, - "south": {"uv": [10.984, 1.984, 8.516, 0.016], "texture": "#0"}, - "west": {"uv": [6.984, 4.968, 3.516, 3], "texture": "#0"}, - "up": {"uv": [3.532, 5.516, 5.984, 8.968], "texture": "#0"} + "north": {"uv": [13.984, 1.984, 11.516, 0.016], "texture": "#0", "tintindex": 1}, + "east": {"uv": [3.516, 4.968, 6.984, 3], "texture": "#0", "tintindex": 1}, + "south": {"uv": [10.984, 1.984, 8.516, 0.016], "texture": "#0", "tintindex": 1}, + "west": {"uv": [6.984, 4.968, 3.516, 3], "texture": "#0", "tintindex": 1}, + "up": {"uv": [3.532, 5.516, 5.984, 8.968], "texture": "#0", "tintindex": 1} } }, { @@ -222,10 +222,10 @@ "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": "#0"}, - "west": {"uv": [0, 15.968, 0.968, 14], "rotation": 90, "texture": "#0"}, - "up": {"uv": [10.516, 15, 12.516, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 14, 1, 16], "rotation": 180, "texture": "#0"} + "east": {"uv": [10.516, 15, 12.516, 16], "texture": "#0", "tintindex": 1}, + "west": {"uv": [0, 15.968, 0.968, 14], "rotation": 90, "texture": "#0", "tintindex": 1}, + "up": {"uv": [10.516, 15, 12.516, 16], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [0, 14, 1, 16], "rotation": 180, "texture": "#0", "tintindex": 1} } }, { @@ -984,4 +984,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/src/main/resources/assets/portalcubed/models/portal_gun/peashooter.json b/src/main/resources/assets/portalcubed/models/portal_gun/peashooter.json index 493db434..2ba1c12b 100644 --- a/src/main/resources/assets/portalcubed/models/portal_gun/peashooter.json +++ b/src/main/resources/assets/portalcubed/models/portal_gun/peashooter.json @@ -11,10 +11,10 @@ "to": [7.75, 8, 7.325], "rotation": {"angle": -45, "axis": "y", "origin": [5.33579, 6.25, 8.66079]}, "faces": { - "north": {"uv": [8.016, 6.032, 8.984, 13.968], "texture": "#0"}, - "east": {"uv": [8.016, 6.032, 8.984, 13.968], "texture": "#0"}, - "south": {"uv": [8.016, 6.032, 8.984, 13.968], "texture": "#0"}, - "west": {"uv": [8.016, 6.032, 8.984, 13.968], "texture": "#0"} + "north": {"uv": [8.016, 6.032, 8.984, 13.968], "texture": "#0", "tintindex": 1}, + "east": {"uv": [8.016, 6.032, 8.984, 13.968], "texture": "#0", "tintindex": 1}, + "south": {"uv": [8.016, 6.032, 8.984, 13.968], "texture": "#0", "tintindex": 1}, + "west": {"uv": [8.016, 6.032, 8.984, 13.968], "texture": "#0", "tintindex": 1} } }, { @@ -22,8 +22,8 @@ "to": [9.48744, 0, 9.50914], "rotation": {"angle": 0, "axis": "y", "origin": [7.98744, 0, 8.00914]}, "faces": { - "up": {"uv": [8.016, 0.032, 9.484, 3], "texture": "#0"}, - "down": {"uv": [8.016, 0.032, 9.484, 3], "texture": "#0"} + "up": {"uv": [8.016, 0.032, 9.484, 3], "texture": "#0", "tintindex": 1}, + "down": {"uv": [8.016, 0.032, 9.484, 3], "texture": "#0", "tintindex": 1} } }, { @@ -31,12 +31,28 @@ "to": [10.25, 16, 9.825], "rotation": {"angle": -45, "axis": "y", "origin": [5.33579, 6.25, 8.66079]}, "faces": { - "north": {"uv": [0.016, 0.032, 3.484, 6.968], "texture": "#0"}, - "east": {"uv": [0.016, 0.032, 3.484, 6.968], "texture": "#0"}, - "south": {"uv": [4.016, 0.032, 7.484, 6.968], "texture": "#0"}, - "west": {"uv": [0.016, 0.032, 3.484, 6.968], "texture": "#0"}, - "up": {"uv": [0.016, 8.032, 3.484, 14.968], "texture": "#0"}, - "down": {"uv": [4.016, 8.032, 7.484, 14.968], "texture": "#0"} + "north": {"uv": [0.016, 0.032, 3.484, 6.968], "texture": "#0", "tintindex": 1}, + "east": {"uv": [0.016, 0.032, 3.484, 6.968], "texture": "#0", "tintindex": 1}, + "south": {"uv": [4, 0, 7.5, 7], "texture": "#0", "tintindex": 1}, + "west": {"uv": [0.016, 0.032, 3.484, 6.968], "texture": "#0", "tintindex": 1}, + "up": {"uv": [0.016, 8.032, 3.484, 14.968], "texture": "#0", "tintindex": 1}, + "down": {"uv": [4.016, 8.032, 7.484, 14.968], "texture": "#0", "tintindex": 1} + } + }, + { + "from": [4.25, 13, 9.825], + "to": [6.25, 15, 9.825], + "rotation": {"angle": -45, "axis": "y", "origin": [5.33579, 6.25, 8.66079]}, + "faces": { + "south": {"uv": [12.5, 13, 13.5, 15], "texture": "#0"} + } + }, + { + "from": [7.25, 13, 9.825], + "to": [9.25, 15, 9.825], + "rotation": {"angle": -45, "axis": "y", "origin": [5.33579, 6.25, 8.66079]}, + "faces": { + "south": {"uv": [12.5, 13, 13.5, 15], "texture": "#0"} } }, { @@ -44,8 +60,8 @@ "to": [6.75, 14, 2.825], "rotation": {"angle": -45, "axis": "y", "origin": [5.33579, 6.25, 8.66079]}, "faces": { - "east": {"uv": [15.984, 0.032, 14.516, 1.968], "texture": "#0"}, - "west": {"uv": [14.516, 0.032, 15.984, 1.968], "texture": "#0"} + "east": {"uv": [15.984, 0.032, 14.516, 1.968], "texture": "#0", "tintindex": 1}, + "west": {"uv": [14.516, 0.032, 15.984, 1.968], "texture": "#0", "tintindex": 1} } }, { @@ -53,10 +69,10 @@ "to": [8.75, 13.25, 12.825], "rotation": {"angle": -45, "axis": "y", "origin": [5.33579, 6, 8.66079]}, "faces": { - "east": {"uv": [10.016, 0.032, 11.484, 3.968], "texture": "#0"}, - "west": {"uv": [10.016, 0.032, 11.484, 3.968], "texture": "#0"}, - "up": {"uv": [12.016, 2.968, 13.984, 0.032], "texture": "#0"}, - "down": {"uv": [12.016, 6.968, 13.984, 4.032], "texture": "#0"} + "east": {"uv": [10.016, 0.032, 11.484, 3.968], "texture": "#0", "tintindex": 1}, + "west": {"uv": [10.016, 0.032, 11.484, 3.968], "texture": "#0", "tintindex": 1}, + "up": {"uv": [12.016, 2.968, 13.984, 0.032], "texture": "#0", "tintindex": 1}, + "down": {"uv": [12.016, 6.968, 13.984, 4.032], "texture": "#0", "tintindex": 1} } }, { @@ -64,12 +80,12 @@ "to": [9.25, 13.75, 14.825], "rotation": {"angle": -45, "axis": "y", "origin": [5.33579, 6, 8.66079]}, "faces": { - "north": {"uv": [9.516, 11.032, 11.984, 15.968], "texture": "#0"}, - "east": {"uv": [10.016, 5.032, 10.984, 9.968], "texture": "#0"}, - "south": {"uv": [9.516, 11.032, 11.984, 15.968], "texture": "#0"}, - "west": {"uv": [10.984, 5.032, 10.016, 9.968], "texture": "#0"}, - "up": {"uv": [10.984, 5.032, 10.016, 9.968], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10.016, 5.032, 10.984, 9.968], "rotation": 90, "texture": "#0"} + "north": {"uv": [9.516, 11.032, 11.984, 15.968], "texture": "#0", "tintindex": 1}, + "east": {"uv": [10.016, 5.032, 10.984, 9.968], "texture": "#0", "tintindex": 1}, + "south": {"uv": [9.516, 11.032, 11.984, 15.968], "texture": "#0", "tintindex": 1}, + "west": {"uv": [10.984, 5.032, 10.016, 9.968], "texture": "#0", "tintindex": 1}, + "up": {"uv": [10.984, 5.032, 10.016, 9.968], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [10.016, 5.032, 10.984, 9.968], "rotation": 90, "texture": "#0", "tintindex": 1} } }, { @@ -77,11 +93,11 @@ "to": [9.48744, 9, 9.50914], "rotation": {"angle": 0, "axis": "y", "origin": [5.33579, 6.25, 8.66079]}, "faces": { - "north": {"uv": [8.016, 4.032, 9.484, 4.968], "texture": "#0"}, - "east": {"uv": [8.016, 4.032, 9.484, 4.968], "texture": "#0"}, - "south": {"uv": [8.016, 4.032, 9.484, 4.968], "texture": "#0"}, - "west": {"uv": [8.016, 4.032, 9.484, 4.968], "texture": "#0"}, - "down": {"uv": [8.016, 0.032, 9.484, 3], "texture": "#0"} + "north": {"uv": [8.016, 4.032, 9.484, 4.968], "texture": "#0", "tintindex": 1}, + "east": {"uv": [8.016, 4.032, 9.484, 4.968], "texture": "#0", "tintindex": 1}, + "south": {"uv": [8.016, 4.032, 9.484, 4.968], "texture": "#0", "tintindex": 1}, + "west": {"uv": [8.016, 4.032, 9.484, 4.968], "texture": "#0", "tintindex": 1}, + "down": {"uv": [8.016, 0.032, 9.484, 3], "texture": "#0", "tintindex": 1} } }, { @@ -89,8 +105,8 @@ "to": [9.98744, 0, 6.50914], "rotation": {"angle": 45, "axis": "x", "origin": [7.98744, 0, 6.50914]}, "faces": { - "up": {"uv": [14.016, 12.032, 15.984, 15.968], "texture": "#0"}, - "down": {"uv": [14.016, 12.032, 15.984, 15.968], "rotation": 180, "texture": "#0"} + "up": {"uv": [14.016, 12.032, 15.984, 15.968], "texture": "#0", "tintindex": 1}, + "down": {"uv": [14.016, 12.032, 15.984, 15.968], "rotation": 180, "texture": "#0", "tintindex": 1} } }, { @@ -98,8 +114,8 @@ "to": [9.48744, 2.82821, 3.7068], "rotation": {"angle": -22.5, "axis": "x", "origin": [8.48744, 2.82821, 3.6818]}, "faces": { - "up": {"uv": [14.532, 3.032, 16, 6.968], "texture": "#0"}, - "down": {"uv": [14.532, 3.032, 16, 6.968], "rotation": 180, "texture": "#0"} + "up": {"uv": [14.532, 3.032, 16, 6.968], "texture": "#0", "tintindex": 1}, + "down": {"uv": [14.532, 3.032, 16, 6.968], "rotation": 180, "texture": "#0", "tintindex": 1} } }, { @@ -107,8 +123,8 @@ "to": [9.48744, 2.82821, 16.33647], "rotation": {"angle": 22.5, "axis": "x", "origin": [8.48744, 2.82821, 12.33647]}, "faces": { - "up": {"uv": [14.532, 3.032, 16, 6.968], "rotation": 180, "texture": "#0"}, - "down": {"uv": [14.532, 3.032, 16, 7], "texture": "#0"} + "up": {"uv": [14.532, 3.032, 16, 6.968], "rotation": 180, "texture": "#0", "tintindex": 1}, + "down": {"uv": [14.532, 3.032, 16, 7], "texture": "#0", "tintindex": 1} } }, { @@ -116,8 +132,8 @@ "to": [9.98744, 0, 13.50914], "rotation": {"angle": -45, "axis": "x", "origin": [7.98744, 0, 9.50914]}, "faces": { - "up": {"uv": [14, 12, 16, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [14, 12, 16, 16], "texture": "#0"} + "up": {"uv": [14, 12, 16, 16], "rotation": 180, "texture": "#0", "tintindex": 1}, + "down": {"uv": [14, 12, 16, 16], "texture": "#0", "tintindex": 1} } }, { @@ -125,8 +141,8 @@ "to": [15.56837, 4.40126, 9.50914], "rotation": {"angle": -22.5, "axis": "z", "origin": [7.98744, 1.73853, 8.00914]}, "faces": { - "up": {"uv": [14.532, 3.032, 16, 6.968], "rotation": 90, "texture": "#0"}, - "down": {"uv": [14.532, 3.032, 16, 6.968], "rotation": 90, "texture": "#0"} + "up": {"uv": [14.532, 3.032, 16, 6.968], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [14.532, 3.032, 16, 6.968], "rotation": 90, "texture": "#0", "tintindex": 1} } }, { @@ -134,8 +150,8 @@ "to": [11.81877, -0.55146, 10.00914], "rotation": {"angle": 45, "axis": "z", "origin": [7.98744, 1.73853, 8.00914]}, "faces": { - "up": {"uv": [15.984, 15.968, 14.016, 12.032], "rotation": 270, "texture": "#0"}, - "down": {"uv": [14.016, 12.032, 15.984, 15.968], "rotation": 90, "texture": "#0"} + "up": {"uv": [15.984, 15.968, 14.016, 12.032], "rotation": 270, "texture": "#0", "tintindex": 1}, + "down": {"uv": [14.016, 12.032, 15.984, 15.968], "rotation": 90, "texture": "#0", "tintindex": 1} } }, { @@ -143,8 +159,8 @@ "to": [4.4315, 4.40126, 9.50914], "rotation": {"angle": 22.5, "axis": "z", "origin": [7.98744, 1.73853, 8.00914]}, "faces": { - "up": {"uv": [14.532, 3.032, 16, 6.968], "rotation": 270, "texture": "#0"}, - "down": {"uv": [14.532, 3.032, 16, 7], "rotation": 270, "texture": "#0"} + "up": {"uv": [14.532, 3.032, 16, 6.968], "rotation": 270, "texture": "#0", "tintindex": 1}, + "down": {"uv": [14.532, 3.032, 16, 7], "rotation": 270, "texture": "#0", "tintindex": 1} } }, { @@ -152,88 +168,228 @@ "to": [8.1561, -0.55146, 10.00914], "rotation": {"angle": -45, "axis": "z", "origin": [7.98744, 1.73853, 8.00914]}, "faces": { - "up": {"uv": [15.984, 15.968, 14.016, 12.032], "rotation": 90, "texture": "#0"}, - "down": {"uv": [14.016, 12.032, 15.984, 15.968], "rotation": 270, "texture": "#0"} + "up": {"uv": [15.984, 15.968, 14.016, 12.032], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [14.016, 12.032, 15.984, 15.968], "rotation": 270, "texture": "#0", "tintindex": 1} + } + }, + { + "from": [6.75, 12, -0.175], + "to": [6.75, 14, 2.825], + "rotation": {"angle": -45, "axis": "y", "origin": [5.33579, 6.25, 8.66079]}, + "faces": { + "east": {"uv": [15.984, 0.032, 14.516, 1.968], "texture": "#0", "tintindex": 1}, + "west": {"uv": [14.516, 0.032, 15.984, 1.968], "texture": "#0", "tintindex": 1} + } + }, + { + "name": "cube inverted", + "from": [9.73744, 3.07821, 3.76353], + "to": [6.23744, 2.57821, 0.41353], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8.48744, 2.82821, 3.66353]}, + "faces": { + "north": {"uv": [13.9125, 11, 12.5445, 8.007], "texture": "#0", "tintindex": 1}, + "east": {"uv": [13.9125, 11, 12.5445, 8.007], "texture": "#0", "tintindex": 1}, + "south": {"uv": [16, 9, 14.5, 8], "texture": "#0", "tintindex": 1}, + "west": {"uv": [13.9125, 11, 12.5445, 8.007], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.9125, 11, 12.5445, 8.007], "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.9125, 11, 12.5445, 8.007], "texture": "#0", "tintindex": 1} } }, { "name": "cube inverted", - "from": [9.73744, 3.07821, 16.58647], + "from": [9.73744, 3.07821, 15.58647], "to": [6.23744, 2.57821, 12.23647], "rotation": {"angle": 22.5, "axis": "x", "origin": [8.48744, 2.82821, 12.33647]}, "faces": { - "up": {"uv": [13.9125, 8.007, 12.5445, 12], "texture": "#0"}, - "down": {"uv": [14, 8.032, 12.532, 11.968], "rotation": 180, "texture": "#0"} + "north": {"uv": [14.5, 9, 16, 8], "texture": "#0", "tintindex": 1}, + "east": {"uv": [12.5445, 11, 13.9125, 8.007], "texture": "#0", "tintindex": 1}, + "west": {"uv": [12.5445, 11, 13.9125, 8.007], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.9125, 8.007, 12.5445, 11], "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.9125, 8.007, 12.5445, 11], "texture": "#0", "tintindex": 1} } }, { "name": "cube inverted", - "from": [9.73744, 3.07821, 3.76353], - "to": [6.23744, 2.57821, -0.58647], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8.48744, 2.82821, 3.66353]}, + "from": [10.25, -0.42604, 12.16041], + "to": [5.75, -0.92604, 8.86041], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 1.3435, 7.99086]}, "faces": { - "up": {"uv": [13.9125, 12, 12.5445, 8.007], "texture": "#0"}, - "down": {"uv": [14, 11.968, 12.532, 8.032], "rotation": 180, "texture": "#0"} + "east": {"uv": [12.5785, 8.132, 13.9465, 10.843], "texture": "#0", "tintindex": 1}, + "south": {"uv": [13.5, 9.25, 15.5, 9.75], "texture": "#0", "tintindex": 1}, + "west": {"uv": [12.5785, 8.132, 13.9465, 10.843], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1} } }, { "name": "cube inverted", - "from": [15.93994, 4.67726, 9.75], - "to": [11.58994, 4.17726, 6.25], - "rotation": {"angle": -22.5, "axis": "z", "origin": [7.98744, 2.03414, 8]}, + "from": [9.25, -0.42604, 8.86041], + "to": [6.75, -0.92604, 7.86041], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 1.3435, 7.99086]}, "faces": { - "up": {"uv": [13.9125, 12, 12.5445, 8.007], "rotation": 90, "texture": "#0"}, - "down": {"uv": [14, 11.968, 12.532, 8.032], "rotation": 90, "texture": "#0"} + "east": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1}, + "south": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1}, + "west": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1} } }, { "name": "cube inverted", - "from": [4.38493, 4.67726, 9.75], - "to": [0.03493, 4.17726, 6.25], - "rotation": {"angle": 22.5, "axis": "z", "origin": [7.98744, 2.03414, 8]}, + "from": [10.25, -0.42604, 7.13959], + "to": [5.75, -0.92604, 3.83959], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 1.3435, 8.00914]}, "faces": { - "up": {"uv": [13.9125, 8.007, 12.5445, 12], "rotation": 90, "texture": "#0"}, - "down": {"uv": [14, 8.032, 12.532, 11.968], "rotation": 90, "texture": "#0"} + "north": {"uv": [13.5, 9.25, 15.5, 9.75], "texture": "#0", "tintindex": 1}, + "east": {"uv": [12.5785, 8.132, 13.9465, 10.843], "texture": "#0", "tintindex": 1}, + "west": {"uv": [12.5785, 8.132, 13.9465, 10.843], "texture": "#0", "tintindex": 1}, + "up": {"uv": [12.5785, 8.132, 13.9465, 10.843], "texture": "#0", "tintindex": 1}, + "down": {"uv": [12.5785, 8.132, 13.9465, 10.843], "texture": "#0", "tintindex": 1} } }, { "name": "cube inverted", - "from": [8.4061, -0.30146, 10.25914], - "to": [4.1061, -0.80146, 5.75914], - "rotation": {"angle": -45, "axis": "z", "origin": [7.98744, 1.73853, 8.00914]}, + "from": [9.25, -0.42604, 8.13959], + "to": [6.75, -0.92604, 7.13959], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 1.3435, 8.00914]}, "faces": { - "up": {"uv": [13.016, 10.968, 13.484, 10.032], "rotation": 270, "texture": "#0"}, - "down": {"uv": [13.484, 10.032, 13.016, 10.968], "rotation": 90, "texture": "#0"} + "north": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1}, + "east": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1}, + "west": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1}, + "up": {"uv": [12.5785, 8.132, 13.9465, 10.843], "texture": "#0", "tintindex": 1}, + "down": {"uv": [12.5785, 8.132, 13.9465, 10.843], "texture": "#0", "tintindex": 1} } }, { "name": "cube inverted", - "from": [11.8939, -0.30146, 10.25914], - "to": [7.5939, -0.80146, 5.75914], - "rotation": {"angle": 45, "axis": "z", "origin": [8.01256, 1.73853, 8.00914]}, + "from": [12.45058, -0.53866, 10.25], + "to": [9.15058, -1.03866, 5.75], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 0.93692, 8]}, "faces": { - "up": {"uv": [13.016, 10.032, 13.484, 10.968], "rotation": 270, "texture": "#0"}, - "down": {"uv": [13.484, 10.968, 13.016, 10.032], "rotation": 90, "texture": "#0"} + "north": {"uv": [12.5785, 8.132, 13.9465, 10.843], "texture": "#0", "tintindex": 1}, + "east": {"uv": [13.5, 9.25, 15.5, 9.75], "texture": "#0", "tintindex": 1}, + "south": {"uv": [12.5785, 8.132, 13.9465, 10.843], "texture": "#0", "tintindex": 1}, + "up": {"uv": [12.5785, 8.132, 13.9465, 10.843], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [12.5785, 8.132, 13.9465, 10.843], "rotation": 270, "texture": "#0", "tintindex": 1} } }, { "name": "cube inverted", - "from": [10.25, -0.42604, 12.17868], - "to": [5.75, -0.92604, 7.87868], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 1.3435, 8.00914]}, + "from": [9.15058, -0.53866, 9.25], + "to": [8.15058, -1.03866, 6.75], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 0.93692, 8]}, "faces": { - "up": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "down": {"uv": [13.484, 10.968, 13.016, 10.032], "texture": "#0"} + "north": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1}, + "east": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1}, + "south": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1}, + "up": {"uv": [12.5785, 8.132, 13.9465, 10.843], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [12.5785, 8.132, 13.9465, 10.843], "rotation": 270, "texture": "#0", "tintindex": 1} } }, { "name": "cube inverted", - "from": [10.25, -0.42604, 8.13959], - "to": [5.75, -0.92604, 3.83959], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 1.3435, 8.00914]}, + "from": [7.84942, -0.53866, 9.25], + "to": [6.84942, -1.03866, 6.75], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 0.93692, 8]}, + "faces": { + "north": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1}, + "south": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1}, + "west": {"uv": [13.9465, 10.843, 12.5785, 8.132], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.9465, 10.843, 12.5785, 8.132], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.9465, 10.843, 12.5785, 8.132], "rotation": 270, "texture": "#0", "tintindex": 1} + } + }, + { + "name": "cube inverted", + "from": [6.84942, -0.53866, 10.25], + "to": [3.54942, -1.03866, 5.75], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 0.93692, 8]}, + "faces": { + "north": {"uv": [12.5785, 8.132, 13.9465, 10.843], "texture": "#0", "tintindex": 1}, + "south": {"uv": [12.5785, 8.132, 13.9465, 10.843], "texture": "#0", "tintindex": 1}, + "west": {"uv": [13.5, 9.25, 15.5, 9.75], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.9465, 10.843, 12.5785, 8.132], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.9465, 10.843, 12.5785, 8.132], "rotation": 270, "texture": "#0", "tintindex": 1} + } + }, + { + "name": "cube inverted", + "from": [3.75439, 3.07821, 9.7283], + "to": [0.40439, 2.57821, 6.2283], + "rotation": {"angle": 22.5, "axis": "z", "origin": [3.65439, 2.82821, 8.4783]}, "faces": { - "up": {"uv": [13.016, 10.968, 13.484, 10.032], "texture": "#0"}, - "down": {"uv": [13.484, 10.032, 13.016, 10.968], "texture": "#0"} + "north": {"uv": [12.5445, 11, 13.9125, 8.007], "texture": "#0", "tintindex": 1}, + "east": {"uv": [14.5, 9, 16, 8], "texture": "#0", "tintindex": 1}, + "south": {"uv": [12.5445, 11, 13.9125, 8.007], "texture": "#0", "tintindex": 1}, + "west": {"uv": [12.5445, 11, 13.9125, 8.007], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.9125, 8.007, 12.5445, 11], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.9125, 8.007, 12.5445, 11], "rotation": 270, "texture": "#0", "tintindex": 1} + } + }, + { + "name": "cube inverted", + "from": [15.57733, 3.07821, 9.7283], + "to": [12.22733, 2.57821, 6.2283], + "rotation": {"angle": -22.5, "axis": "z", "origin": [12.32733, 2.82821, 8.4783]}, + "faces": { + "north": {"uv": [13.9125, 11, 12.5445, 8.007], "texture": "#0", "tintindex": 1}, + "east": {"uv": [13.9125, 11, 12.5445, 8.007], "texture": "#0", "tintindex": 1}, + "south": {"uv": [13.9125, 11, 12.5445, 8.007], "texture": "#0", "tintindex": 1}, + "west": {"uv": [16, 9, 14.5, 8], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.9125, 11, 12.5445, 8.007], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.9125, 11, 12.5445, 8.007], "rotation": 270, "texture": "#0", "tintindex": 1} + } + }, + { + "name": "cube inverted", + "from": [16.52733, 3.07821, 8.7283], + "to": [15.57733, 2.57821, 7.2283], + "rotation": {"angle": -22.5, "axis": "z", "origin": [12.32733, 2.82821, 8.4783]}, + "faces": { + "north": {"uv": [13.9125, 11, 12.5445, 8.007], "texture": "#0", "tintindex": 1}, + "south": {"uv": [13.9125, 11, 12.5445, 8.007], "texture": "#0", "tintindex": 1}, + "west": {"uv": [15, 11, 14.5, 10], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.9125, 11, 12.5445, 8.007], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.9125, 11, 12.5445, 8.007], "rotation": 270, "texture": "#0", "tintindex": 1} + } + }, + { + "name": "cube inverted", + "from": [0.42267, 3.07821, 8.7283], + "to": [-0.52733, 2.57821, 7.2283], + "rotation": {"angle": 22.5, "axis": "z", "origin": [3.67267, 2.82821, 8.4783]}, + "faces": { + "north": {"uv": [12.5445, 11, 13.9125, 8.007], "texture": "#0", "tintindex": 1}, + "east": {"uv": [14.5, 11, 15, 10], "texture": "#0", "tintindex": 1}, + "south": {"uv": [12.5445, 11, 13.9125, 8.007], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.9125, 8.007, 12.5445, 11], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.9125, 8.007, 12.5445, 11], "rotation": 270, "texture": "#0", "tintindex": 1} + } + }, + { + "name": "cube inverted", + "from": [8.75, 4.6257, 15.63072], + "to": [7.25, 4.1257, 14.68072], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 1.40271, 7.9783]}, + "faces": { + "north": {"uv": [15, 11, 14.5, 10], "texture": "#0", "tintindex": 1}, + "east": {"uv": [13.9125, 11, 12.5445, 8.007], "texture": "#0", "tintindex": 1}, + "west": {"uv": [13.9125, 11, 12.5445, 8.007], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.9125, 11, 12.5445, 8.007], "rotation": 180, "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.9125, 11, 12.5445, 8.007], "rotation": 180, "texture": "#0", "tintindex": 1} + } + }, + { + "name": "cube inverted", + "from": [8.75, 4.6257, 1.27588], + "to": [7.25, 4.1257, 0.32588], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 1.40271, 7.9783]}, + "faces": { + "east": {"uv": [12.5445, 11, 13.9125, 8.007], "texture": "#0", "tintindex": 1}, + "south": {"uv": [14.5, 11, 15, 10], "texture": "#0", "tintindex": 1}, + "west": {"uv": [12.5445, 11, 13.9125, 8.007], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.9125, 8.007, 12.5445, 11], "rotation": 180, "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.9125, 8.007, 12.5445, 11], "rotation": 180, "texture": "#0", "tintindex": 1} } }, { @@ -242,12 +398,12 @@ "to": [4, 8.5, 12.575], "rotation": {"angle": -45, "axis": "y", "origin": [5.33579, 6, 8.66079]}, "faces": { - "north": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "east": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "south": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "west": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "up": {"uv": [13.016, 10.032, 13.484, 10.968], "rotation": 90, "texture": "#0"}, - "down": {"uv": [13.016, 10.032, 13.484, 10.968], "rotation": 90, "texture": "#0"} + "north": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "east": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "south": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "west": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.016, 10.032, 13.484, 10.968], "rotation": 90, "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.016, 10.032, 13.484, 10.968], "rotation": 90, "texture": "#0", "tintindex": 1} } }, { @@ -256,10 +412,10 @@ "to": [4.5, 9, 9.575], "rotation": {"angle": -45, "axis": "y", "origin": [5.33579, 6, 8.66079]}, "faces": { - "east": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "west": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "up": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "down": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"} + "east": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "west": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1} } }, { @@ -268,12 +424,12 @@ "to": [3, 8.75, 2.575], "rotation": {"angle": -45, "axis": "y", "origin": [5.33579, 6.25, 8.66079]}, "faces": { - "north": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "east": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "south": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "west": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "up": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "down": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"} + "north": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "east": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "south": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "west": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1} } }, { @@ -282,10 +438,10 @@ "to": [5.5, 0, 5.075], "rotation": {"angle": -45, "axis": "y", "origin": [5.33579, 6.25, 8.66079]}, "faces": { - "north": {"uv": [13.016, 10.968, 13.484, 10.032], "texture": "#0"}, - "east": {"uv": [13.016, 10.968, 13.484, 10.032], "texture": "#0"}, - "south": {"uv": [13.016, 10.968, 13.484, 10.032], "texture": "#0"}, - "west": {"uv": [13.016, 10.968, 13.484, 10.032], "texture": "#0"} + "north": {"uv": [13.016, 10.968, 13.484, 10.032], "texture": "#0", "tintindex": 1}, + "east": {"uv": [13.016, 10.968, 13.484, 10.032], "texture": "#0", "tintindex": 1}, + "south": {"uv": [13.016, 10.968, 13.484, 10.032], "texture": "#0", "tintindex": 1}, + "west": {"uv": [13.016, 10.968, 13.484, 10.032], "texture": "#0", "tintindex": 1} } }, { @@ -294,11 +450,51 @@ "to": [6.23744, 7.75, 6.25914], "rotation": {"angle": 0, "axis": "y", "origin": [5.33579, 6.25, 8.66079]}, "faces": { - "north": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "east": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "south": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "west": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"}, - "up": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0"} + "north": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "east": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "south": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "west": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.016, 10.032, 13.484, 10.968], "texture": "#0", "tintindex": 1} + } + }, + { + "name": "cube_outline", + "from": [6.85, 14.1, 2.925], + "to": [6.65, 11.9, 1.725], + "rotation": {"angle": -45, "axis": "y", "origin": [5.33579, 6.25, 8.66079]}, + "faces": { + "east": {"uv": [13.859, 8.782, 12.641, 10.218], "rotation": 180, "texture": "#0", "tintindex": 1}, + "south": {"uv": [14.984, 9.968, 14.516, 8.032], "rotation": 180, "texture": "#0", "tintindex": 1}, + "west": {"uv": [13.859, 8.782, 12.641, 10.218], "rotation": 180, "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.859, 8.782, 12.641, 10.218], "rotation": 180, "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.859, 8.782, 12.641, 10.218], "rotation": 180, "texture": "#0", "tintindex": 1} + } + }, + { + "name": "cube_outline", + "from": [6.85, 14.1, 1.925], + "to": [6.65, 12.9, 0.725], + "rotation": {"angle": -45, "axis": "y", "origin": [5.33579, 6.25, 8.66079]}, + "faces": { + "east": {"uv": [13.859, 8.782, 12.641, 10.218], "rotation": 180, "texture": "#0", "tintindex": 1}, + "south": {"uv": [14.984, 8.968, 14.516, 8.032], "rotation": 180, "texture": "#0", "tintindex": 1}, + "west": {"uv": [13.859, 8.782, 12.641, 10.218], "rotation": 180, "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.859, 8.782, 12.641, 10.218], "rotation": 180, "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.859, 8.782, 12.641, 10.218], "rotation": 180, "texture": "#0", "tintindex": 1} + } + }, + { + "name": "cube_outline", + "from": [6.85, 13.1, 0.925], + "to": [6.65, 11.9, -0.275], + "rotation": {"angle": -45, "axis": "y", "origin": [5.33579, 6.25, 8.66079]}, + "faces": { + "north": {"uv": [14.984, 8.968, 14.516, 8.032], "rotation": 180, "texture": "#0", "tintindex": 1}, + "east": {"uv": [13.859, 8.782, 12.641, 10.218], "rotation": 180, "texture": "#0", "tintindex": 1}, + "south": {"uv": [14.984, 8.968, 14.516, 8.032], "rotation": 180, "texture": "#0", "tintindex": 1}, + "west": {"uv": [13.859, 8.782, 12.641, 10.218], "rotation": 180, "texture": "#0", "tintindex": 1}, + "up": {"uv": [13.859, 8.782, 12.641, 10.218], "rotation": 180, "texture": "#0", "tintindex": 1}, + "down": {"uv": [13.859, 8.782, 12.641, 10.218], "rotation": 180, "texture": "#0", "tintindex": 1} } } ], @@ -349,17 +545,22 @@ 4, 5, 6, + 7, + 8, { "name": "leaves", "origin": [7.98744, 1.73853, 8.00914], "color": 0, - "children": [7, 8, 9, 10, 11, 12, 13, 14] + "children": [9, 10, 11, 12, 13, 14, 15, 16] }, { "name": "outline", "origin": [5.33579, 6.25, 8.66079], "color": 0, - "children": [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27] - } + "children": [17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38] + }, + 39, + 40, + 41 ] } diff --git a/src/main/resources/assets/portalcubed/sounds.json b/src/main/resources/assets/portalcubed/sounds.json index 302459cc..34dd6219 100644 --- a/src/main/resources/assets/portalcubed/sounds.json +++ b/src/main/resources/assets/portalcubed/sounds.json @@ -120,7 +120,7 @@ "sounds": [ { "name": "portalcubed:door/portal_1_chamber_door", - "volume": 0.6 + "volume": 0.5 } ], "subtitle": "subtitles.portalcubed.chamber_door_open" @@ -129,7 +129,7 @@ "sounds": [ { "name": "portalcubed:door/portal_1_chamber_door", - "volume": 0.6 + "volume": 0.5 } ], "subtitle": "subtitles.portalcubed.chamber_door_close" @@ -174,7 +174,7 @@ "sounds": [ { "name": "portalcubed:door/old_ap_chamber_door_open", - "volume": 0.65 + "volume": 0.5 } ], "subtitle": "subtitles.portalcubed.chamber_door_open" @@ -183,7 +183,7 @@ "sounds": [ { "name": "portalcubed:door/old_ap_chamber_door_close", - "volume": 0.65 + "volume": 0.5 } ], "subtitle": "subtitles.portalcubed.chamber_door_close" diff --git a/src/main/resources/assets/portalcubed/textures/entity/banner/aperture.png b/src/main/resources/assets/portalcubed/textures/entity/banner/aperture.png new file mode 100644 index 00000000..ffe08d34 Binary files /dev/null and b/src/main/resources/assets/portalcubed/textures/entity/banner/aperture.png differ diff --git a/src/main/resources/assets/portalcubed/textures/entity/banner/oval.png b/src/main/resources/assets/portalcubed/textures/entity/banner/oval.png new file mode 100644 index 00000000..6cc63d9d Binary files /dev/null and b/src/main/resources/assets/portalcubed/textures/entity/banner/oval.png differ diff --git a/src/main/resources/assets/portalcubed/textures/item/aperture_banner_pattern.png b/src/main/resources/assets/portalcubed/textures/item/aperture_banner_pattern.png new file mode 100644 index 00000000..863fa04b Binary files /dev/null and b/src/main/resources/assets/portalcubed/textures/item/aperture_banner_pattern.png differ diff --git a/src/main/resources/assets/portalcubed/textures/item/blueprint_portal_gun.png b/src/main/resources/assets/portalcubed/textures/item/blueprint_portal_gun.png index b6d192f3..df1e8fb9 100644 Binary files a/src/main/resources/assets/portalcubed/textures/item/blueprint_portal_gun.png and b/src/main/resources/assets/portalcubed/textures/item/blueprint_portal_gun.png differ diff --git a/src/main/resources/assets/portalcubed/textures/item/peashooter.png b/src/main/resources/assets/portalcubed/textures/item/peashooter.png index 146d2788..dfbda41d 100644 Binary files a/src/main/resources/assets/portalcubed/textures/item/peashooter.png and b/src/main/resources/assets/portalcubed/textures/item/peashooter.png differ diff --git a/src/main/resources/assets/portalcubed/textures/item/pipis_cannon.png b/src/main/resources/assets/portalcubed/textures/item/pipis_cannon.png index b608b63c..610518e1 100644 Binary files a/src/main/resources/assets/portalcubed/textures/item/pipis_cannon.png and b/src/main/resources/assets/portalcubed/textures/item/pipis_cannon.png differ diff --git a/src/main/resources/data/minecraft/tags/banner_pattern/no_item_required.json b/src/main/resources/data/minecraft/tags/banner_pattern/no_item_required.json new file mode 100644 index 00000000..f10ef090 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/banner_pattern/no_item_required.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "portalcubed:oval" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json b/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json index 83f977af..977ca4a5 100644 --- a/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json +++ b/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "portalcubed:toxic_goo", - "portalcubed:disintegration" + "portalcubed:disintegration", + "portalcubed:submerged_the_operational_end_of_the_device" ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/minecraft/tags/damage_type/bypasses_invulnerability.json b/src/main/resources/data/minecraft/tags/damage_type/bypasses_invulnerability.json index 3d5c943b..52a1a121 100644 --- a/src/main/resources/data/minecraft/tags/damage_type/bypasses_invulnerability.json +++ b/src/main/resources/data/minecraft/tags/damage_type/bypasses_invulnerability.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "portalcubed:disintegration" + "portalcubed:disintegration", + "portalcubed:submerged_the_operational_end_of_the_device" ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/minecraft/tags/damage_type/panic_environmental_causes.json b/src/main/resources/data/minecraft/tags/damage_type/panic_environmental_causes.json index f630d0e5..71180ec4 100644 --- a/src/main/resources/data/minecraft/tags/damage_type/panic_environmental_causes.json +++ b/src/main/resources/data/minecraft/tags/damage_type/panic_environmental_causes.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "portalcubed:toxic_goo" + "portalcubed:toxic_goo", + "portalcubed:landing_damage" ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/portalcubed/advancement/achievements/hammer_time.json b/src/main/resources/data/portalcubed/advancement/achievements/configure_test_element.json similarity index 84% rename from src/main/resources/data/portalcubed/advancement/achievements/hammer_time.json rename to src/main/resources/data/portalcubed/advancement/achievements/configure_test_element.json index 18968570..2e05d703 100644 --- a/src/main/resources/data/portalcubed/advancement/achievements/hammer_time.json +++ b/src/main/resources/data/portalcubed/advancement/achievements/configure_test_element.json @@ -4,10 +4,10 @@ "id": "portalcubed:hammer" }, "title": { - "translate": "advancement.portalcubed.hammer_time.title" + "translate": "advancement.portalcubed.configure_test_element.title" }, "description": { - "translate": "advancement.portalcubed.hammer_time.description" + "translate": "advancement.portalcubed.configure_test_element.description" }, "frame": "goal", "show_toast": true, diff --git a/src/main/resources/data/portalcubed/advancement/achievements/crossover_episode.json b/src/main/resources/data/portalcubed/advancement/achievements/crossover_episode.json index c659a1f9..9faebbec 100644 --- a/src/main/resources/data/portalcubed/advancement/achievements/crossover_episode.json +++ b/src/main/resources/data/portalcubed/advancement/achievements/crossover_episode.json @@ -13,7 +13,7 @@ "announce_to_chat": false, "hidden": false }, - "parent": "portalcubed:achievements/hammer_time", + "parent": "portalcubed:achievements/configure_test_element", "criteria": { "requirement": { "trigger": "minecraft:inventory_changed", diff --git a/src/main/resources/data/portalcubed/advancement/achievements/dyed_portal_gun.json b/src/main/resources/data/portalcubed/advancement/achievements/dyed_portal_gun.json new file mode 100644 index 00000000..0e23be6a --- /dev/null +++ b/src/main/resources/data/portalcubed/advancement/achievements/dyed_portal_gun.json @@ -0,0 +1,35 @@ +{ + "parent": "portalcubed:achievements/portal_gun", + "criteria": { + "dye": { + "trigger": "minecraft:recipe_crafted", + "conditions": { + "recipe_id": "minecraft:armor_dye", + "ingredients": [ + { + "items": "portalcubed:portal_gun" + } + ] + } + } + }, + "display": { + "description": { + "translate": "advancement.portalcubed.dyed_portal_gun.description" + }, + "frame": "task", + "icon": { + "components": { + "minecraft:dyed_color": { + "rgb": 14317805, + "show_in_tooltip": false + } + }, + "count": 1, + "id": "portalcubed:portal_gun" + }, + "title": { + "translate": "advancement.portalcubed.dyed_portal_gun.title" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/portalcubed/advancement/achievements/lemonade.json b/src/main/resources/data/portalcubed/advancement/achievements/lemonade.json index b4c1bf12..d6283281 100644 --- a/src/main/resources/data/portalcubed/advancement/achievements/lemonade.json +++ b/src/main/resources/data/portalcubed/advancement/achievements/lemonade.json @@ -12,7 +12,7 @@ "frame": "task", "show_toast": true, "announce_to_chat": true, - "hidden": false + "hidden": true }, "parent": "portalcubed:achievements/lemon", "criteria": { diff --git a/src/main/resources/data/portalcubed/advancement/achievements/sign_here.json b/src/main/resources/data/portalcubed/advancement/achievements/sign_here.json index c5e1eedb..2b4aee80 100644 --- a/src/main/resources/data/portalcubed/advancement/achievements/sign_here.json +++ b/src/main/resources/data/portalcubed/advancement/achievements/sign_here.json @@ -14,7 +14,7 @@ "announce_to_chat": true, "hidden": false }, - "parent": "portalcubed:achievements/hammer_time", + "parent": "portalcubed:achievements/configure_test_element", "criteria": { "large_signage": { "trigger": "minecraft:placed_block", diff --git a/src/main/resources/data/portalcubed/advancement/recipes/aperture_banner_pattern.json b/src/main/resources/data/portalcubed/advancement/recipes/aperture_banner_pattern.json new file mode 100644 index 00000000..36457dc8 --- /dev/null +++ b/src/main/resources/data/portalcubed/advancement/recipes/aperture_banner_pattern.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "portalcubed:aperture_banner_pattern" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_lemon": { + "conditions": { + "items": [ + { + "items": "portalcubed:lemon" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lemon" + ] + ], + "rewards": { + "recipes": [ + "portalcubed:aperture_banner_pattern" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/portalcubed/banner_pattern/aperture.json b/src/main/resources/data/portalcubed/banner_pattern/aperture.json new file mode 100644 index 00000000..445c7694 --- /dev/null +++ b/src/main/resources/data/portalcubed/banner_pattern/aperture.json @@ -0,0 +1,4 @@ +{ + "asset_id": "portalcubed:aperture", + "translation_key": "block.portalcubed.banner.aperture" +} \ No newline at end of file diff --git a/src/main/resources/data/portalcubed/banner_pattern/oval.json b/src/main/resources/data/portalcubed/banner_pattern/oval.json new file mode 100644 index 00000000..143b6fa1 --- /dev/null +++ b/src/main/resources/data/portalcubed/banner_pattern/oval.json @@ -0,0 +1,4 @@ +{ + "asset_id": "portalcubed:oval", + "translation_key": "block.portalcubed.banner.oval" +} \ No newline at end of file diff --git a/src/main/resources/data/portalcubed/damage_type/submerged_the_operational_end_of_the_device.json b/src/main/resources/data/portalcubed/damage_type/submerged_the_operational_end_of_the_device.json new file mode 100644 index 00000000..2e098dc1 --- /dev/null +++ b/src/main/resources/data/portalcubed/damage_type/submerged_the_operational_end_of_the_device.json @@ -0,0 +1,5 @@ +{ + "exhaustion": 0.1, + "message_id": "submerged_the_operational_end_of_the_device", + "scaling": "when_caused_by_living_non_player" +} diff --git a/src/main/resources/data/portalcubed/recipe/aperture_banner_pattern.json b/src/main/resources/data/portalcubed/recipe/aperture_banner_pattern.json new file mode 100644 index 00000000..3a1bfd15 --- /dev/null +++ b/src/main/resources/data/portalcubed/recipe/aperture_banner_pattern.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "minecraft:paper", + "portalcubed:lemon" + ], + "result": { + "count": 1, + "id": "portalcubed:aperture_banner_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/data/portalcubed/tags/banner_pattern/pattern_item/aperture.json b/src/main/resources/data/portalcubed/tags/banner_pattern/pattern_item/aperture.json new file mode 100644 index 00000000..306f2800 --- /dev/null +++ b/src/main/resources/data/portalcubed/tags/banner_pattern/pattern_item/aperture.json @@ -0,0 +1,5 @@ +{ + "values": [ + "portalcubed:aperture" + ] +} \ No newline at end of file