diff --git a/camping-supplies-addon/camping_supplies_RP/textures/blocks/tent_canvas.png b/camping-supplies-addon/camping_supplies_RP/textures/blocks/tent_canvas.png index eb9a78e..fce37df 100644 Binary files a/camping-supplies-addon/camping_supplies_RP/textures/blocks/tent_canvas.png and b/camping-supplies-addon/camping_supplies_RP/textures/blocks/tent_canvas.png differ diff --git a/lobby-addon/lobby_transfer_RP/manifest.json b/lobby-addon/lobby_transfer_RP/manifest.json index d1bc25a..8f09ef8 100644 --- a/lobby-addon/lobby_transfer_RP/manifest.json +++ b/lobby-addon/lobby_transfer_RP/manifest.json @@ -4,14 +4,26 @@ "name": "Lobby Portal Transfer Resources", "description": "Textures and lang for craftable portal blocks", "uuid": "b2c3d4e5-1111-2222-3333-fedcba654321", - "version": [1, 0, 0], - "min_engine_version": [1, 21, 0] + "version": [ + 1, + 0, + 1 + ], + "min_engine_version": [ + 1, + 21, + 0 + ] }, "modules": [ { "type": "resources", "uuid": "b2c3d4e5-4444-5555-6666-fedcba987654", - "version": [1, 0, 0] + "version": [ + 1, + 0, + 1 + ] } ] } diff --git a/lobby-addon/lobby_transfer_RP/textures/blocks/portal_frame.png b/lobby-addon/lobby_transfer_RP/textures/blocks/portal_frame.png new file mode 100644 index 0000000..3570da4 Binary files /dev/null and b/lobby-addon/lobby_transfer_RP/textures/blocks/portal_frame.png differ diff --git a/lobby-addon/lobby_transfer_RP/textures/blocks/portal_jamie.png b/lobby-addon/lobby_transfer_RP/textures/blocks/portal_jamie.png new file mode 100644 index 0000000..2a91d08 Binary files /dev/null and b/lobby-addon/lobby_transfer_RP/textures/blocks/portal_jamie.png differ diff --git a/lobby-addon/lobby_transfer_RP/textures/blocks/portal_lyla.png b/lobby-addon/lobby_transfer_RP/textures/blocks/portal_lyla.png new file mode 100644 index 0000000..3f66368 Binary files /dev/null and b/lobby-addon/lobby_transfer_RP/textures/blocks/portal_lyla.png differ diff --git a/lobby-addon/lobby_transfer_RP/textures/blocks/portal_mya.png b/lobby-addon/lobby_transfer_RP/textures/blocks/portal_mya.png new file mode 100644 index 0000000..7c6331b Binary files /dev/null and b/lobby-addon/lobby_transfer_RP/textures/blocks/portal_mya.png differ diff --git a/lobby-addon/lobby_transfer_RP/textures/terrain_texture.json b/lobby-addon/lobby_transfer_RP/textures/terrain_texture.json index 0256dc3..fad00e5 100644 --- a/lobby-addon/lobby_transfer_RP/textures/terrain_texture.json +++ b/lobby-addon/lobby_transfer_RP/textures/terrain_texture.json @@ -5,16 +5,16 @@ "num_mip_levels": 4, "texture_data": { "portal_frame": { - "textures": "textures/blocks/end_portal_frame_top" + "textures": "textures/blocks/portal_frame" }, "portal_jamie": { - "textures": "textures/blocks/emerald_block" + "textures": "textures/blocks/portal_jamie" }, "portal_lyla": { - "textures": "textures/blocks/amethyst_block" + "textures": "textures/blocks/portal_lyla" }, "portal_mya": { - "textures": "textures/blocks/prismarine_bricks" + "textures": "textures/blocks/portal_mya" }, "portal_field": { "textures": "textures/blocks/portal_field" diff --git a/postal-service-addon/postal_service_RP/textures/blocks/mailbox.png b/postal-service-addon/postal_service_RP/textures/blocks/mailbox.png index 06b83f5..38f4a1f 100644 Binary files a/postal-service-addon/postal_service_RP/textures/blocks/mailbox.png and b/postal-service-addon/postal_service_RP/textures/blocks/mailbox.png differ diff --git a/postal-service-addon/postal_service_RP/textures/blocks/post_office.png b/postal-service-addon/postal_service_RP/textures/blocks/post_office.png index 31a0c01..fe0f1a2 100644 Binary files a/postal-service-addon/postal_service_RP/textures/blocks/post_office.png and b/postal-service-addon/postal_service_RP/textures/blocks/post_office.png differ diff --git a/scripts/build-textures.py b/scripts/build-textures.py index 35455f2..37397b8 100644 --- a/scripts/build-textures.py +++ b/scripts/build-textures.py @@ -482,12 +482,68 @@ def redstone_link_rx() -> Image.Image: return img +# ── Lobby portal blocks ──────────────────────────────────── +# These previously pointed terrain_texture.json at vanilla paths +# (emerald_block, amethyst_block, prismarine_bricks, end_portal_frame_top) +# which a custom pack cannot resolve, so they rendered as missing-texture +# once minecraft:geometry made material_instances take effect. Ship real +# textures instead: a dark stone frame around a glowing field, one hue per +# child, so the three destinations are distinguishable at a glance. + +PORTAL_STONE = (58, 60, 68) +PORTAL_STONE_HL = (86, 89, 99) +PORTAL_STONE_SH = (34, 35, 41) + +def _portal_face(core, bright, glow): + img = Image.new("RGBA", (16, 16), PORTAL_STONE) + # chiselled frame + rect(img, 0, 0, 15, 0, PORTAL_STONE_HL) + rect(img, 0, 0, 0, 15, PORTAL_STONE_HL) + rect(img, 0, 15, 15, 15, PORTAL_STONE_SH) + rect(img, 15, 0, 15, 15, PORTAL_STONE_SH) + rect(img, 2, 2, 13, 13, PORTAL_STONE_SH) + # glowing field + rect(img, 3, 3, 12, 12, core) + rect(img, 4, 4, 11, 11, bright) + rect(img, 6, 6, 9, 9, glow) + # corner sparks so the field reads as energy, not flat paint + for cx, cy in ((4, 4), (11, 4), (4, 11), (11, 11)): + px(img, cx, cy, glow) + # dark centre seam + rect(img, 7, 7, 8, 8, core) + return img + +def portal_jamie(): return _portal_face((22, 92, 40), (46, 156, 66), (140, 240, 150)) +def portal_lyla(): return _portal_face((78, 40, 130), (126, 74, 190), (214, 168, 255)) +def portal_mya(): return _portal_face((22, 96, 104), (46, 152, 160), (150, 238, 244)) + +def portal_frame(): + img = Image.new("RGBA", (16, 16), PORTAL_STONE) + rect(img, 0, 0, 15, 0, PORTAL_STONE_HL) + rect(img, 0, 0, 0, 15, PORTAL_STONE_HL) + rect(img, 0, 15, 15, 15, PORTAL_STONE_SH) + rect(img, 15, 0, 15, 15, PORTAL_STONE_SH) + # inset panel with a dull gold ring, echoing an end portal frame + rect(img, 3, 3, 12, 12, (48, 50, 57)) + for x in range(4, 12): + px(img, x, 4, GOLD); px(img, x, 11, GOLD) + for y in range(4, 12): + px(img, 4, y, GOLD); px(img, 11, y, GOLD) + rect(img, 6, 6, 9, 9, (70, 66, 40)) + px(img, 7, 7, GOLD_BRIGHT); px(img, 8, 8, GOLD_BRIGHT) + return img + + def main() -> None: save(smart_crafting_table(), "smart-crafting-addon/smart_crafting_RP/textures/blocks/smart_crafting_table.png") save(post_office_block(), "postal-service-addon/postal_service_RP/textures/blocks/post_office.png") save(mailbox_block(), "postal-service-addon/postal_service_RP/textures/blocks/mailbox.png") save(tent_canvas(), "camping-supplies-addon/camping_supplies_RP/textures/blocks/tent_canvas.png") save(portal_field(), "lobby-addon/lobby_transfer_RP/textures/blocks/portal_field.png") + save(portal_frame(), "lobby-addon/lobby_transfer_RP/textures/blocks/portal_frame.png") + save(portal_jamie(), "lobby-addon/lobby_transfer_RP/textures/blocks/portal_jamie.png") + save(portal_lyla(), "lobby-addon/lobby_transfer_RP/textures/blocks/portal_lyla.png") + save(portal_mya(), "lobby-addon/lobby_transfer_RP/textures/blocks/portal_mya.png") save(redstone_link_tx(), "redstone-link-addon/redstone_link_RP/textures/blocks/redstone_link_tx.png") save(redstone_link_rx(), "redstone-link-addon/redstone_link_RP/textures/blocks/redstone_link_rx.png") diff --git a/smart-crafting-addon/smart_crafting_RP/textures/blocks/smart_crafting_table.png b/smart-crafting-addon/smart_crafting_RP/textures/blocks/smart_crafting_table.png index 0bb9084..1cd9848 100644 Binary files a/smart-crafting-addon/smart_crafting_RP/textures/blocks/smart_crafting_table.png and b/smart-crafting-addon/smart_crafting_RP/textures/blocks/smart_crafting_table.png differ