From 659deab1f46fa8acb0011be894e3ba4f4bf006d2 Mon Sep 17 00:00:00 2001 From: IntegratedQuantum Date: Fri, 24 Jan 2025 22:59:32 +0100 Subject: [PATCH] Rename sepcial texture and texture info file names. Should make adding these just a little less painful. fixes #954 --- ...textureInfo.zig.zon => castilleja.zig.zon} | 0 ...ureInfo.zig.zon => castilleja_top.zig.zon} | 0 ...g_textureInfo.zig.zon => daffodil.zig.zon} | 0 ...xtureInfo.zig.zon => daffodil_top.zig.zon} | 0 ...ivity.png => diamond_ore_reflectivity.png} | Bin ...o.zig.zon => dry_grass_vegetation.zig.zon} | 0 ...n.png_textureInfo.zig.zon => fern.zig.zon} | 0 ...e.png_textureInfo.zig.zon => blue.zig.zon} | 0 ...n.png_textureInfo.zig.zon => cyan.zig.zon} | 0 ....png_textureInfo.zig.zon => green.zig.zon} | 0 ...ng_textureInfo.zig.zon => magenta.zig.zon} | 0 ...ed.png_textureInfo.zig.zon => red.zig.zon} | 0 ...png_textureInfo.zig.zon => yellow.zig.zon} | 0 ...eflectivity.png => frost_reflectivity.png} | Bin ...png_absorption.png => aqua_absorption.png} | Bin ...reflectivity.png => aqua_reflectivity.png} | Bin ...ng_absorption.png => black_absorption.png} | Bin ...eflectivity.png => black_reflectivity.png} | Bin ...png_absorption.png => blue_absorption.png} | Bin ...reflectivity.png => blue_reflectivity.png} | Bin ...ng_absorption.png => brown_absorption.png} | Bin ...eflectivity.png => brown_reflectivity.png} | Bin ..._absorption.png => crimson_absorption.png} | Bin ...lectivity.png => crimson_reflectivity.png} | Bin ...png_absorption.png => cyan_absorption.png} | Bin ...reflectivity.png => cyan_reflectivity.png} | Bin ...bsorption.png => dark_grey_absorption.png} | Bin ...ctivity.png => dark_grey_reflectivity.png} | Bin ...ng_absorption.png => green_absorption.png} | Bin ...eflectivity.png => green_reflectivity.png} | Bin ...png_absorption.png => grey_absorption.png} | Bin ...reflectivity.png => grey_reflectivity.png} | Bin ...g_absorption.png => indigo_absorption.png} | Bin ...flectivity.png => indigo_reflectivity.png} | Bin ...png_absorption.png => lime_absorption.png} | Bin ...reflectivity.png => lime_reflectivity.png} | Bin ..._absorption.png => magenta_absorption.png} | Bin ...lectivity.png => magenta_reflectivity.png} | Bin ...g_absorption.png => orange_absorption.png} | Bin ...flectivity.png => orange_reflectivity.png} | Bin ...png_absorption.png => pink_absorption.png} | Bin ...reflectivity.png => pink_reflectivity.png} | Bin ...g_absorption.png => purple_absorption.png} | Bin ...flectivity.png => purple_reflectivity.png} | Bin ....png_absorption.png => red_absorption.png} | Bin ..._reflectivity.png => red_reflectivity.png} | Bin ..._absorption.png => uranium_absorption.png} | Bin ....png_emission.png => uranium_emission.png} | Bin ...lectivity.png => uranium_reflectivity.png} | Bin ...g_absorption.png => violet_absorption.png} | Bin ...flectivity.png => violet_reflectivity.png} | Bin ...absorption.png => viridian_absorption.png} | Bin ...ectivity.png => viridian_reflectivity.png} | Bin ...ng_absorption.png => white_absorption.png} | Bin ...eflectivity.png => white_reflectivity.png} | Bin ...g_absorption.png => yellow_absorption.png} | Bin ...flectivity.png => yellow_reflectivity.png} | Bin ...qua.png_emission.png => aqua_emission.png} | Bin ...reflectivity.png => aqua_reflectivity.png} | Bin ...ck.png_emission.png => black_emission.png} | Bin ...eflectivity.png => black_reflectivity.png} | Bin ...lue.png_emission.png => blue_emission.png} | Bin ...reflectivity.png => blue_reflectivity.png} | Bin ...wn.png_emission.png => brown_emission.png} | Bin ...eflectivity.png => brown_reflectivity.png} | Bin ....png_emission.png => crimson_emission.png} | Bin ...lectivity.png => crimson_reflectivity.png} | Bin ...yan.png_emission.png => cyan_emission.png} | Bin ...reflectivity.png => cyan_reflectivity.png} | Bin ...ng_emission.png => dark_grey_emission.png} | Bin ...ctivity.png => dark_grey_reflectivity.png} | Bin ...en.png_emission.png => green_emission.png} | Bin ...eflectivity.png => green_reflectivity.png} | Bin ...rey.png_emission.png => grey_emission.png} | Bin ...reflectivity.png => grey_reflectivity.png} | Bin ...o.png_emission.png => indigo_emission.png} | Bin ...flectivity.png => indigo_reflectivity.png} | Bin ...ime.png_emission.png => lime_emission.png} | Bin ...reflectivity.png => lime_reflectivity.png} | Bin ....png_emission.png => magenta_emission.png} | Bin ...lectivity.png => magenta_reflectivity.png} | Bin ...e.png_emission.png => orange_emission.png} | Bin ...flectivity.png => orange_reflectivity.png} | Bin ...ink.png_emission.png => pink_emission.png} | Bin ...reflectivity.png => pink_reflectivity.png} | Bin ...e.png_emission.png => purple_emission.png} | Bin ...flectivity.png => purple_reflectivity.png} | Bin ...{red.png_emission.png => red_emission.png} | Bin ..._reflectivity.png => red_reflectivity.png} | Bin ...t.png_emission.png => violet_emission.png} | Bin ...flectivity.png => violet_reflectivity.png} | Bin ...png_emission.png => viridian_emission.png} | Bin ...ectivity.png => viridian_reflectivity.png} | Bin ...te.png_emission.png => white_emission.png} | Bin ...eflectivity.png => white_reflectivity.png} | Bin ...w.png_emission.png => yellow_emission.png} | Bin ...flectivity.png => yellow_reflectivity.png} | Bin ...eInfo.zig.zon => grass_vegetation.zig.zon} | 0 ..._reflectivity.png => ice_reflectivity.png} | Bin ...tivity.png => iron_block_reflectivity.png} | Bin ...ectivity.png => iron_ore_reflectivity.png} | Bin ...amp.png_emission.png => lamp_emission.png} | Bin ...png_emission.png => lamp_top_emission.png} | Bin ...a.png_textureInfo.zig.zon => lava.zig.zon} | 0 ...ava.png_emission.png => lava_emission.png} | Bin ....zig.zon => lush_grass_vegetation.zig.zon} | 0 ...ma.png_emission.png => magma_emission.png} | Bin ...ch.png_emission.png => torch_emission.png} | Bin ....png_textureInfo.zig.zon => vetch.zig.zon} | 0 ....png_textureInfo.zig.zon => water.zig.zon} | 0 ...ng_absorption.png => water_absorption.png} | Bin ...eflectivity.png => water_reflectivity.png} | Bin ...ty.png => workbench_side_reflectivity.png} | Bin src/blocks.zig | 29 ++++++++---------- 114 files changed, 13 insertions(+), 16 deletions(-) rename assets/cubyz/blocks/textures/{castilleja.png_textureInfo.zig.zon => castilleja.zig.zon} (100%) rename assets/cubyz/blocks/textures/{castilleja_top.png_textureInfo.zig.zon => castilleja_top.zig.zon} (100%) rename assets/cubyz/blocks/textures/{daffodil.png_textureInfo.zig.zon => daffodil.zig.zon} (100%) rename assets/cubyz/blocks/textures/{daffodil_top.png_textureInfo.zig.zon => daffodil_top.zig.zon} (100%) rename assets/cubyz/blocks/textures/{diamond_ore.png_reflectivity.png => diamond_ore_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/{dry_grass_vegetation.png_textureInfo.zig.zon => dry_grass_vegetation.zig.zon} (100%) rename assets/cubyz/blocks/textures/{fern.png_textureInfo.zig.zon => fern.zig.zon} (100%) rename assets/cubyz/blocks/textures/fog/{blue.png_textureInfo.zig.zon => blue.zig.zon} (100%) rename assets/cubyz/blocks/textures/fog/{cyan.png_textureInfo.zig.zon => cyan.zig.zon} (100%) rename assets/cubyz/blocks/textures/fog/{green.png_textureInfo.zig.zon => green.zig.zon} (100%) rename assets/cubyz/blocks/textures/fog/{magenta.png_textureInfo.zig.zon => magenta.zig.zon} (100%) rename assets/cubyz/blocks/textures/fog/{red.png_textureInfo.zig.zon => red.zig.zon} (100%) rename assets/cubyz/blocks/textures/fog/{yellow.png_textureInfo.zig.zon => yellow.zig.zon} (100%) rename assets/cubyz/blocks/textures/{frost.png_reflectivity.png => frost_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{aqua.png_absorption.png => aqua_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{aqua.png_reflectivity.png => aqua_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{black.png_absorption.png => black_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{black.png_reflectivity.png => black_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{blue.png_absorption.png => blue_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{blue.png_reflectivity.png => blue_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{brown.png_absorption.png => brown_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{brown.png_reflectivity.png => brown_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{crimson.png_absorption.png => crimson_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{crimson.png_reflectivity.png => crimson_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{cyan.png_absorption.png => cyan_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{cyan.png_reflectivity.png => cyan_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{dark_grey.png_absorption.png => dark_grey_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{dark_grey.png_reflectivity.png => dark_grey_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{green.png_absorption.png => green_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{green.png_reflectivity.png => green_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{grey.png_absorption.png => grey_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{grey.png_reflectivity.png => grey_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{indigo.png_absorption.png => indigo_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{indigo.png_reflectivity.png => indigo_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{lime.png_absorption.png => lime_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{lime.png_reflectivity.png => lime_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{magenta.png_absorption.png => magenta_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{magenta.png_reflectivity.png => magenta_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{orange.png_absorption.png => orange_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{orange.png_reflectivity.png => orange_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{pink.png_absorption.png => pink_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{pink.png_reflectivity.png => pink_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{purple.png_absorption.png => purple_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{purple.png_reflectivity.png => purple_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{red.png_absorption.png => red_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{red.png_reflectivity.png => red_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{uranium.png_absorption.png => uranium_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{uranium.png_emission.png => uranium_emission.png} (100%) rename assets/cubyz/blocks/textures/glass/{uranium.png_reflectivity.png => uranium_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{violet.png_absorption.png => violet_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{violet.png_reflectivity.png => violet_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{viridian.png_absorption.png => viridian_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{viridian.png_reflectivity.png => viridian_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{white.png_absorption.png => white_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{white.png_reflectivity.png => white_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glass/{yellow.png_absorption.png => yellow_absorption.png} (100%) rename assets/cubyz/blocks/textures/glass/{yellow.png_reflectivity.png => yellow_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{aqua.png_emission.png => aqua_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{aqua.png_reflectivity.png => aqua_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{black.png_emission.png => black_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{black.png_reflectivity.png => black_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{blue.png_emission.png => blue_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{blue.png_reflectivity.png => blue_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{brown.png_emission.png => brown_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{brown.png_reflectivity.png => brown_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{crimson.png_emission.png => crimson_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{crimson.png_reflectivity.png => crimson_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{cyan.png_emission.png => cyan_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{cyan.png_reflectivity.png => cyan_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{dark_grey.png_emission.png => dark_grey_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{dark_grey.png_reflectivity.png => dark_grey_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{green.png_emission.png => green_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{green.png_reflectivity.png => green_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{grey.png_emission.png => grey_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{grey.png_reflectivity.png => grey_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{indigo.png_emission.png => indigo_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{indigo.png_reflectivity.png => indigo_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{lime.png_emission.png => lime_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{lime.png_reflectivity.png => lime_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{magenta.png_emission.png => magenta_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{magenta.png_reflectivity.png => magenta_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{orange.png_emission.png => orange_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{orange.png_reflectivity.png => orange_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{pink.png_emission.png => pink_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{pink.png_reflectivity.png => pink_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{purple.png_emission.png => purple_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{purple.png_reflectivity.png => purple_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{red.png_emission.png => red_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{red.png_reflectivity.png => red_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{violet.png_emission.png => violet_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{violet.png_reflectivity.png => violet_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{viridian.png_emission.png => viridian_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{viridian.png_reflectivity.png => viridian_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{white.png_emission.png => white_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{white.png_reflectivity.png => white_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{yellow.png_emission.png => yellow_emission.png} (100%) rename assets/cubyz/blocks/textures/glow_crystal/{yellow.png_reflectivity.png => yellow_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/{grass_vegetation.png_textureInfo.zig.zon => grass_vegetation.zig.zon} (100%) rename assets/cubyz/blocks/textures/{ice.png_reflectivity.png => ice_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/{iron_block.png_reflectivity.png => iron_block_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/{iron_ore.png_reflectivity.png => iron_ore_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/{lamp.png_emission.png => lamp_emission.png} (100%) rename assets/cubyz/blocks/textures/{lamp_top.png_emission.png => lamp_top_emission.png} (100%) rename assets/cubyz/blocks/textures/{lava.png_textureInfo.zig.zon => lava.zig.zon} (100%) rename assets/cubyz/blocks/textures/{lava.png_emission.png => lava_emission.png} (100%) rename assets/cubyz/blocks/textures/{lush_grass_vegetation.png_textureInfo.zig.zon => lush_grass_vegetation.zig.zon} (100%) rename assets/cubyz/blocks/textures/{magma.png_emission.png => magma_emission.png} (100%) rename assets/cubyz/blocks/textures/{torch.png_emission.png => torch_emission.png} (100%) rename assets/cubyz/blocks/textures/{vetch.png_textureInfo.zig.zon => vetch.zig.zon} (100%) rename assets/cubyz/blocks/textures/{water.png_textureInfo.zig.zon => water.zig.zon} (100%) rename assets/cubyz/blocks/textures/{water.png_absorption.png => water_absorption.png} (100%) rename assets/cubyz/blocks/textures/{water.png_reflectivity.png => water_reflectivity.png} (100%) rename assets/cubyz/blocks/textures/{workbench_side.png_reflectivity.png => workbench_side_reflectivity.png} (100%) diff --git a/assets/cubyz/blocks/textures/castilleja.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/castilleja.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/castilleja.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/castilleja.zig.zon diff --git a/assets/cubyz/blocks/textures/castilleja_top.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/castilleja_top.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/castilleja_top.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/castilleja_top.zig.zon diff --git a/assets/cubyz/blocks/textures/daffodil.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/daffodil.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/daffodil.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/daffodil.zig.zon diff --git a/assets/cubyz/blocks/textures/daffodil_top.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/daffodil_top.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/daffodil_top.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/daffodil_top.zig.zon diff --git a/assets/cubyz/blocks/textures/diamond_ore.png_reflectivity.png b/assets/cubyz/blocks/textures/diamond_ore_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/diamond_ore.png_reflectivity.png rename to assets/cubyz/blocks/textures/diamond_ore_reflectivity.png diff --git a/assets/cubyz/blocks/textures/dry_grass_vegetation.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/dry_grass_vegetation.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/dry_grass_vegetation.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/dry_grass_vegetation.zig.zon diff --git a/assets/cubyz/blocks/textures/fern.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/fern.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/fern.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/fern.zig.zon diff --git a/assets/cubyz/blocks/textures/fog/blue.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/fog/blue.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/fog/blue.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/fog/blue.zig.zon diff --git a/assets/cubyz/blocks/textures/fog/cyan.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/fog/cyan.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/fog/cyan.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/fog/cyan.zig.zon diff --git a/assets/cubyz/blocks/textures/fog/green.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/fog/green.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/fog/green.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/fog/green.zig.zon diff --git a/assets/cubyz/blocks/textures/fog/magenta.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/fog/magenta.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/fog/magenta.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/fog/magenta.zig.zon diff --git a/assets/cubyz/blocks/textures/fog/red.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/fog/red.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/fog/red.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/fog/red.zig.zon diff --git a/assets/cubyz/blocks/textures/fog/yellow.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/fog/yellow.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/fog/yellow.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/fog/yellow.zig.zon diff --git a/assets/cubyz/blocks/textures/frost.png_reflectivity.png b/assets/cubyz/blocks/textures/frost_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/frost.png_reflectivity.png rename to assets/cubyz/blocks/textures/frost_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/aqua.png_absorption.png b/assets/cubyz/blocks/textures/glass/aqua_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/aqua.png_absorption.png rename to assets/cubyz/blocks/textures/glass/aqua_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/aqua.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/aqua_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/aqua.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/aqua_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/black.png_absorption.png b/assets/cubyz/blocks/textures/glass/black_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/black.png_absorption.png rename to assets/cubyz/blocks/textures/glass/black_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/black.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/black_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/black.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/black_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/blue.png_absorption.png b/assets/cubyz/blocks/textures/glass/blue_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/blue.png_absorption.png rename to assets/cubyz/blocks/textures/glass/blue_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/blue.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/blue_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/blue.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/blue_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/brown.png_absorption.png b/assets/cubyz/blocks/textures/glass/brown_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/brown.png_absorption.png rename to assets/cubyz/blocks/textures/glass/brown_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/brown.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/brown_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/brown.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/brown_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/crimson.png_absorption.png b/assets/cubyz/blocks/textures/glass/crimson_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/crimson.png_absorption.png rename to assets/cubyz/blocks/textures/glass/crimson_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/crimson.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/crimson_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/crimson.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/crimson_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/cyan.png_absorption.png b/assets/cubyz/blocks/textures/glass/cyan_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/cyan.png_absorption.png rename to assets/cubyz/blocks/textures/glass/cyan_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/cyan.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/cyan_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/cyan.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/cyan_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/dark_grey.png_absorption.png b/assets/cubyz/blocks/textures/glass/dark_grey_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/dark_grey.png_absorption.png rename to assets/cubyz/blocks/textures/glass/dark_grey_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/dark_grey.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/dark_grey_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/dark_grey.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/dark_grey_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/green.png_absorption.png b/assets/cubyz/blocks/textures/glass/green_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/green.png_absorption.png rename to assets/cubyz/blocks/textures/glass/green_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/green.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/green_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/green.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/green_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/grey.png_absorption.png b/assets/cubyz/blocks/textures/glass/grey_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/grey.png_absorption.png rename to assets/cubyz/blocks/textures/glass/grey_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/grey.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/grey_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/grey.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/grey_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/indigo.png_absorption.png b/assets/cubyz/blocks/textures/glass/indigo_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/indigo.png_absorption.png rename to assets/cubyz/blocks/textures/glass/indigo_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/indigo.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/indigo_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/indigo.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/indigo_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/lime.png_absorption.png b/assets/cubyz/blocks/textures/glass/lime_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/lime.png_absorption.png rename to assets/cubyz/blocks/textures/glass/lime_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/lime.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/lime_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/lime.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/lime_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/magenta.png_absorption.png b/assets/cubyz/blocks/textures/glass/magenta_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/magenta.png_absorption.png rename to assets/cubyz/blocks/textures/glass/magenta_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/magenta.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/magenta_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/magenta.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/magenta_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/orange.png_absorption.png b/assets/cubyz/blocks/textures/glass/orange_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/orange.png_absorption.png rename to assets/cubyz/blocks/textures/glass/orange_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/orange.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/orange_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/orange.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/orange_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/pink.png_absorption.png b/assets/cubyz/blocks/textures/glass/pink_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/pink.png_absorption.png rename to assets/cubyz/blocks/textures/glass/pink_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/pink.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/pink_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/pink.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/pink_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/purple.png_absorption.png b/assets/cubyz/blocks/textures/glass/purple_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/purple.png_absorption.png rename to assets/cubyz/blocks/textures/glass/purple_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/purple.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/purple_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/purple.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/purple_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/red.png_absorption.png b/assets/cubyz/blocks/textures/glass/red_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/red.png_absorption.png rename to assets/cubyz/blocks/textures/glass/red_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/red.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/red_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/red.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/red_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/uranium.png_absorption.png b/assets/cubyz/blocks/textures/glass/uranium_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/uranium.png_absorption.png rename to assets/cubyz/blocks/textures/glass/uranium_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/uranium.png_emission.png b/assets/cubyz/blocks/textures/glass/uranium_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/uranium.png_emission.png rename to assets/cubyz/blocks/textures/glass/uranium_emission.png diff --git a/assets/cubyz/blocks/textures/glass/uranium.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/uranium_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/uranium.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/uranium_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/violet.png_absorption.png b/assets/cubyz/blocks/textures/glass/violet_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/violet.png_absorption.png rename to assets/cubyz/blocks/textures/glass/violet_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/violet.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/violet_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/violet.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/violet_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/viridian.png_absorption.png b/assets/cubyz/blocks/textures/glass/viridian_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/viridian.png_absorption.png rename to assets/cubyz/blocks/textures/glass/viridian_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/viridian.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/viridian_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/viridian.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/viridian_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/white.png_absorption.png b/assets/cubyz/blocks/textures/glass/white_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/white.png_absorption.png rename to assets/cubyz/blocks/textures/glass/white_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/white.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/white_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/white.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/white_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glass/yellow.png_absorption.png b/assets/cubyz/blocks/textures/glass/yellow_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/yellow.png_absorption.png rename to assets/cubyz/blocks/textures/glass/yellow_absorption.png diff --git a/assets/cubyz/blocks/textures/glass/yellow.png_reflectivity.png b/assets/cubyz/blocks/textures/glass/yellow_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glass/yellow.png_reflectivity.png rename to assets/cubyz/blocks/textures/glass/yellow_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/aqua.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/aqua_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/aqua.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/aqua_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/aqua.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/aqua_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/aqua.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/aqua_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/black.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/black_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/black.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/black_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/black.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/black_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/black.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/black_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/blue.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/blue_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/blue.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/blue_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/blue.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/blue_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/blue.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/blue_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/brown.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/brown_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/brown.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/brown_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/brown.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/brown_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/brown.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/brown_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/crimson.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/crimson_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/crimson.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/crimson_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/crimson.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/crimson_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/crimson.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/crimson_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/cyan.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/cyan_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/cyan.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/cyan_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/cyan.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/cyan_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/cyan.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/cyan_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/dark_grey.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/dark_grey_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/dark_grey.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/dark_grey_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/dark_grey.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/dark_grey_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/dark_grey.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/dark_grey_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/green.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/green_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/green.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/green_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/green.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/green_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/green.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/green_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/grey.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/grey_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/grey.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/grey_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/grey.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/grey_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/grey.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/grey_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/indigo.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/indigo_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/indigo.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/indigo_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/indigo.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/indigo_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/indigo.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/indigo_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/lime.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/lime_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/lime.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/lime_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/lime.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/lime_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/lime.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/lime_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/magenta.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/magenta_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/magenta.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/magenta_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/magenta.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/magenta_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/magenta.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/magenta_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/orange.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/orange_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/orange.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/orange_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/orange.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/orange_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/orange.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/orange_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/pink.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/pink_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/pink.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/pink_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/pink.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/pink_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/pink.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/pink_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/purple.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/purple_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/purple.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/purple_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/purple.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/purple_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/purple.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/purple_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/red.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/red_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/red.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/red_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/red.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/red_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/red.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/red_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/violet.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/violet_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/violet.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/violet_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/violet.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/violet_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/violet.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/violet_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/viridian.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/viridian_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/viridian.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/viridian_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/viridian.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/viridian_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/viridian.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/viridian_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/white.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/white_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/white.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/white_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/white.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/white_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/white.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/white_reflectivity.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/yellow.png_emission.png b/assets/cubyz/blocks/textures/glow_crystal/yellow_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/yellow.png_emission.png rename to assets/cubyz/blocks/textures/glow_crystal/yellow_emission.png diff --git a/assets/cubyz/blocks/textures/glow_crystal/yellow.png_reflectivity.png b/assets/cubyz/blocks/textures/glow_crystal/yellow_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/glow_crystal/yellow.png_reflectivity.png rename to assets/cubyz/blocks/textures/glow_crystal/yellow_reflectivity.png diff --git a/assets/cubyz/blocks/textures/grass_vegetation.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/grass_vegetation.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/grass_vegetation.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/grass_vegetation.zig.zon diff --git a/assets/cubyz/blocks/textures/ice.png_reflectivity.png b/assets/cubyz/blocks/textures/ice_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/ice.png_reflectivity.png rename to assets/cubyz/blocks/textures/ice_reflectivity.png diff --git a/assets/cubyz/blocks/textures/iron_block.png_reflectivity.png b/assets/cubyz/blocks/textures/iron_block_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/iron_block.png_reflectivity.png rename to assets/cubyz/blocks/textures/iron_block_reflectivity.png diff --git a/assets/cubyz/blocks/textures/iron_ore.png_reflectivity.png b/assets/cubyz/blocks/textures/iron_ore_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/iron_ore.png_reflectivity.png rename to assets/cubyz/blocks/textures/iron_ore_reflectivity.png diff --git a/assets/cubyz/blocks/textures/lamp.png_emission.png b/assets/cubyz/blocks/textures/lamp_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/lamp.png_emission.png rename to assets/cubyz/blocks/textures/lamp_emission.png diff --git a/assets/cubyz/blocks/textures/lamp_top.png_emission.png b/assets/cubyz/blocks/textures/lamp_top_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/lamp_top.png_emission.png rename to assets/cubyz/blocks/textures/lamp_top_emission.png diff --git a/assets/cubyz/blocks/textures/lava.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/lava.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/lava.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/lava.zig.zon diff --git a/assets/cubyz/blocks/textures/lava.png_emission.png b/assets/cubyz/blocks/textures/lava_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/lava.png_emission.png rename to assets/cubyz/blocks/textures/lava_emission.png diff --git a/assets/cubyz/blocks/textures/lush_grass_vegetation.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/lush_grass_vegetation.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/lush_grass_vegetation.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/lush_grass_vegetation.zig.zon diff --git a/assets/cubyz/blocks/textures/magma.png_emission.png b/assets/cubyz/blocks/textures/magma_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/magma.png_emission.png rename to assets/cubyz/blocks/textures/magma_emission.png diff --git a/assets/cubyz/blocks/textures/torch.png_emission.png b/assets/cubyz/blocks/textures/torch_emission.png similarity index 100% rename from assets/cubyz/blocks/textures/torch.png_emission.png rename to assets/cubyz/blocks/textures/torch_emission.png diff --git a/assets/cubyz/blocks/textures/vetch.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/vetch.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/vetch.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/vetch.zig.zon diff --git a/assets/cubyz/blocks/textures/water.png_textureInfo.zig.zon b/assets/cubyz/blocks/textures/water.zig.zon similarity index 100% rename from assets/cubyz/blocks/textures/water.png_textureInfo.zig.zon rename to assets/cubyz/blocks/textures/water.zig.zon diff --git a/assets/cubyz/blocks/textures/water.png_absorption.png b/assets/cubyz/blocks/textures/water_absorption.png similarity index 100% rename from assets/cubyz/blocks/textures/water.png_absorption.png rename to assets/cubyz/blocks/textures/water_absorption.png diff --git a/assets/cubyz/blocks/textures/water.png_reflectivity.png b/assets/cubyz/blocks/textures/water_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/water.png_reflectivity.png rename to assets/cubyz/blocks/textures/water_reflectivity.png diff --git a/assets/cubyz/blocks/textures/workbench_side.png_reflectivity.png b/assets/cubyz/blocks/textures/workbench_side_reflectivity.png similarity index 100% rename from assets/cubyz/blocks/textures/workbench_side.png_reflectivity.png rename to assets/cubyz/blocks/textures/workbench_side_reflectivity.png diff --git a/src/blocks.zig b/src/blocks.zig index 36dffbb7..20fb10e8 100644 --- a/src/blocks.zig +++ b/src/blocks.zig @@ -498,16 +498,14 @@ pub const meshes = struct { // MARK: meshes return textureData[block.typ].textureIndices[orientation]; } - fn extendedPath(path: []const u8, pathBuffer: []u8, ending: []const u8) []const u8 { - std.debug.assert(path.ptr == pathBuffer.ptr); - @memcpy(pathBuffer[path.len..][0..ending.len], ending); - return pathBuffer[0..path.len+ending.len]; + fn extendedPath(_allocator: main.utils.NeverFailingAllocator, path: []const u8, ending: []const u8) []const u8 { + return std.fmt.allocPrint(_allocator.allocator, "{s}{s}", .{path, ending}) catch unreachable; } - fn readAuxillaryTexture(_path: []const u8, pathBuffer: []u8, ending: []const u8, default: Image) Image { - const path = extendedPath(_path, pathBuffer, ending); - const texture = Image.readFromFile(arenaForWorld.allocator(), path) catch default; - return texture; + fn readTextureFile(_path: []const u8, ending: []const u8, default: Image) Image { + const path = extendedPath(main.stackAllocator, _path, ending); + defer main.stackAllocator.free(path); + return Image.readFromFile(arenaForWorld.allocator(), path) catch default; } fn extractAnimationSlice(image: Image, frame: usize, frames: usize) Image { @@ -525,19 +523,18 @@ pub const meshes = struct { // MARK: meshes } fn readTextureData(_path: []const u8) void { - var buffer: [1024]u8 = undefined; - @memcpy(buffer[0.._path.len], _path); - const path = buffer[0.._path.len]; - const textureInfoPath = extendedPath(path, &buffer, "_textureInfo.zig.zon"); + const path = _path[0.._path.len - ".png".len]; + const textureInfoPath = extendedPath(main.stackAllocator, path, ".zig.zon"); + defer main.stackAllocator.free(textureInfoPath); const textureInfoZon = main.files.readToZon(main.stackAllocator, textureInfoPath) catch .null; defer textureInfoZon.deinit(main.stackAllocator); const animationFrames = textureInfoZon.get(u32, "frames", 1); const animationTime = textureInfoZon.get(u32, "time", 1); animation.append(.{.startFrame = @intCast(blockTextures.items.len), .frames = animationFrames, .time = animationTime}); - const base = Image.readFromFile(arenaForWorld.allocator(), path) catch Image.defaultImage; - const emission = readAuxillaryTexture(path, &buffer, "_emission.png", Image.emptyImage); - const reflectivity = readAuxillaryTexture(path, &buffer, "_reflectivity.png", Image.emptyImage); - const absorption = readAuxillaryTexture(path, &buffer, "_absorption.png", Image.whiteEmptyImage); + const base = readTextureFile(path, ".png", Image.defaultImage); + const emission = readTextureFile(path, "_emission.png", Image.emptyImage); + const reflectivity = readTextureFile(path, "_reflectivity.png", Image.emptyImage); + const absorption = readTextureFile(path, "_absorption.png", Image.whiteEmptyImage); for(0..animationFrames) |i| { blockTextures.append(extractAnimationSlice(base, i, animationFrames)); emissionTextures.append(extractAnimationSlice(emission, i, animationFrames));