mindustry logic execution, map- and schematic- parsing and rendering
variety begone
bendn 2023-07-31
parent 38f289c · commit 78ffb78
-rw-r--r--Cargo.toml2
-rw-r--r--assets/blocks/environment/arkyic-boulder.png (renamed from assets/blocks/environment/arkyic-boulder1.png)bin443 -> 443 bytes
-rw-r--r--assets/blocks/environment/arkyic-boulder2.pngbin428 -> 0 bytes
-rw-r--r--assets/blocks/environment/arkyic-boulder3.pngbin391 -> 0 bytes
-rw-r--r--assets/blocks/environment/arkyic-stone.png (renamed from assets/blocks/environment/arkyic-stone1.png)bin175 -> 175 bytes
-rw-r--r--assets/blocks/environment/arkyic-stone2.pngbin174 -> 0 bytes
-rw-r--r--assets/blocks/environment/arkyic-stone3.pngbin185 -> 0 bytes
-rw-r--r--assets/blocks/environment/arkyic-vent.png (renamed from assets/blocks/environment/arkyic-vent1.png)bin947 -> 947 bytes
-rw-r--r--assets/blocks/environment/arkyic-vent2.pngbin921 -> 0 bytes
-rw-r--r--assets/blocks/environment/arkyic-wall.png (renamed from assets/blocks/environment/arkyic-wall3.png)bin194 -> 194 bytes
-rw-r--r--assets/blocks/environment/arkyic-wall1.pngbin193 -> 0 bytes
-rw-r--r--assets/blocks/environment/arkyic-wall2.pngbin208 -> 0 bytes
-rw-r--r--assets/blocks/environment/basalt-boulder.png (renamed from assets/blocks/environment/basalt-boulder1.png)bin495 -> 495 bytes
-rw-r--r--assets/blocks/environment/basalt-boulder2.pngbin489 -> 0 bytes
-rw-r--r--assets/blocks/environment/basalt.png (renamed from assets/blocks/environment/basalt1.png)bin158 -> 158 bytes
-rw-r--r--assets/blocks/environment/basalt2.pngbin151 -> 0 bytes
-rw-r--r--assets/blocks/environment/basalt3.pngbin159 -> 0 bytes
-rw-r--r--assets/blocks/environment/beryllic-boulder.png (renamed from assets/blocks/environment/beryllic-boulder1.png)bin478 -> 478 bytes
-rw-r--r--assets/blocks/environment/beryllic-boulder2.pngbin484 -> 0 bytes
-rw-r--r--assets/blocks/environment/beryllic-stone-wall.png (renamed from assets/blocks/environment/beryllic-stone-wall2.png)bin210 -> 210 bytes
-rw-r--r--assets/blocks/environment/beryllic-stone-wall1.pngbin201 -> 0 bytes
-rw-r--r--assets/blocks/environment/beryllic-stone.png (renamed from assets/blocks/environment/beryllic-stone1.png)bin178 -> 178 bytes
-rw-r--r--assets/blocks/environment/beryllic-stone2.pngbin155 -> 0 bytes
-rw-r--r--assets/blocks/environment/beryllic-stone3.pngbin131 -> 0 bytes
-rw-r--r--assets/blocks/environment/beryllic-stone4.pngbin153 -> 0 bytes
-rw-r--r--assets/blocks/environment/bluemat.png (renamed from assets/blocks/environment/bluemat1.png)bin159 -> 159 bytes
-rw-r--r--assets/blocks/environment/bluemat2.pngbin176 -> 0 bytes
-rw-r--r--assets/blocks/environment/bluemat3.pngbin139 -> 0 bytes
-rw-r--r--assets/blocks/environment/boulder.png (renamed from assets/blocks/environment/boulder1.png)bin383 -> 383 bytes
-rw-r--r--assets/blocks/environment/boulder2.pngbin382 -> 0 bytes
-rw-r--r--assets/blocks/environment/carbon-boulder.png (renamed from assets/blocks/environment/carbon-boulder1.png)bin485 -> 485 bytes
-rw-r--r--assets/blocks/environment/carbon-boulder2.pngbin487 -> 0 bytes
-rw-r--r--assets/blocks/environment/carbon-stone.png (renamed from assets/blocks/environment/carbon-stone1.png)bin302 -> 302 bytes
-rw-r--r--assets/blocks/environment/carbon-stone2.pngbin131 -> 0 bytes
-rw-r--r--assets/blocks/environment/carbon-stone3.pngbin125 -> 0 bytes
-rw-r--r--assets/blocks/environment/carbon-stone4.pngbin288 -> 0 bytes
-rw-r--r--assets/blocks/environment/carbon-vent.png (renamed from assets/blocks/environment/carbon-vent1.png)bin924 -> 924 bytes
-rw-r--r--assets/blocks/environment/carbon-vent2.pngbin889 -> 0 bytes
-rw-r--r--assets/blocks/environment/carbon-wall.png (renamed from assets/blocks/environment/carbon-wall2.png)bin343 -> 343 bytes
-rw-r--r--assets/blocks/environment/carbon-wall1.pngbin351 -> 0 bytes
-rw-r--r--assets/blocks/environment/char.png (renamed from assets/blocks/environment/char1.png)bin221 -> 221 bytes
-rw-r--r--assets/blocks/environment/char2.pngbin196 -> 0 bytes
-rw-r--r--assets/blocks/environment/char3.pngbin220 -> 0 bytes
-rw-r--r--assets/blocks/environment/cliff0.pngbin366 -> 0 bytes
-rw-r--r--assets/blocks/environment/cliff1.pngbin221 -> 0 bytes
-rw-r--r--assets/blocks/environment/cliff2.pngbin355 -> 0 bytes
-rw-r--r--assets/blocks/environment/cliff3.pngbin228 -> 0 bytes
-rw-r--r--assets/blocks/environment/cliff4.pngbin249 -> 0 bytes
-rw-r--r--assets/blocks/environment/cliff5.pngbin330 -> 0 bytes
-rw-r--r--assets/blocks/environment/cliff6.pngbin235 -> 0 bytes
-rw-r--r--assets/blocks/environment/cliff7.pngbin223 -> 0 bytes
-rw-r--r--assets/blocks/environment/crater-stone.png (renamed from assets/blocks/environment/crater-stone1.png)bin214 -> 214 bytes
-rw-r--r--assets/blocks/environment/crater-stone2.pngbin191 -> 0 bytes
-rw-r--r--assets/blocks/environment/crater-stone3.pngbin203 -> 0 bytes
-rw-r--r--assets/blocks/environment/crater-stone4.pngbin205 -> 0 bytes
-rw-r--r--assets/blocks/environment/crater-stone5.pngbin140 -> 0 bytes
-rw-r--r--assets/blocks/environment/crater-stone6.pngbin139 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystal-blocks.png (renamed from assets/blocks/environment/crystal-blocks3.png)bin1028 -> 1028 bytes
-rw-r--r--assets/blocks/environment/crystal-blocks1.pngbin1670 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystal-blocks2.pngbin1318 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystal-cluster.png (renamed from assets/blocks/environment/crystal-cluster1.png)bin2441 -> 2441 bytes
-rw-r--r--assets/blocks/environment/crystal-cluster2.pngbin1340 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystal-cluster3.pngbin1209 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystal-floor.png (renamed from assets/blocks/environment/crystal-floor1.png)bin180 -> 180 bytes
-rw-r--r--assets/blocks/environment/crystal-floor2.pngbin157 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystal-floor3.pngbin178 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystal-floor4.pngbin181 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystal-orbs.png (renamed from assets/blocks/environment/crystal-orbs3.png)bin932 -> 932 bytes
-rw-r--r--assets/blocks/environment/crystal-orbs1.pngbin1134 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystal-orbs2.pngbin941 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystalline-boulder.png (renamed from assets/blocks/environment/crystalline-boulder1.png)bin459 -> 459 bytes
-rw-r--r--assets/blocks/environment/crystalline-boulder2.pngbin478 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystalline-stone-wall.png (renamed from assets/blocks/environment/crystalline-stone-wall4.png)bin191 -> 191 bytes
-rw-r--r--assets/blocks/environment/crystalline-stone-wall1.pngbin354 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystalline-stone-wall2.pngbin223 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystalline-stone-wall3.pngbin207 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystalline-stone.png (renamed from assets/blocks/environment/crystalline-stone1.png)bin165 -> 165 bytes
-rw-r--r--assets/blocks/environment/crystalline-stone2.pngbin157 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystalline-stone3.pngbin147 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystalline-stone4.pngbin140 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystalline-stone5.pngbin163 -> 0 bytes
-rw-r--r--assets/blocks/environment/crystalline-vent.png (renamed from assets/blocks/environment/crystalline-vent1.png)bin944 -> 944 bytes
-rw-r--r--assets/blocks/environment/crystalline-vent2.pngbin924 -> 0 bytes
-rw-r--r--assets/blocks/environment/dacite-boulder.png (renamed from assets/blocks/environment/dacite-boulder1.png)bin495 -> 495 bytes
-rw-r--r--assets/blocks/environment/dacite-boulder2.pngbin489 -> 0 bytes
-rw-r--r--assets/blocks/environment/dacite-wall.png (renamed from assets/blocks/environment/dacite-wall2.png)bin207 -> 207 bytes
-rw-r--r--assets/blocks/environment/dacite-wall1.pngbin200 -> 0 bytes
-rw-r--r--assets/blocks/environment/dacite.png (renamed from assets/blocks/environment/dacite1.png)bin172 -> 172 bytes
-rw-r--r--assets/blocks/environment/dacite2.pngbin157 -> 0 bytes
-rw-r--r--assets/blocks/environment/dacite3.pngbin162 -> 0 bytes
-rw-r--r--assets/blocks/environment/dark-metal.png (renamed from assets/blocks/environment/dark-metal2.png)bin263 -> 263 bytes
-rw-r--r--assets/blocks/environment/dark-metal1.pngbin159 -> 0 bytes
-rw-r--r--assets/blocks/environment/darksand.png (renamed from assets/blocks/environment/darksand3.png)bin158 -> 158 bytes
-rw-r--r--assets/blocks/environment/darksand1.pngbin148 -> 0 bytes
-rw-r--r--assets/blocks/environment/darksand2.pngbin170 -> 0 bytes
-rw-r--r--assets/blocks/environment/dense-red-stone.png (renamed from assets/blocks/environment/dense-red-stone1.png)bin202 -> 202 bytes
-rw-r--r--assets/blocks/environment/dense-red-stone2.pngbin206 -> 0 bytes
-rw-r--r--assets/blocks/environment/dense-red-stone3.pngbin199 -> 0 bytes
-rw-r--r--assets/blocks/environment/dense-red-stone4.pngbin163 -> 0 bytes
-rw-r--r--assets/blocks/environment/dirt-wall.png (renamed from assets/blocks/environment/dirt-wall2.png)bin197 -> 197 bytes
-rw-r--r--assets/blocks/environment/dirt-wall1.pngbin205 -> 0 bytes
-rw-r--r--assets/blocks/environment/dirt.png (renamed from assets/blocks/environment/dirt1.png)bin143 -> 143 bytes
-rw-r--r--assets/blocks/environment/dirt2.pngbin145 -> 0 bytes
-rw-r--r--assets/blocks/environment/dirt3.pngbin529 -> 0 bytes
-rw-r--r--assets/blocks/environment/dune-wall.png (renamed from assets/blocks/environment/dune-wall2.png)bin230 -> 230 bytes
-rw-r--r--assets/blocks/environment/dune-wall1.pngbin238 -> 0 bytes
-rw-r--r--assets/blocks/environment/ferric-boulder.png (renamed from assets/blocks/environment/ferric-boulder1.png)bin421 -> 421 bytes
-rw-r--r--assets/blocks/environment/ferric-boulder2.pngbin422 -> 0 bytes
-rw-r--r--assets/blocks/environment/ferric-craters.png (renamed from assets/blocks/environment/ferric-craters3.png)bin216 -> 216 bytes
-rw-r--r--assets/blocks/environment/ferric-craters1.pngbin230 -> 0 bytes
-rw-r--r--assets/blocks/environment/ferric-craters2.pngbin199 -> 0 bytes
-rw-r--r--assets/blocks/environment/ferric-stone-wall.png (renamed from assets/blocks/environment/ferric-stone-wall2.png)bin193 -> 193 bytes
-rw-r--r--assets/blocks/environment/ferric-stone-wall1.pngbin209 -> 0 bytes
-rw-r--r--assets/blocks/environment/ferric-stone.png (renamed from assets/blocks/environment/ferric-stone1.png)bin154 -> 154 bytes
-rw-r--r--assets/blocks/environment/ferric-stone2.pngbin144 -> 0 bytes
-rw-r--r--assets/blocks/environment/ferric-stone3.pngbin138 -> 0 bytes
-rw-r--r--assets/blocks/environment/ferric-stone4.pngbin166 -> 0 bytes
-rw-r--r--assets/blocks/environment/graphitic-wall.png (renamed from assets/blocks/environment/graphitic-wall3.png)bin384 -> 384 bytes
-rw-r--r--assets/blocks/environment/graphitic-wall1.pngbin423 -> 0 bytes
-rw-r--r--assets/blocks/environment/graphitic-wall2.pngbin418 -> 0 bytes
-rw-r--r--assets/blocks/environment/grass.png (renamed from assets/blocks/environment/grass3.png)bin152 -> 152 bytes
-rw-r--r--assets/blocks/environment/grass1.pngbin150 -> 0 bytes
-rw-r--r--assets/blocks/environment/grass2.pngbin141 -> 0 bytes
-rw-r--r--assets/blocks/environment/hotrock.png (renamed from assets/blocks/environment/hotrock3.png)bin225 -> 225 bytes
-rw-r--r--assets/blocks/environment/hotrock1.pngbin228 -> 0 bytes
-rw-r--r--assets/blocks/environment/hotrock2.pngbin245 -> 0 bytes
-rw-r--r--assets/blocks/environment/ice-snow.png (renamed from assets/blocks/environment/ice-snow3.png)bin363 -> 363 bytes
-rw-r--r--assets/blocks/environment/ice-snow1.pngbin410 -> 0 bytes
-rw-r--r--assets/blocks/environment/ice-snow2.pngbin422 -> 0 bytes
-rw-r--r--assets/blocks/environment/ice-wall.png (renamed from assets/blocks/environment/ice-wall2.png)bin235 -> 235 bytes
-rw-r--r--assets/blocks/environment/ice-wall1.pngbin218 -> 0 bytes
-rw-r--r--assets/blocks/environment/ice.png (renamed from assets/blocks/environment/ice1.png)bin184 -> 184 bytes
-rw-r--r--assets/blocks/environment/ice2.pngbin187 -> 0 bytes
-rw-r--r--assets/blocks/environment/ice3.pngbin180 -> 0 bytes
-rw-r--r--assets/blocks/environment/magmarock.png (renamed from assets/blocks/environment/magmarock3.png)bin262 -> 262 bytes
-rw-r--r--assets/blocks/environment/magmarock1.pngbin261 -> 0 bytes
-rw-r--r--assets/blocks/environment/magmarock2.pngbin256 -> 0 bytes
-rw-r--r--assets/blocks/environment/metal-floor-damaged.png (renamed from assets/blocks/environment/metal-floor-damaged3.png)bin216 -> 216 bytes
-rw-r--r--assets/blocks/environment/metal-floor-damaged1.pngbin220 -> 0 bytes
-rw-r--r--assets/blocks/environment/metal-floor-damaged2.pngbin220 -> 0 bytes
-rw-r--r--assets/blocks/environment/moss.png (renamed from assets/blocks/environment/moss3.png)bin167 -> 167 bytes
-rw-r--r--assets/blocks/environment/moss1.pngbin170 -> 0 bytes
-rw-r--r--assets/blocks/environment/moss2.pngbin164 -> 0 bytes
-rw-r--r--assets/blocks/environment/mud.png (renamed from assets/blocks/environment/mud3.png)bin1297 -> 1297 bytes
-rw-r--r--assets/blocks/environment/mud1.pngbin1297 -> 0 bytes
-rw-r--r--assets/blocks/environment/mud2.pngbin1286 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-beryllium.png (renamed from assets/blocks/environment/ore-beryllium3.png)bin203 -> 203 bytes
-rw-r--r--assets/blocks/environment/ore-beryllium1.pngbin207 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-beryllium2.pngbin223 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-coal.png (renamed from assets/blocks/environment/ore-coal3.png)bin253 -> 253 bytes
-rw-r--r--assets/blocks/environment/ore-coal1.pngbin294 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-coal2.pngbin292 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-copper.png (renamed from assets/blocks/environment/ore-copper1.png)bin293 -> 293 bytes
-rw-r--r--assets/blocks/environment/ore-copper2.pngbin297 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-copper3.pngbin286 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-crystal-thorium.png (renamed from assets/blocks/environment/ore-crystal-thorium3.png)bin208 -> 208 bytes
-rw-r--r--assets/blocks/environment/ore-crystal-thorium1.pngbin170 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-crystal-thorium2.pngbin221 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-lead.png (renamed from assets/blocks/environment/ore-lead3.png)bin255 -> 255 bytes
-rw-r--r--assets/blocks/environment/ore-lead1.pngbin276 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-lead2.pngbin260 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-scrap.png (renamed from assets/blocks/environment/ore-scrap2.png)bin290 -> 290 bytes
-rw-r--r--assets/blocks/environment/ore-scrap1.pngbin295 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-scrap3.pngbin278 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-thorium.png (renamed from assets/blocks/environment/ore-thorium3.png)bin255 -> 255 bytes
-rw-r--r--assets/blocks/environment/ore-thorium1.pngbin262 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-thorium2.pngbin255 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-titanium.png (renamed from assets/blocks/environment/ore-titanium3.png)bin255 -> 255 bytes
-rw-r--r--assets/blocks/environment/ore-titanium1.pngbin330 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-titanium2.pngbin323 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-tungsten.png (renamed from assets/blocks/environment/ore-tungsten3.png)bin202 -> 202 bytes
-rw-r--r--assets/blocks/environment/ore-tungsten1.pngbin211 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-tungsten2.pngbin195 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-wall-beryllium.png (renamed from assets/blocks/environment/ore-wall-beryllium3.png)bin196 -> 196 bytes
-rw-r--r--assets/blocks/environment/ore-wall-beryllium1.pngbin230 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-wall-beryllium2.pngbin199 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-wall-thorium.png (renamed from assets/blocks/environment/ore-wall-thorium3.png)bin211 -> 211 bytes
-rw-r--r--assets/blocks/environment/ore-wall-thorium1.pngbin190 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-wall-thorium2.pngbin201 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-wall-tungsten.png (renamed from assets/blocks/environment/ore-wall-tungsten3.png)bin219 -> 219 bytes
-rw-r--r--assets/blocks/environment/ore-wall-tungsten1.pngbin249 -> 0 bytes
-rw-r--r--assets/blocks/environment/ore-wall-tungsten2.pngbin217 -> 0 bytes
-rw-r--r--assets/blocks/environment/pebbles.png (renamed from assets/blocks/environment/pebbles3.png)bin224 -> 224 bytes
-rw-r--r--assets/blocks/environment/pebbles1.pngbin211 -> 0 bytes
-rw-r--r--assets/blocks/environment/pebbles2.pngbin231 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-diamond-wall.png (renamed from assets/blocks/environment/red-diamond-wall3.png)bin508 -> 508 bytes
-rw-r--r--assets/blocks/environment/red-diamond-wall1.pngbin494 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-diamond-wall2.pngbin488 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-ice-boulder.png (renamed from assets/blocks/environment/red-ice-boulder1.png)bin501 -> 501 bytes
-rw-r--r--assets/blocks/environment/red-ice-boulder2.pngbin478 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-ice-boulder3.pngbin455 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-ice-wall.png (renamed from assets/blocks/environment/red-ice-wall2.png)bin246 -> 246 bytes
-rw-r--r--assets/blocks/environment/red-ice-wall1.pngbin236 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-ice.png (renamed from assets/blocks/environment/red-ice1.png)bin200 -> 200 bytes
-rw-r--r--assets/blocks/environment/red-ice2.pngbin185 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-ice3.pngbin197 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-stone-boulder.png (renamed from assets/blocks/environment/red-stone-boulder1.png)bin419 -> 419 bytes
-rw-r--r--assets/blocks/environment/red-stone-boulder2.pngbin423 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-stone-boulder3.pngbin425 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-stone-boulder4.pngbin455 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-stone-vent.png (renamed from assets/blocks/environment/red-stone-vent1.png)bin944 -> 944 bytes
-rw-r--r--assets/blocks/environment/red-stone-vent2.pngbin924 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-stone-wall.png (renamed from assets/blocks/environment/red-stone-wall3.png)bin194 -> 194 bytes
-rw-r--r--assets/blocks/environment/red-stone-wall1.pngbin215 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-stone-wall2.pngbin200 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-stone.png (renamed from assets/blocks/environment/red-stone1.png)bin181 -> 181 bytes
-rw-r--r--assets/blocks/environment/red-stone2.pngbin166 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-stone3.pngbin149 -> 0 bytes
-rw-r--r--assets/blocks/environment/red-stone4.pngbin160 -> 0 bytes
-rw-r--r--assets/blocks/environment/redmat.png (renamed from assets/blocks/environment/redmat1.png)bin159 -> 159 bytes
-rw-r--r--assets/blocks/environment/redmat2.pngbin176 -> 0 bytes
-rw-r--r--assets/blocks/environment/redmat3.pngbin139 -> 0 bytes
-rw-r--r--assets/blocks/environment/redweed.png (renamed from assets/blocks/environment/redweed3.png)bin248 -> 248 bytes
-rw-r--r--assets/blocks/environment/redweed1.pngbin411 -> 0 bytes
-rw-r--r--assets/blocks/environment/redweed2.pngbin197 -> 0 bytes
-rw-r--r--assets/blocks/environment/regolith-wall.png (renamed from assets/blocks/environment/regolith-wall2.png)bin228 -> 228 bytes
-rw-r--r--assets/blocks/environment/regolith-wall1.pngbin221 -> 0 bytes
-rw-r--r--assets/blocks/environment/regolith.png (renamed from assets/blocks/environment/regolith3.png)bin164 -> 164 bytes
-rw-r--r--assets/blocks/environment/regolith1.pngbin141 -> 0 bytes
-rw-r--r--assets/blocks/environment/regolith2.pngbin181 -> 0 bytes
-rw-r--r--assets/blocks/environment/rhyolite-boulder.png (renamed from assets/blocks/environment/rhyolite-boulder1.png)bin460 -> 460 bytes
-rw-r--r--assets/blocks/environment/rhyolite-boulder2.pngbin443 -> 0 bytes
-rw-r--r--assets/blocks/environment/rhyolite-boulder3.pngbin442 -> 0 bytes
-rw-r--r--assets/blocks/environment/rhyolite-crater.png (renamed from assets/blocks/environment/rhyolite-crater1.png)bin607 -> 607 bytes
-rw-r--r--assets/blocks/environment/rhyolite-crater2.pngbin597 -> 0 bytes
-rw-r--r--assets/blocks/environment/rhyolite-crater3.pngbin604 -> 0 bytes
-rw-r--r--assets/blocks/environment/rhyolite-vent.png (renamed from assets/blocks/environment/rhyolite-vent1.png)bin890 -> 890 bytes
-rw-r--r--assets/blocks/environment/rhyolite-vent2.pngbin887 -> 0 bytes
-rw-r--r--assets/blocks/environment/rhyolite-wall.png (renamed from assets/blocks/environment/rhyolite-wall2.png)bin236 -> 236 bytes
-rw-r--r--assets/blocks/environment/rhyolite-wall1.pngbin228 -> 0 bytes
-rw-r--r--assets/blocks/environment/rhyolite.png (renamed from assets/blocks/environment/rhyolite1.png)bin576 -> 576 bytes
-rw-r--r--assets/blocks/environment/rhyolite2.pngbin559 -> 0 bytes
-rw-r--r--assets/blocks/environment/rhyolite3.pngbin559 -> 0 bytes
-rw-r--r--assets/blocks/environment/rough-rhyolite.png (renamed from assets/blocks/environment/rough-rhyolite1.png)bin163 -> 163 bytes
-rw-r--r--assets/blocks/environment/rough-rhyolite2.pngbin145 -> 0 bytes
-rw-r--r--assets/blocks/environment/rough-rhyolite3.pngbin138 -> 0 bytes
-rw-r--r--assets/blocks/environment/rough-rhyolite4.pngbin167 -> 0 bytes
-rw-r--r--assets/blocks/environment/salt-wall.png (renamed from assets/blocks/environment/salt-wall2.png)bin203 -> 203 bytes
-rw-r--r--assets/blocks/environment/salt-wall1.pngbin197 -> 0 bytes
-rw-r--r--assets/blocks/environment/sand-boulder.png (renamed from assets/blocks/environment/sand-boulder1.png)bin264 -> 264 bytes
-rw-r--r--assets/blocks/environment/sand-boulder2.pngbin260 -> 0 bytes
-rw-r--r--assets/blocks/environment/sand-floor.png (renamed from assets/blocks/environment/sand-floor1.png)bin156 -> 156 bytes
-rw-r--r--assets/blocks/environment/sand-floor2.pngbin171 -> 0 bytes
-rw-r--r--assets/blocks/environment/sand-floor3.pngbin158 -> 0 bytes
-rw-r--r--assets/blocks/environment/sand-wall.png (renamed from assets/blocks/environment/sand-wall2.png)bin216 -> 216 bytes
-rw-r--r--assets/blocks/environment/sand-wall1.pngbin229 -> 0 bytes
-rw-r--r--assets/blocks/environment/shale-boulder.png (renamed from assets/blocks/environment/shale-boulder1.png)bin264 -> 264 bytes
-rw-r--r--assets/blocks/environment/shale-boulder2.pngbin260 -> 0 bytes
-rw-r--r--assets/blocks/environment/shale-wall.png (renamed from assets/blocks/environment/shale-wall2.png)bin187 -> 187 bytes
-rw-r--r--assets/blocks/environment/shale-wall1.pngbin197 -> 0 bytes
-rw-r--r--assets/blocks/environment/shale.png (renamed from assets/blocks/environment/shale1.png)bin175 -> 175 bytes
-rw-r--r--assets/blocks/environment/shale2.pngbin173 -> 0 bytes
-rw-r--r--assets/blocks/environment/shale3.pngbin170 -> 0 bytes
-rw-r--r--assets/blocks/environment/shrubs.png (renamed from assets/blocks/environment/shrubs2.png)bin217 -> 217 bytes
-rw-r--r--assets/blocks/environment/shrubs1.pngbin216 -> 0 bytes
-rw-r--r--assets/blocks/environment/snow-boulder.png (renamed from assets/blocks/environment/snow-boulder1.png)bin398 -> 398 bytes
-rw-r--r--assets/blocks/environment/snow-boulder2.pngbin397 -> 0 bytes
-rw-r--r--assets/blocks/environment/snow-wall.png (renamed from assets/blocks/environment/snow-wall2.png)bin196 -> 196 bytes
-rw-r--r--assets/blocks/environment/snow-wall1.pngbin203 -> 0 bytes
-rw-r--r--assets/blocks/environment/snow.png (renamed from assets/blocks/environment/snow3.png)bin189 -> 189 bytes
-rw-r--r--assets/blocks/environment/snow1.pngbin195 -> 0 bytes
-rw-r--r--assets/blocks/environment/snow2.pngbin163 -> 0 bytes
-rw-r--r--assets/blocks/environment/spore-cluster.png (renamed from assets/blocks/environment/spore-cluster1.png)bin261 -> 261 bytes
-rw-r--r--assets/blocks/environment/spore-cluster2.pngbin285 -> 0 bytes
-rw-r--r--assets/blocks/environment/spore-cluster3.pngbin276 -> 0 bytes
-rw-r--r--assets/blocks/environment/spore-moss.png (renamed from assets/blocks/environment/spore-moss3.png)bin211 -> 211 bytes
-rw-r--r--assets/blocks/environment/spore-moss1.pngbin210 -> 0 bytes
-rw-r--r--assets/blocks/environment/spore-moss2.pngbin199 -> 0 bytes
-rw-r--r--assets/blocks/environment/spore-wall.png (renamed from assets/blocks/environment/spore-wall2.png)bin168 -> 168 bytes
-rw-r--r--assets/blocks/environment/spore-wall1.pngbin212 -> 0 bytes
-rw-r--r--assets/blocks/environment/stone-wall.png (renamed from assets/blocks/environment/stone-wall2.png)bin174 -> 174 bytes
-rw-r--r--assets/blocks/environment/stone-wall1.pngbin179 -> 0 bytes
-rw-r--r--assets/blocks/environment/stone.png (renamed from assets/blocks/environment/stone1.png)bin154 -> 154 bytes
-rw-r--r--assets/blocks/environment/stone2.pngbin145 -> 0 bytes
-rw-r--r--assets/blocks/environment/stone3.pngbin152 -> 0 bytes
-rw-r--r--assets/blocks/environment/tendrils.png (renamed from assets/blocks/environment/tendrils3.png)bin232 -> 232 bytes
-rw-r--r--assets/blocks/environment/tendrils1.pngbin239 -> 0 bytes
-rw-r--r--assets/blocks/environment/tendrils2.pngbin241 -> 0 bytes
-rw-r--r--assets/blocks/environment/vibrant-crystal-cluster.png (renamed from assets/blocks/environment/vibrant-crystal-cluster1.png)bin960 -> 960 bytes
-rw-r--r--assets/blocks/environment/vibrant-crystal-cluster2.pngbin1401 -> 0 bytes
-rw-r--r--assets/blocks/environment/vibrant-crystal-cluster3.pngbin1505 -> 0 bytes
-rw-r--r--assets/blocks/environment/yellow-stone-boulder.png (renamed from assets/blocks/environment/yellow-stone-boulder1.png)bin465 -> 465 bytes
-rw-r--r--assets/blocks/environment/yellow-stone-boulder2.pngbin486 -> 0 bytes
-rw-r--r--assets/blocks/environment/yellow-stone-plates.png (renamed from assets/blocks/environment/yellow-stone-plates3.png)bin179 -> 179 bytes
-rw-r--r--assets/blocks/environment/yellow-stone-plates1.pngbin180 -> 0 bytes
-rw-r--r--assets/blocks/environment/yellow-stone-plates2.pngbin173 -> 0 bytes
-rw-r--r--assets/blocks/environment/yellow-stone-vent.png (renamed from assets/blocks/environment/yellow-stone-vent1.png)bin942 -> 942 bytes
-rw-r--r--assets/blocks/environment/yellow-stone-vent2.pngbin894 -> 0 bytes
-rw-r--r--assets/blocks/environment/yellow-stone-wall.png (renamed from assets/blocks/environment/yellow-stone-wall2.png)bin196 -> 196 bytes
-rw-r--r--assets/blocks/environment/yellow-stone-wall1.pngbin213 -> 0 bytes
-rw-r--r--assets/blocks/environment/yellow-stone.png (renamed from assets/blocks/environment/yellow-stone1.png)bin153 -> 153 bytes
-rw-r--r--assets/blocks/environment/yellow-stone2.pngbin172 -> 0 bytes
-rw-r--r--assets/blocks/environment/yellow-stone3.pngbin137 -> 0 bytes
-rw-r--r--assets/blocks/environment/yellowcoral.pngbin492 -> 432 bytes
-rw-r--r--build.rs11
-rw-r--r--src/block/environment.rs374
-rw-r--r--src/block/walls.rs10
-rw-r--r--src/data/renderer.rs15
298 files changed, 204 insertions, 208 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 8b6af4d..58e4f9c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mindus"
-version = "1.4.7"
+version = "1.4.8"
edition = "2021"
description = "A library for working with mindustry data formats (eg schematics and maps) (fork of plandustry)"
authors = [
diff --git a/assets/blocks/environment/arkyic-boulder1.png b/assets/blocks/environment/arkyic-boulder.png
index de89b97..de89b97 100644
--- a/assets/blocks/environment/arkyic-boulder1.png
+++ b/assets/blocks/environment/arkyic-boulder.png
Binary files differ
diff --git a/assets/blocks/environment/arkyic-boulder2.png b/assets/blocks/environment/arkyic-boulder2.png
deleted file mode 100644
index f335755..0000000
--- a/assets/blocks/environment/arkyic-boulder2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/arkyic-boulder3.png b/assets/blocks/environment/arkyic-boulder3.png
deleted file mode 100644
index 23d8c87..0000000
--- a/assets/blocks/environment/arkyic-boulder3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/arkyic-stone1.png b/assets/blocks/environment/arkyic-stone.png
index 5f396a8..5f396a8 100644
--- a/assets/blocks/environment/arkyic-stone1.png
+++ b/assets/blocks/environment/arkyic-stone.png
Binary files differ
diff --git a/assets/blocks/environment/arkyic-stone2.png b/assets/blocks/environment/arkyic-stone2.png
deleted file mode 100644
index 69635ce..0000000
--- a/assets/blocks/environment/arkyic-stone2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/arkyic-stone3.png b/assets/blocks/environment/arkyic-stone3.png
deleted file mode 100644
index 4612d53..0000000
--- a/assets/blocks/environment/arkyic-stone3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/arkyic-vent1.png b/assets/blocks/environment/arkyic-vent.png
index 7c7cf86..7c7cf86 100644
--- a/assets/blocks/environment/arkyic-vent1.png
+++ b/assets/blocks/environment/arkyic-vent.png
Binary files differ
diff --git a/assets/blocks/environment/arkyic-vent2.png b/assets/blocks/environment/arkyic-vent2.png
deleted file mode 100644
index b964a5b..0000000
--- a/assets/blocks/environment/arkyic-vent2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/arkyic-wall3.png b/assets/blocks/environment/arkyic-wall.png
index 2977b20..2977b20 100644
--- a/assets/blocks/environment/arkyic-wall3.png
+++ b/assets/blocks/environment/arkyic-wall.png
Binary files differ
diff --git a/assets/blocks/environment/arkyic-wall1.png b/assets/blocks/environment/arkyic-wall1.png
deleted file mode 100644
index 73422f9..0000000
--- a/assets/blocks/environment/arkyic-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/arkyic-wall2.png b/assets/blocks/environment/arkyic-wall2.png
deleted file mode 100644
index 8fec6df..0000000
--- a/assets/blocks/environment/arkyic-wall2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/basalt-boulder1.png b/assets/blocks/environment/basalt-boulder.png
index 84f8b08..84f8b08 100644
--- a/assets/blocks/environment/basalt-boulder1.png
+++ b/assets/blocks/environment/basalt-boulder.png
Binary files differ
diff --git a/assets/blocks/environment/basalt-boulder2.png b/assets/blocks/environment/basalt-boulder2.png
deleted file mode 100644
index 74385fc..0000000
--- a/assets/blocks/environment/basalt-boulder2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/basalt1.png b/assets/blocks/environment/basalt.png
index 3f3f661..3f3f661 100644
--- a/assets/blocks/environment/basalt1.png
+++ b/assets/blocks/environment/basalt.png
Binary files differ
diff --git a/assets/blocks/environment/basalt2.png b/assets/blocks/environment/basalt2.png
deleted file mode 100644
index a0d15a7..0000000
--- a/assets/blocks/environment/basalt2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/basalt3.png b/assets/blocks/environment/basalt3.png
deleted file mode 100644
index 84ec581..0000000
--- a/assets/blocks/environment/basalt3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/beryllic-boulder1.png b/assets/blocks/environment/beryllic-boulder.png
index 373d318..373d318 100644
--- a/assets/blocks/environment/beryllic-boulder1.png
+++ b/assets/blocks/environment/beryllic-boulder.png
Binary files differ
diff --git a/assets/blocks/environment/beryllic-boulder2.png b/assets/blocks/environment/beryllic-boulder2.png
deleted file mode 100644
index c7d9023..0000000
--- a/assets/blocks/environment/beryllic-boulder2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/beryllic-stone-wall2.png b/assets/blocks/environment/beryllic-stone-wall.png
index 081d262..081d262 100644
--- a/assets/blocks/environment/beryllic-stone-wall2.png
+++ b/assets/blocks/environment/beryllic-stone-wall.png
Binary files differ
diff --git a/assets/blocks/environment/beryllic-stone-wall1.png b/assets/blocks/environment/beryllic-stone-wall1.png
deleted file mode 100644
index 5203226..0000000
--- a/assets/blocks/environment/beryllic-stone-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/beryllic-stone1.png b/assets/blocks/environment/beryllic-stone.png
index 6a6720a..6a6720a 100644
--- a/assets/blocks/environment/beryllic-stone1.png
+++ b/assets/blocks/environment/beryllic-stone.png
Binary files differ
diff --git a/assets/blocks/environment/beryllic-stone2.png b/assets/blocks/environment/beryllic-stone2.png
deleted file mode 100644
index a36e7f0..0000000
--- a/assets/blocks/environment/beryllic-stone2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/beryllic-stone3.png b/assets/blocks/environment/beryllic-stone3.png
deleted file mode 100644
index 296e28c..0000000
--- a/assets/blocks/environment/beryllic-stone3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/beryllic-stone4.png b/assets/blocks/environment/beryllic-stone4.png
deleted file mode 100644
index 4bafe00..0000000
--- a/assets/blocks/environment/beryllic-stone4.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/bluemat1.png b/assets/blocks/environment/bluemat.png
index afdaeb2..afdaeb2 100644
--- a/assets/blocks/environment/bluemat1.png
+++ b/assets/blocks/environment/bluemat.png
Binary files differ
diff --git a/assets/blocks/environment/bluemat2.png b/assets/blocks/environment/bluemat2.png
deleted file mode 100644
index 80de0a5..0000000
--- a/assets/blocks/environment/bluemat2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/bluemat3.png b/assets/blocks/environment/bluemat3.png
deleted file mode 100644
index befb65d..0000000
--- a/assets/blocks/environment/bluemat3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/boulder1.png b/assets/blocks/environment/boulder.png
index 73540ec..73540ec 100644
--- a/assets/blocks/environment/boulder1.png
+++ b/assets/blocks/environment/boulder.png
Binary files differ
diff --git a/assets/blocks/environment/boulder2.png b/assets/blocks/environment/boulder2.png
deleted file mode 100644
index e8d718d..0000000
--- a/assets/blocks/environment/boulder2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/carbon-boulder1.png b/assets/blocks/environment/carbon-boulder.png
index 48c8efc..48c8efc 100644
--- a/assets/blocks/environment/carbon-boulder1.png
+++ b/assets/blocks/environment/carbon-boulder.png
Binary files differ
diff --git a/assets/blocks/environment/carbon-boulder2.png b/assets/blocks/environment/carbon-boulder2.png
deleted file mode 100644
index 041c6e7..0000000
--- a/assets/blocks/environment/carbon-boulder2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/carbon-stone1.png b/assets/blocks/environment/carbon-stone.png
index e212bb9..e212bb9 100644
--- a/assets/blocks/environment/carbon-stone1.png
+++ b/assets/blocks/environment/carbon-stone.png
Binary files differ
diff --git a/assets/blocks/environment/carbon-stone2.png b/assets/blocks/environment/carbon-stone2.png
deleted file mode 100644
index c140233..0000000
--- a/assets/blocks/environment/carbon-stone2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/carbon-stone3.png b/assets/blocks/environment/carbon-stone3.png
deleted file mode 100644
index 445d6b4..0000000
--- a/assets/blocks/environment/carbon-stone3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/carbon-stone4.png b/assets/blocks/environment/carbon-stone4.png
deleted file mode 100644
index 95ffd5b..0000000
--- a/assets/blocks/environment/carbon-stone4.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/carbon-vent1.png b/assets/blocks/environment/carbon-vent.png
index 20b2eac..20b2eac 100644
--- a/assets/blocks/environment/carbon-vent1.png
+++ b/assets/blocks/environment/carbon-vent.png
Binary files differ
diff --git a/assets/blocks/environment/carbon-vent2.png b/assets/blocks/environment/carbon-vent2.png
deleted file mode 100644
index abbb51c..0000000
--- a/assets/blocks/environment/carbon-vent2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/carbon-wall2.png b/assets/blocks/environment/carbon-wall.png
index 92a5e81..92a5e81 100644
--- a/assets/blocks/environment/carbon-wall2.png
+++ b/assets/blocks/environment/carbon-wall.png
Binary files differ
diff --git a/assets/blocks/environment/carbon-wall1.png b/assets/blocks/environment/carbon-wall1.png
deleted file mode 100644
index b5da977..0000000
--- a/assets/blocks/environment/carbon-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/char1.png b/assets/blocks/environment/char.png
index c6340ed..c6340ed 100644
--- a/assets/blocks/environment/char1.png
+++ b/assets/blocks/environment/char.png
Binary files differ
diff --git a/assets/blocks/environment/char2.png b/assets/blocks/environment/char2.png
deleted file mode 100644
index ac75f22..0000000
--- a/assets/blocks/environment/char2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/char3.png b/assets/blocks/environment/char3.png
deleted file mode 100644
index 3e4c58d..0000000
--- a/assets/blocks/environment/char3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/cliff0.png b/assets/blocks/environment/cliff0.png
deleted file mode 100644
index 4fcf45e..0000000
--- a/assets/blocks/environment/cliff0.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/cliff1.png b/assets/blocks/environment/cliff1.png
deleted file mode 100644
index 2cc6e8e..0000000
--- a/assets/blocks/environment/cliff1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/cliff2.png b/assets/blocks/environment/cliff2.png
deleted file mode 100644
index 0b05080..0000000
--- a/assets/blocks/environment/cliff2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/cliff3.png b/assets/blocks/environment/cliff3.png
deleted file mode 100644
index db091ff..0000000
--- a/assets/blocks/environment/cliff3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/cliff4.png b/assets/blocks/environment/cliff4.png
deleted file mode 100644
index db8bddc..0000000
--- a/assets/blocks/environment/cliff4.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/cliff5.png b/assets/blocks/environment/cliff5.png
deleted file mode 100644
index 2a15ee0..0000000
--- a/assets/blocks/environment/cliff5.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/cliff6.png b/assets/blocks/environment/cliff6.png
deleted file mode 100644
index e5933db..0000000
--- a/assets/blocks/environment/cliff6.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/cliff7.png b/assets/blocks/environment/cliff7.png
deleted file mode 100644
index d2db6af..0000000
--- a/assets/blocks/environment/cliff7.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crater-stone1.png b/assets/blocks/environment/crater-stone.png
index b9aa42f..b9aa42f 100644
--- a/assets/blocks/environment/crater-stone1.png
+++ b/assets/blocks/environment/crater-stone.png
Binary files differ
diff --git a/assets/blocks/environment/crater-stone2.png b/assets/blocks/environment/crater-stone2.png
deleted file mode 100644
index c065a32..0000000
--- a/assets/blocks/environment/crater-stone2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crater-stone3.png b/assets/blocks/environment/crater-stone3.png
deleted file mode 100644
index 37931ce..0000000
--- a/assets/blocks/environment/crater-stone3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crater-stone4.png b/assets/blocks/environment/crater-stone4.png
deleted file mode 100644
index efefa5f..0000000
--- a/assets/blocks/environment/crater-stone4.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crater-stone5.png b/assets/blocks/environment/crater-stone5.png
deleted file mode 100644
index 966daac..0000000
--- a/assets/blocks/environment/crater-stone5.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crater-stone6.png b/assets/blocks/environment/crater-stone6.png
deleted file mode 100644
index 3c478f7..0000000
--- a/assets/blocks/environment/crater-stone6.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystal-blocks3.png b/assets/blocks/environment/crystal-blocks.png
index d66a7df..d66a7df 100644
--- a/assets/blocks/environment/crystal-blocks3.png
+++ b/assets/blocks/environment/crystal-blocks.png
Binary files differ
diff --git a/assets/blocks/environment/crystal-blocks1.png b/assets/blocks/environment/crystal-blocks1.png
deleted file mode 100644
index bbc4bc6..0000000
--- a/assets/blocks/environment/crystal-blocks1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystal-blocks2.png b/assets/blocks/environment/crystal-blocks2.png
deleted file mode 100644
index 3332e88..0000000
--- a/assets/blocks/environment/crystal-blocks2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystal-cluster1.png b/assets/blocks/environment/crystal-cluster.png
index 8c982a2..8c982a2 100644
--- a/assets/blocks/environment/crystal-cluster1.png
+++ b/assets/blocks/environment/crystal-cluster.png
Binary files differ
diff --git a/assets/blocks/environment/crystal-cluster2.png b/assets/blocks/environment/crystal-cluster2.png
deleted file mode 100644
index e621ff3..0000000
--- a/assets/blocks/environment/crystal-cluster2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystal-cluster3.png b/assets/blocks/environment/crystal-cluster3.png
deleted file mode 100644
index f5953ad..0000000
--- a/assets/blocks/environment/crystal-cluster3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystal-floor1.png b/assets/blocks/environment/crystal-floor.png
index 4ff6b86..4ff6b86 100644
--- a/assets/blocks/environment/crystal-floor1.png
+++ b/assets/blocks/environment/crystal-floor.png
Binary files differ
diff --git a/assets/blocks/environment/crystal-floor2.png b/assets/blocks/environment/crystal-floor2.png
deleted file mode 100644
index 545c355..0000000
--- a/assets/blocks/environment/crystal-floor2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystal-floor3.png b/assets/blocks/environment/crystal-floor3.png
deleted file mode 100644
index 824898f..0000000
--- a/assets/blocks/environment/crystal-floor3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystal-floor4.png b/assets/blocks/environment/crystal-floor4.png
deleted file mode 100644
index 3ed7a8b..0000000
--- a/assets/blocks/environment/crystal-floor4.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystal-orbs3.png b/assets/blocks/environment/crystal-orbs.png
index 8545e00..8545e00 100644
--- a/assets/blocks/environment/crystal-orbs3.png
+++ b/assets/blocks/environment/crystal-orbs.png
Binary files differ
diff --git a/assets/blocks/environment/crystal-orbs1.png b/assets/blocks/environment/crystal-orbs1.png
deleted file mode 100644
index 43e1578..0000000
--- a/assets/blocks/environment/crystal-orbs1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystal-orbs2.png b/assets/blocks/environment/crystal-orbs2.png
deleted file mode 100644
index 3745880..0000000
--- a/assets/blocks/environment/crystal-orbs2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystalline-boulder1.png b/assets/blocks/environment/crystalline-boulder.png
index 59d0a9b..59d0a9b 100644
--- a/assets/blocks/environment/crystalline-boulder1.png
+++ b/assets/blocks/environment/crystalline-boulder.png
Binary files differ
diff --git a/assets/blocks/environment/crystalline-boulder2.png b/assets/blocks/environment/crystalline-boulder2.png
deleted file mode 100644
index 6a1aba6..0000000
--- a/assets/blocks/environment/crystalline-boulder2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystalline-stone-wall4.png b/assets/blocks/environment/crystalline-stone-wall.png
index d5c25db..d5c25db 100644
--- a/assets/blocks/environment/crystalline-stone-wall4.png
+++ b/assets/blocks/environment/crystalline-stone-wall.png
Binary files differ
diff --git a/assets/blocks/environment/crystalline-stone-wall1.png b/assets/blocks/environment/crystalline-stone-wall1.png
deleted file mode 100644
index a24f062..0000000
--- a/assets/blocks/environment/crystalline-stone-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystalline-stone-wall2.png b/assets/blocks/environment/crystalline-stone-wall2.png
deleted file mode 100644
index aea3334..0000000
--- a/assets/blocks/environment/crystalline-stone-wall2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystalline-stone-wall3.png b/assets/blocks/environment/crystalline-stone-wall3.png
deleted file mode 100644
index 6a4c548..0000000
--- a/assets/blocks/environment/crystalline-stone-wall3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystalline-stone1.png b/assets/blocks/environment/crystalline-stone.png
index 01fe740..01fe740 100644
--- a/assets/blocks/environment/crystalline-stone1.png
+++ b/assets/blocks/environment/crystalline-stone.png
Binary files differ
diff --git a/assets/blocks/environment/crystalline-stone2.png b/assets/blocks/environment/crystalline-stone2.png
deleted file mode 100644
index 8416c56..0000000
--- a/assets/blocks/environment/crystalline-stone2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystalline-stone3.png b/assets/blocks/environment/crystalline-stone3.png
deleted file mode 100644
index f6f3623..0000000
--- a/assets/blocks/environment/crystalline-stone3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystalline-stone4.png b/assets/blocks/environment/crystalline-stone4.png
deleted file mode 100644
index 72993a0..0000000
--- a/assets/blocks/environment/crystalline-stone4.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystalline-stone5.png b/assets/blocks/environment/crystalline-stone5.png
deleted file mode 100644
index dde1c75..0000000
--- a/assets/blocks/environment/crystalline-stone5.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/crystalline-vent1.png b/assets/blocks/environment/crystalline-vent.png
index 469ccce..469ccce 100644
--- a/assets/blocks/environment/crystalline-vent1.png
+++ b/assets/blocks/environment/crystalline-vent.png
Binary files differ
diff --git a/assets/blocks/environment/crystalline-vent2.png b/assets/blocks/environment/crystalline-vent2.png
deleted file mode 100644
index 0dd9122..0000000
--- a/assets/blocks/environment/crystalline-vent2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/dacite-boulder1.png b/assets/blocks/environment/dacite-boulder.png
index d7df113..d7df113 100644
--- a/assets/blocks/environment/dacite-boulder1.png
+++ b/assets/blocks/environment/dacite-boulder.png
Binary files differ
diff --git a/assets/blocks/environment/dacite-boulder2.png b/assets/blocks/environment/dacite-boulder2.png
deleted file mode 100644
index 12bd919..0000000
--- a/assets/blocks/environment/dacite-boulder2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/dacite-wall2.png b/assets/blocks/environment/dacite-wall.png
index a4bae3e..a4bae3e 100644
--- a/assets/blocks/environment/dacite-wall2.png
+++ b/assets/blocks/environment/dacite-wall.png
Binary files differ
diff --git a/assets/blocks/environment/dacite-wall1.png b/assets/blocks/environment/dacite-wall1.png
deleted file mode 100644
index d4fa161..0000000
--- a/assets/blocks/environment/dacite-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/dacite1.png b/assets/blocks/environment/dacite.png
index 470473a..470473a 100644
--- a/assets/blocks/environment/dacite1.png
+++ b/assets/blocks/environment/dacite.png
Binary files differ
diff --git a/assets/blocks/environment/dacite2.png b/assets/blocks/environment/dacite2.png
deleted file mode 100644
index af342c7..0000000
--- a/assets/blocks/environment/dacite2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/dacite3.png b/assets/blocks/environment/dacite3.png
deleted file mode 100644
index aed69ab..0000000
--- a/assets/blocks/environment/dacite3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/dark-metal2.png b/assets/blocks/environment/dark-metal.png
index 207575a..207575a 100644
--- a/assets/blocks/environment/dark-metal2.png
+++ b/assets/blocks/environment/dark-metal.png
Binary files differ
diff --git a/assets/blocks/environment/dark-metal1.png b/assets/blocks/environment/dark-metal1.png
deleted file mode 100644
index c284e63..0000000
--- a/assets/blocks/environment/dark-metal1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/darksand3.png b/assets/blocks/environment/darksand.png
index 7c6958b..7c6958b 100644
--- a/assets/blocks/environment/darksand3.png
+++ b/assets/blocks/environment/darksand.png
Binary files differ
diff --git a/assets/blocks/environment/darksand1.png b/assets/blocks/environment/darksand1.png
deleted file mode 100644
index 78c8686..0000000
--- a/assets/blocks/environment/darksand1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/darksand2.png b/assets/blocks/environment/darksand2.png
deleted file mode 100644
index 6d65763..0000000
--- a/assets/blocks/environment/darksand2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/dense-red-stone1.png b/assets/blocks/environment/dense-red-stone.png
index ad1a3d4..ad1a3d4 100644
--- a/assets/blocks/environment/dense-red-stone1.png
+++ b/assets/blocks/environment/dense-red-stone.png
Binary files differ
diff --git a/assets/blocks/environment/dense-red-stone2.png b/assets/blocks/environment/dense-red-stone2.png
deleted file mode 100644
index 328f828..0000000
--- a/assets/blocks/environment/dense-red-stone2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/dense-red-stone3.png b/assets/blocks/environment/dense-red-stone3.png
deleted file mode 100644
index 990ae5a..0000000
--- a/assets/blocks/environment/dense-red-stone3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/dense-red-stone4.png b/assets/blocks/environment/dense-red-stone4.png
deleted file mode 100644
index 0dbcdd3..0000000
--- a/assets/blocks/environment/dense-red-stone4.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/dirt-wall2.png b/assets/blocks/environment/dirt-wall.png
index f76d30d..f76d30d 100644
--- a/assets/blocks/environment/dirt-wall2.png
+++ b/assets/blocks/environment/dirt-wall.png
Binary files differ
diff --git a/assets/blocks/environment/dirt-wall1.png b/assets/blocks/environment/dirt-wall1.png
deleted file mode 100644
index 7b12028..0000000
--- a/assets/blocks/environment/dirt-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/dirt1.png b/assets/blocks/environment/dirt.png
index 1f2b788..1f2b788 100644
--- a/assets/blocks/environment/dirt1.png
+++ b/assets/blocks/environment/dirt.png
Binary files differ
diff --git a/assets/blocks/environment/dirt2.png b/assets/blocks/environment/dirt2.png
deleted file mode 100644
index e4aa286..0000000
--- a/assets/blocks/environment/dirt2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/dirt3.png b/assets/blocks/environment/dirt3.png
deleted file mode 100644
index fe7e5af..0000000
--- a/assets/blocks/environment/dirt3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/dune-wall2.png b/assets/blocks/environment/dune-wall.png
index 22341de..22341de 100644
--- a/assets/blocks/environment/dune-wall2.png
+++ b/assets/blocks/environment/dune-wall.png
Binary files differ
diff --git a/assets/blocks/environment/dune-wall1.png b/assets/blocks/environment/dune-wall1.png
deleted file mode 100644
index b2da4af..0000000
--- a/assets/blocks/environment/dune-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ferric-boulder1.png b/assets/blocks/environment/ferric-boulder.png
index e7221a8..e7221a8 100644
--- a/assets/blocks/environment/ferric-boulder1.png
+++ b/assets/blocks/environment/ferric-boulder.png
Binary files differ
diff --git a/assets/blocks/environment/ferric-boulder2.png b/assets/blocks/environment/ferric-boulder2.png
deleted file mode 100644
index 6332eaf..0000000
--- a/assets/blocks/environment/ferric-boulder2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ferric-craters3.png b/assets/blocks/environment/ferric-craters.png
index 83155f5..83155f5 100644
--- a/assets/blocks/environment/ferric-craters3.png
+++ b/assets/blocks/environment/ferric-craters.png
Binary files differ
diff --git a/assets/blocks/environment/ferric-craters1.png b/assets/blocks/environment/ferric-craters1.png
deleted file mode 100644
index 103f0e4..0000000
--- a/assets/blocks/environment/ferric-craters1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ferric-craters2.png b/assets/blocks/environment/ferric-craters2.png
deleted file mode 100644
index 6e712fd..0000000
--- a/assets/blocks/environment/ferric-craters2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ferric-stone-wall2.png b/assets/blocks/environment/ferric-stone-wall.png
index fac2fcc..fac2fcc 100644
--- a/assets/blocks/environment/ferric-stone-wall2.png
+++ b/assets/blocks/environment/ferric-stone-wall.png
Binary files differ
diff --git a/assets/blocks/environment/ferric-stone-wall1.png b/assets/blocks/environment/ferric-stone-wall1.png
deleted file mode 100644
index 2590d73..0000000
--- a/assets/blocks/environment/ferric-stone-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ferric-stone1.png b/assets/blocks/environment/ferric-stone.png
index 2dabf3d..2dabf3d 100644
--- a/assets/blocks/environment/ferric-stone1.png
+++ b/assets/blocks/environment/ferric-stone.png
Binary files differ
diff --git a/assets/blocks/environment/ferric-stone2.png b/assets/blocks/environment/ferric-stone2.png
deleted file mode 100644
index a5f48d6..0000000
--- a/assets/blocks/environment/ferric-stone2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ferric-stone3.png b/assets/blocks/environment/ferric-stone3.png
deleted file mode 100644
index beb80c0..0000000
--- a/assets/blocks/environment/ferric-stone3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ferric-stone4.png b/assets/blocks/environment/ferric-stone4.png
deleted file mode 100644
index f3ad430..0000000
--- a/assets/blocks/environment/ferric-stone4.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/graphitic-wall3.png b/assets/blocks/environment/graphitic-wall.png
index 0d5bbfa..0d5bbfa 100644
--- a/assets/blocks/environment/graphitic-wall3.png
+++ b/assets/blocks/environment/graphitic-wall.png
Binary files differ
diff --git a/assets/blocks/environment/graphitic-wall1.png b/assets/blocks/environment/graphitic-wall1.png
deleted file mode 100644
index 61fe4e5..0000000
--- a/assets/blocks/environment/graphitic-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/graphitic-wall2.png b/assets/blocks/environment/graphitic-wall2.png
deleted file mode 100644
index 2566e6f..0000000
--- a/assets/blocks/environment/graphitic-wall2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/grass3.png b/assets/blocks/environment/grass.png
index 662dc7b..662dc7b 100644
--- a/assets/blocks/environment/grass3.png
+++ b/assets/blocks/environment/grass.png
Binary files differ
diff --git a/assets/blocks/environment/grass1.png b/assets/blocks/environment/grass1.png
deleted file mode 100644
index a30ba8f..0000000
--- a/assets/blocks/environment/grass1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/grass2.png b/assets/blocks/environment/grass2.png
deleted file mode 100644
index f9f29f9..0000000
--- a/assets/blocks/environment/grass2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/hotrock3.png b/assets/blocks/environment/hotrock.png
index 1aa6bb3..1aa6bb3 100644
--- a/assets/blocks/environment/hotrock3.png
+++ b/assets/blocks/environment/hotrock.png
Binary files differ
diff --git a/assets/blocks/environment/hotrock1.png b/assets/blocks/environment/hotrock1.png
deleted file mode 100644
index c4b90b7..0000000
--- a/assets/blocks/environment/hotrock1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/hotrock2.png b/assets/blocks/environment/hotrock2.png
deleted file mode 100644
index da803a3..0000000
--- a/assets/blocks/environment/hotrock2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ice-snow3.png b/assets/blocks/environment/ice-snow.png
index 3711749..3711749 100644
--- a/assets/blocks/environment/ice-snow3.png
+++ b/assets/blocks/environment/ice-snow.png
Binary files differ
diff --git a/assets/blocks/environment/ice-snow1.png b/assets/blocks/environment/ice-snow1.png
deleted file mode 100644
index cad0be5..0000000
--- a/assets/blocks/environment/ice-snow1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ice-snow2.png b/assets/blocks/environment/ice-snow2.png
deleted file mode 100644
index 3e6c2d5..0000000
--- a/assets/blocks/environment/ice-snow2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ice-wall2.png b/assets/blocks/environment/ice-wall.png
index 3e38dbc..3e38dbc 100644
--- a/assets/blocks/environment/ice-wall2.png
+++ b/assets/blocks/environment/ice-wall.png
Binary files differ
diff --git a/assets/blocks/environment/ice-wall1.png b/assets/blocks/environment/ice-wall1.png
deleted file mode 100644
index 8ace1e7..0000000
--- a/assets/blocks/environment/ice-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ice1.png b/assets/blocks/environment/ice.png
index 664678d..664678d 100644
--- a/assets/blocks/environment/ice1.png
+++ b/assets/blocks/environment/ice.png
Binary files differ
diff --git a/assets/blocks/environment/ice2.png b/assets/blocks/environment/ice2.png
deleted file mode 100644
index 8663f9b..0000000
--- a/assets/blocks/environment/ice2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ice3.png b/assets/blocks/environment/ice3.png
deleted file mode 100644
index 31583a4..0000000
--- a/assets/blocks/environment/ice3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/magmarock3.png b/assets/blocks/environment/magmarock.png
index 45626c1..45626c1 100644
--- a/assets/blocks/environment/magmarock3.png
+++ b/assets/blocks/environment/magmarock.png
Binary files differ
diff --git a/assets/blocks/environment/magmarock1.png b/assets/blocks/environment/magmarock1.png
deleted file mode 100644
index 591583d..0000000
--- a/assets/blocks/environment/magmarock1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/magmarock2.png b/assets/blocks/environment/magmarock2.png
deleted file mode 100644
index a6d9b2f..0000000
--- a/assets/blocks/environment/magmarock2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/metal-floor-damaged3.png b/assets/blocks/environment/metal-floor-damaged.png
index 5f60992..5f60992 100644
--- a/assets/blocks/environment/metal-floor-damaged3.png
+++ b/assets/blocks/environment/metal-floor-damaged.png
Binary files differ
diff --git a/assets/blocks/environment/metal-floor-damaged1.png b/assets/blocks/environment/metal-floor-damaged1.png
deleted file mode 100644
index 048db75..0000000
--- a/assets/blocks/environment/metal-floor-damaged1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/metal-floor-damaged2.png b/assets/blocks/environment/metal-floor-damaged2.png
deleted file mode 100644
index 79c6a52..0000000
--- a/assets/blocks/environment/metal-floor-damaged2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/moss3.png b/assets/blocks/environment/moss.png
index a835175..a835175 100644
--- a/assets/blocks/environment/moss3.png
+++ b/assets/blocks/environment/moss.png
Binary files differ
diff --git a/assets/blocks/environment/moss1.png b/assets/blocks/environment/moss1.png
deleted file mode 100644
index 194828d..0000000
--- a/assets/blocks/environment/moss1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/moss2.png b/assets/blocks/environment/moss2.png
deleted file mode 100644
index b03facd..0000000
--- a/assets/blocks/environment/moss2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/mud3.png b/assets/blocks/environment/mud.png
index 834c1ee..834c1ee 100644
--- a/assets/blocks/environment/mud3.png
+++ b/assets/blocks/environment/mud.png
Binary files differ
diff --git a/assets/blocks/environment/mud1.png b/assets/blocks/environment/mud1.png
deleted file mode 100644
index 87922c1..0000000
--- a/assets/blocks/environment/mud1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/mud2.png b/assets/blocks/environment/mud2.png
deleted file mode 100644
index 5dc88fd..0000000
--- a/assets/blocks/environment/mud2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-beryllium3.png b/assets/blocks/environment/ore-beryllium.png
index f44c8aa..f44c8aa 100644
--- a/assets/blocks/environment/ore-beryllium3.png
+++ b/assets/blocks/environment/ore-beryllium.png
Binary files differ
diff --git a/assets/blocks/environment/ore-beryllium1.png b/assets/blocks/environment/ore-beryllium1.png
deleted file mode 100644
index b8340b0..0000000
--- a/assets/blocks/environment/ore-beryllium1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-beryllium2.png b/assets/blocks/environment/ore-beryllium2.png
deleted file mode 100644
index d64d038..0000000
--- a/assets/blocks/environment/ore-beryllium2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-coal3.png b/assets/blocks/environment/ore-coal.png
index 1c81d5f..1c81d5f 100644
--- a/assets/blocks/environment/ore-coal3.png
+++ b/assets/blocks/environment/ore-coal.png
Binary files differ
diff --git a/assets/blocks/environment/ore-coal1.png b/assets/blocks/environment/ore-coal1.png
deleted file mode 100644
index 515247b..0000000
--- a/assets/blocks/environment/ore-coal1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-coal2.png b/assets/blocks/environment/ore-coal2.png
deleted file mode 100644
index dc7a4b1..0000000
--- a/assets/blocks/environment/ore-coal2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-copper1.png b/assets/blocks/environment/ore-copper.png
index 2bc09fb..2bc09fb 100644
--- a/assets/blocks/environment/ore-copper1.png
+++ b/assets/blocks/environment/ore-copper.png
Binary files differ
diff --git a/assets/blocks/environment/ore-copper2.png b/assets/blocks/environment/ore-copper2.png
deleted file mode 100644
index bd592d7..0000000
--- a/assets/blocks/environment/ore-copper2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-copper3.png b/assets/blocks/environment/ore-copper3.png
deleted file mode 100644
index 839b28b..0000000
--- a/assets/blocks/environment/ore-copper3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-crystal-thorium3.png b/assets/blocks/environment/ore-crystal-thorium.png
index 82bd3f2..82bd3f2 100644
--- a/assets/blocks/environment/ore-crystal-thorium3.png
+++ b/assets/blocks/environment/ore-crystal-thorium.png
Binary files differ
diff --git a/assets/blocks/environment/ore-crystal-thorium1.png b/assets/blocks/environment/ore-crystal-thorium1.png
deleted file mode 100644
index c868410..0000000
--- a/assets/blocks/environment/ore-crystal-thorium1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-crystal-thorium2.png b/assets/blocks/environment/ore-crystal-thorium2.png
deleted file mode 100644
index 96b7cf1..0000000
--- a/assets/blocks/environment/ore-crystal-thorium2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-lead3.png b/assets/blocks/environment/ore-lead.png
index 0058d07..0058d07 100644
--- a/assets/blocks/environment/ore-lead3.png
+++ b/assets/blocks/environment/ore-lead.png
Binary files differ
diff --git a/assets/blocks/environment/ore-lead1.png b/assets/blocks/environment/ore-lead1.png
deleted file mode 100644
index c003793..0000000
--- a/assets/blocks/environment/ore-lead1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-lead2.png b/assets/blocks/environment/ore-lead2.png
deleted file mode 100644
index 3b6cd1f..0000000
--- a/assets/blocks/environment/ore-lead2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-scrap2.png b/assets/blocks/environment/ore-scrap.png
index 27f40ac..27f40ac 100644
--- a/assets/blocks/environment/ore-scrap2.png
+++ b/assets/blocks/environment/ore-scrap.png
Binary files differ
diff --git a/assets/blocks/environment/ore-scrap1.png b/assets/blocks/environment/ore-scrap1.png
deleted file mode 100644
index 2d7cfb3..0000000
--- a/assets/blocks/environment/ore-scrap1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-scrap3.png b/assets/blocks/environment/ore-scrap3.png
deleted file mode 100644
index 44222c2..0000000
--- a/assets/blocks/environment/ore-scrap3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-thorium3.png b/assets/blocks/environment/ore-thorium.png
index f374c01..f374c01 100644
--- a/assets/blocks/environment/ore-thorium3.png
+++ b/assets/blocks/environment/ore-thorium.png
Binary files differ
diff --git a/assets/blocks/environment/ore-thorium1.png b/assets/blocks/environment/ore-thorium1.png
deleted file mode 100644
index 2292241..0000000
--- a/assets/blocks/environment/ore-thorium1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-thorium2.png b/assets/blocks/environment/ore-thorium2.png
deleted file mode 100644
index b704f2d..0000000
--- a/assets/blocks/environment/ore-thorium2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-titanium3.png b/assets/blocks/environment/ore-titanium.png
index 944c4ff..944c4ff 100644
--- a/assets/blocks/environment/ore-titanium3.png
+++ b/assets/blocks/environment/ore-titanium.png
Binary files differ
diff --git a/assets/blocks/environment/ore-titanium1.png b/assets/blocks/environment/ore-titanium1.png
deleted file mode 100644
index 0ffff55..0000000
--- a/assets/blocks/environment/ore-titanium1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-titanium2.png b/assets/blocks/environment/ore-titanium2.png
deleted file mode 100644
index 7b9d526..0000000
--- a/assets/blocks/environment/ore-titanium2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-tungsten3.png b/assets/blocks/environment/ore-tungsten.png
index 10d2923..10d2923 100644
--- a/assets/blocks/environment/ore-tungsten3.png
+++ b/assets/blocks/environment/ore-tungsten.png
Binary files differ
diff --git a/assets/blocks/environment/ore-tungsten1.png b/assets/blocks/environment/ore-tungsten1.png
deleted file mode 100644
index 7ec08fd..0000000
--- a/assets/blocks/environment/ore-tungsten1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-tungsten2.png b/assets/blocks/environment/ore-tungsten2.png
deleted file mode 100644
index 7df1837..0000000
--- a/assets/blocks/environment/ore-tungsten2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-wall-beryllium3.png b/assets/blocks/environment/ore-wall-beryllium.png
index a1116d2..a1116d2 100644
--- a/assets/blocks/environment/ore-wall-beryllium3.png
+++ b/assets/blocks/environment/ore-wall-beryllium.png
Binary files differ
diff --git a/assets/blocks/environment/ore-wall-beryllium1.png b/assets/blocks/environment/ore-wall-beryllium1.png
deleted file mode 100644
index 1f47edb..0000000
--- a/assets/blocks/environment/ore-wall-beryllium1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-wall-beryllium2.png b/assets/blocks/environment/ore-wall-beryllium2.png
deleted file mode 100644
index f135b19..0000000
--- a/assets/blocks/environment/ore-wall-beryllium2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-wall-thorium3.png b/assets/blocks/environment/ore-wall-thorium.png
index 32b255a..32b255a 100644
--- a/assets/blocks/environment/ore-wall-thorium3.png
+++ b/assets/blocks/environment/ore-wall-thorium.png
Binary files differ
diff --git a/assets/blocks/environment/ore-wall-thorium1.png b/assets/blocks/environment/ore-wall-thorium1.png
deleted file mode 100644
index 3bf835c..0000000
--- a/assets/blocks/environment/ore-wall-thorium1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-wall-thorium2.png b/assets/blocks/environment/ore-wall-thorium2.png
deleted file mode 100644
index d9b9466..0000000
--- a/assets/blocks/environment/ore-wall-thorium2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-wall-tungsten3.png b/assets/blocks/environment/ore-wall-tungsten.png
index 8c1b599..8c1b599 100644
--- a/assets/blocks/environment/ore-wall-tungsten3.png
+++ b/assets/blocks/environment/ore-wall-tungsten.png
Binary files differ
diff --git a/assets/blocks/environment/ore-wall-tungsten1.png b/assets/blocks/environment/ore-wall-tungsten1.png
deleted file mode 100644
index ba4c9a3..0000000
--- a/assets/blocks/environment/ore-wall-tungsten1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/ore-wall-tungsten2.png b/assets/blocks/environment/ore-wall-tungsten2.png
deleted file mode 100644
index cb99693..0000000
--- a/assets/blocks/environment/ore-wall-tungsten2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/pebbles3.png b/assets/blocks/environment/pebbles.png
index 03b56d6..03b56d6 100644
--- a/assets/blocks/environment/pebbles3.png
+++ b/assets/blocks/environment/pebbles.png
Binary files differ
diff --git a/assets/blocks/environment/pebbles1.png b/assets/blocks/environment/pebbles1.png
deleted file mode 100644
index 5430e2d..0000000
--- a/assets/blocks/environment/pebbles1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/pebbles2.png b/assets/blocks/environment/pebbles2.png
deleted file mode 100644
index 8969175..0000000
--- a/assets/blocks/environment/pebbles2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-diamond-wall3.png b/assets/blocks/environment/red-diamond-wall.png
index b751674..b751674 100644
--- a/assets/blocks/environment/red-diamond-wall3.png
+++ b/assets/blocks/environment/red-diamond-wall.png
Binary files differ
diff --git a/assets/blocks/environment/red-diamond-wall1.png b/assets/blocks/environment/red-diamond-wall1.png
deleted file mode 100644
index 9be3d0a..0000000
--- a/assets/blocks/environment/red-diamond-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-diamond-wall2.png b/assets/blocks/environment/red-diamond-wall2.png
deleted file mode 100644
index 9cc276f..0000000
--- a/assets/blocks/environment/red-diamond-wall2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-ice-boulder1.png b/assets/blocks/environment/red-ice-boulder.png
index 4ad47a5..4ad47a5 100644
--- a/assets/blocks/environment/red-ice-boulder1.png
+++ b/assets/blocks/environment/red-ice-boulder.png
Binary files differ
diff --git a/assets/blocks/environment/red-ice-boulder2.png b/assets/blocks/environment/red-ice-boulder2.png
deleted file mode 100644
index 5c0b4da..0000000
--- a/assets/blocks/environment/red-ice-boulder2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-ice-boulder3.png b/assets/blocks/environment/red-ice-boulder3.png
deleted file mode 100644
index 22fdd21..0000000
--- a/assets/blocks/environment/red-ice-boulder3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-ice-wall2.png b/assets/blocks/environment/red-ice-wall.png
index 048c572..048c572 100644
--- a/assets/blocks/environment/red-ice-wall2.png
+++ b/assets/blocks/environment/red-ice-wall.png
Binary files differ
diff --git a/assets/blocks/environment/red-ice-wall1.png b/assets/blocks/environment/red-ice-wall1.png
deleted file mode 100644
index d2608f8..0000000
--- a/assets/blocks/environment/red-ice-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-ice1.png b/assets/blocks/environment/red-ice.png
index d54cf8a..d54cf8a 100644
--- a/assets/blocks/environment/red-ice1.png
+++ b/assets/blocks/environment/red-ice.png
Binary files differ
diff --git a/assets/blocks/environment/red-ice2.png b/assets/blocks/environment/red-ice2.png
deleted file mode 100644
index f5a5475..0000000
--- a/assets/blocks/environment/red-ice2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-ice3.png b/assets/blocks/environment/red-ice3.png
deleted file mode 100644
index 7db7ec7..0000000
--- a/assets/blocks/environment/red-ice3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-stone-boulder1.png b/assets/blocks/environment/red-stone-boulder.png
index 2770255..2770255 100644
--- a/assets/blocks/environment/red-stone-boulder1.png
+++ b/assets/blocks/environment/red-stone-boulder.png
Binary files differ
diff --git a/assets/blocks/environment/red-stone-boulder2.png b/assets/blocks/environment/red-stone-boulder2.png
deleted file mode 100644
index 5cbfeea..0000000
--- a/assets/blocks/environment/red-stone-boulder2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-stone-boulder3.png b/assets/blocks/environment/red-stone-boulder3.png
deleted file mode 100644
index 1ff2992..0000000
--- a/assets/blocks/environment/red-stone-boulder3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-stone-boulder4.png b/assets/blocks/environment/red-stone-boulder4.png
deleted file mode 100644
index f40bbad..0000000
--- a/assets/blocks/environment/red-stone-boulder4.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-stone-vent1.png b/assets/blocks/environment/red-stone-vent.png
index b71ab18..b71ab18 100644
--- a/assets/blocks/environment/red-stone-vent1.png
+++ b/assets/blocks/environment/red-stone-vent.png
Binary files differ
diff --git a/assets/blocks/environment/red-stone-vent2.png b/assets/blocks/environment/red-stone-vent2.png
deleted file mode 100644
index dc51270..0000000
--- a/assets/blocks/environment/red-stone-vent2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-stone-wall3.png b/assets/blocks/environment/red-stone-wall.png
index 9c9182c..9c9182c 100644
--- a/assets/blocks/environment/red-stone-wall3.png
+++ b/assets/blocks/environment/red-stone-wall.png
Binary files differ
diff --git a/assets/blocks/environment/red-stone-wall1.png b/assets/blocks/environment/red-stone-wall1.png
deleted file mode 100644
index 3ccf9a6..0000000
--- a/assets/blocks/environment/red-stone-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-stone-wall2.png b/assets/blocks/environment/red-stone-wall2.png
deleted file mode 100644
index 18b79ea..0000000
--- a/assets/blocks/environment/red-stone-wall2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-stone1.png b/assets/blocks/environment/red-stone.png
index 66e5b06..66e5b06 100644
--- a/assets/blocks/environment/red-stone1.png
+++ b/assets/blocks/environment/red-stone.png
Binary files differ
diff --git a/assets/blocks/environment/red-stone2.png b/assets/blocks/environment/red-stone2.png
deleted file mode 100644
index 5f19488..0000000
--- a/assets/blocks/environment/red-stone2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-stone3.png b/assets/blocks/environment/red-stone3.png
deleted file mode 100644
index 9f47321..0000000
--- a/assets/blocks/environment/red-stone3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/red-stone4.png b/assets/blocks/environment/red-stone4.png
deleted file mode 100644
index dda9d53..0000000
--- a/assets/blocks/environment/red-stone4.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/redmat1.png b/assets/blocks/environment/redmat.png
index f9df183..f9df183 100644
--- a/assets/blocks/environment/redmat1.png
+++ b/assets/blocks/environment/redmat.png
Binary files differ
diff --git a/assets/blocks/environment/redmat2.png b/assets/blocks/environment/redmat2.png
deleted file mode 100644
index b404e83..0000000
--- a/assets/blocks/environment/redmat2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/redmat3.png b/assets/blocks/environment/redmat3.png
deleted file mode 100644
index 67587e7..0000000
--- a/assets/blocks/environment/redmat3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/redweed3.png b/assets/blocks/environment/redweed.png
index 2ac97d5..2ac97d5 100644
--- a/assets/blocks/environment/redweed3.png
+++ b/assets/blocks/environment/redweed.png
Binary files differ
diff --git a/assets/blocks/environment/redweed1.png b/assets/blocks/environment/redweed1.png
deleted file mode 100644
index 56cf859..0000000
--- a/assets/blocks/environment/redweed1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/redweed2.png b/assets/blocks/environment/redweed2.png
deleted file mode 100644
index 23ffe5e..0000000
--- a/assets/blocks/environment/redweed2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/regolith-wall2.png b/assets/blocks/environment/regolith-wall.png
index a8b0ec4..a8b0ec4 100644
--- a/assets/blocks/environment/regolith-wall2.png
+++ b/assets/blocks/environment/regolith-wall.png
Binary files differ
diff --git a/assets/blocks/environment/regolith-wall1.png b/assets/blocks/environment/regolith-wall1.png
deleted file mode 100644
index 6c6c4e1..0000000
--- a/assets/blocks/environment/regolith-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/regolith3.png b/assets/blocks/environment/regolith.png
index cb318b5..cb318b5 100644
--- a/assets/blocks/environment/regolith3.png
+++ b/assets/blocks/environment/regolith.png
Binary files differ
diff --git a/assets/blocks/environment/regolith1.png b/assets/blocks/environment/regolith1.png
deleted file mode 100644
index 23a7d30..0000000
--- a/assets/blocks/environment/regolith1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/regolith2.png b/assets/blocks/environment/regolith2.png
deleted file mode 100644
index cb70d39..0000000
--- a/assets/blocks/environment/regolith2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/rhyolite-boulder1.png b/assets/blocks/environment/rhyolite-boulder.png
index 26bb4e4..26bb4e4 100644
--- a/assets/blocks/environment/rhyolite-boulder1.png
+++ b/assets/blocks/environment/rhyolite-boulder.png
Binary files differ
diff --git a/assets/blocks/environment/rhyolite-boulder2.png b/assets/blocks/environment/rhyolite-boulder2.png
deleted file mode 100644
index 65f0ad3..0000000
--- a/assets/blocks/environment/rhyolite-boulder2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/rhyolite-boulder3.png b/assets/blocks/environment/rhyolite-boulder3.png
deleted file mode 100644
index 73d39bd..0000000
--- a/assets/blocks/environment/rhyolite-boulder3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/rhyolite-crater1.png b/assets/blocks/environment/rhyolite-crater.png
index e35a1b3..e35a1b3 100644
--- a/assets/blocks/environment/rhyolite-crater1.png
+++ b/assets/blocks/environment/rhyolite-crater.png
Binary files differ
diff --git a/assets/blocks/environment/rhyolite-crater2.png b/assets/blocks/environment/rhyolite-crater2.png
deleted file mode 100644
index b21ae95..0000000
--- a/assets/blocks/environment/rhyolite-crater2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/rhyolite-crater3.png b/assets/blocks/environment/rhyolite-crater3.png
deleted file mode 100644
index 8e11c71..0000000
--- a/assets/blocks/environment/rhyolite-crater3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/rhyolite-vent1.png b/assets/blocks/environment/rhyolite-vent.png
index d7b7ed0..d7b7ed0 100644
--- a/assets/blocks/environment/rhyolite-vent1.png
+++ b/assets/blocks/environment/rhyolite-vent.png
Binary files differ
diff --git a/assets/blocks/environment/rhyolite-vent2.png b/assets/blocks/environment/rhyolite-vent2.png
deleted file mode 100644
index c1e493b..0000000
--- a/assets/blocks/environment/rhyolite-vent2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/rhyolite-wall2.png b/assets/blocks/environment/rhyolite-wall.png
index 5b84e45..5b84e45 100644
--- a/assets/blocks/environment/rhyolite-wall2.png
+++ b/assets/blocks/environment/rhyolite-wall.png
Binary files differ
diff --git a/assets/blocks/environment/rhyolite-wall1.png b/assets/blocks/environment/rhyolite-wall1.png
deleted file mode 100644
index 21acc29..0000000
--- a/assets/blocks/environment/rhyolite-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/rhyolite1.png b/assets/blocks/environment/rhyolite.png
index 37fba67..37fba67 100644
--- a/assets/blocks/environment/rhyolite1.png
+++ b/assets/blocks/environment/rhyolite.png
Binary files differ
diff --git a/assets/blocks/environment/rhyolite2.png b/assets/blocks/environment/rhyolite2.png
deleted file mode 100644
index f459b7e..0000000
--- a/assets/blocks/environment/rhyolite2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/rhyolite3.png b/assets/blocks/environment/rhyolite3.png
deleted file mode 100644
index 0a2754f..0000000
--- a/assets/blocks/environment/rhyolite3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/rough-rhyolite1.png b/assets/blocks/environment/rough-rhyolite.png
index 9700fff..9700fff 100644
--- a/assets/blocks/environment/rough-rhyolite1.png
+++ b/assets/blocks/environment/rough-rhyolite.png
Binary files differ
diff --git a/assets/blocks/environment/rough-rhyolite2.png b/assets/blocks/environment/rough-rhyolite2.png
deleted file mode 100644
index f567b90..0000000
--- a/assets/blocks/environment/rough-rhyolite2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/rough-rhyolite3.png b/assets/blocks/environment/rough-rhyolite3.png
deleted file mode 100644
index 2042dff..0000000
--- a/assets/blocks/environment/rough-rhyolite3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/rough-rhyolite4.png b/assets/blocks/environment/rough-rhyolite4.png
deleted file mode 100644
index 923eb88..0000000
--- a/assets/blocks/environment/rough-rhyolite4.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/salt-wall2.png b/assets/blocks/environment/salt-wall.png
index 037a1ce..037a1ce 100644
--- a/assets/blocks/environment/salt-wall2.png
+++ b/assets/blocks/environment/salt-wall.png
Binary files differ
diff --git a/assets/blocks/environment/salt-wall1.png b/assets/blocks/environment/salt-wall1.png
deleted file mode 100644
index 7cc9208..0000000
--- a/assets/blocks/environment/salt-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/sand-boulder1.png b/assets/blocks/environment/sand-boulder.png
index 3019018..3019018 100644
--- a/assets/blocks/environment/sand-boulder1.png
+++ b/assets/blocks/environment/sand-boulder.png
Binary files differ
diff --git a/assets/blocks/environment/sand-boulder2.png b/assets/blocks/environment/sand-boulder2.png
deleted file mode 100644
index cad0048..0000000
--- a/assets/blocks/environment/sand-boulder2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/sand-floor1.png b/assets/blocks/environment/sand-floor.png
index 9c5f4e9..9c5f4e9 100644
--- a/assets/blocks/environment/sand-floor1.png
+++ b/assets/blocks/environment/sand-floor.png
Binary files differ
diff --git a/assets/blocks/environment/sand-floor2.png b/assets/blocks/environment/sand-floor2.png
deleted file mode 100644
index 13aa542..0000000
--- a/assets/blocks/environment/sand-floor2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/sand-floor3.png b/assets/blocks/environment/sand-floor3.png
deleted file mode 100644
index aaaf3fe..0000000
--- a/assets/blocks/environment/sand-floor3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/sand-wall2.png b/assets/blocks/environment/sand-wall.png
index a67d570..a67d570 100644
--- a/assets/blocks/environment/sand-wall2.png
+++ b/assets/blocks/environment/sand-wall.png
Binary files differ
diff --git a/assets/blocks/environment/sand-wall1.png b/assets/blocks/environment/sand-wall1.png
deleted file mode 100644
index 18fd410..0000000
--- a/assets/blocks/environment/sand-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/shale-boulder1.png b/assets/blocks/environment/shale-boulder.png
index b12a026..b12a026 100644
--- a/assets/blocks/environment/shale-boulder1.png
+++ b/assets/blocks/environment/shale-boulder.png
Binary files differ
diff --git a/assets/blocks/environment/shale-boulder2.png b/assets/blocks/environment/shale-boulder2.png
deleted file mode 100644
index c2c1564..0000000
--- a/assets/blocks/environment/shale-boulder2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/shale-wall2.png b/assets/blocks/environment/shale-wall.png
index a102590..a102590 100644
--- a/assets/blocks/environment/shale-wall2.png
+++ b/assets/blocks/environment/shale-wall.png
Binary files differ
diff --git a/assets/blocks/environment/shale-wall1.png b/assets/blocks/environment/shale-wall1.png
deleted file mode 100644
index 281653b..0000000
--- a/assets/blocks/environment/shale-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/shale1.png b/assets/blocks/environment/shale.png
index a0469bc..a0469bc 100644
--- a/assets/blocks/environment/shale1.png
+++ b/assets/blocks/environment/shale.png
Binary files differ
diff --git a/assets/blocks/environment/shale2.png b/assets/blocks/environment/shale2.png
deleted file mode 100644
index 95c8bc3..0000000
--- a/assets/blocks/environment/shale2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/shale3.png b/assets/blocks/environment/shale3.png
deleted file mode 100644
index 2372f85..0000000
--- a/assets/blocks/environment/shale3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/shrubs2.png b/assets/blocks/environment/shrubs.png
index 635a0d2..635a0d2 100644
--- a/assets/blocks/environment/shrubs2.png
+++ b/assets/blocks/environment/shrubs.png
Binary files differ
diff --git a/assets/blocks/environment/shrubs1.png b/assets/blocks/environment/shrubs1.png
deleted file mode 100644
index d9596f7..0000000
--- a/assets/blocks/environment/shrubs1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/snow-boulder1.png b/assets/blocks/environment/snow-boulder.png
index f0cd270..f0cd270 100644
--- a/assets/blocks/environment/snow-boulder1.png
+++ b/assets/blocks/environment/snow-boulder.png
Binary files differ
diff --git a/assets/blocks/environment/snow-boulder2.png b/assets/blocks/environment/snow-boulder2.png
deleted file mode 100644
index 0a64a0c..0000000
--- a/assets/blocks/environment/snow-boulder2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/snow-wall2.png b/assets/blocks/environment/snow-wall.png
index 718cff7..718cff7 100644
--- a/assets/blocks/environment/snow-wall2.png
+++ b/assets/blocks/environment/snow-wall.png
Binary files differ
diff --git a/assets/blocks/environment/snow-wall1.png b/assets/blocks/environment/snow-wall1.png
deleted file mode 100644
index 1675278..0000000
--- a/assets/blocks/environment/snow-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/snow3.png b/assets/blocks/environment/snow.png
index afad902..afad902 100644
--- a/assets/blocks/environment/snow3.png
+++ b/assets/blocks/environment/snow.png
Binary files differ
diff --git a/assets/blocks/environment/snow1.png b/assets/blocks/environment/snow1.png
deleted file mode 100644
index 2e34a64..0000000
--- a/assets/blocks/environment/snow1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/snow2.png b/assets/blocks/environment/snow2.png
deleted file mode 100644
index ebddde2..0000000
--- a/assets/blocks/environment/snow2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/spore-cluster1.png b/assets/blocks/environment/spore-cluster.png
index 4b272a3..4b272a3 100644
--- a/assets/blocks/environment/spore-cluster1.png
+++ b/assets/blocks/environment/spore-cluster.png
Binary files differ
diff --git a/assets/blocks/environment/spore-cluster2.png b/assets/blocks/environment/spore-cluster2.png
deleted file mode 100644
index 93f8b4c..0000000
--- a/assets/blocks/environment/spore-cluster2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/spore-cluster3.png b/assets/blocks/environment/spore-cluster3.png
deleted file mode 100644
index 9f30991..0000000
--- a/assets/blocks/environment/spore-cluster3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/spore-moss3.png b/assets/blocks/environment/spore-moss.png
index 3661e8b..3661e8b 100644
--- a/assets/blocks/environment/spore-moss3.png
+++ b/assets/blocks/environment/spore-moss.png
Binary files differ
diff --git a/assets/blocks/environment/spore-moss1.png b/assets/blocks/environment/spore-moss1.png
deleted file mode 100644
index 12a7787..0000000
--- a/assets/blocks/environment/spore-moss1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/spore-moss2.png b/assets/blocks/environment/spore-moss2.png
deleted file mode 100644
index 351d8e7..0000000
--- a/assets/blocks/environment/spore-moss2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/spore-wall2.png b/assets/blocks/environment/spore-wall.png
index b2dec36..b2dec36 100644
--- a/assets/blocks/environment/spore-wall2.png
+++ b/assets/blocks/environment/spore-wall.png
Binary files differ
diff --git a/assets/blocks/environment/spore-wall1.png b/assets/blocks/environment/spore-wall1.png
deleted file mode 100644
index 0a81cfa..0000000
--- a/assets/blocks/environment/spore-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/stone-wall2.png b/assets/blocks/environment/stone-wall.png
index 39c0d9c..39c0d9c 100644
--- a/assets/blocks/environment/stone-wall2.png
+++ b/assets/blocks/environment/stone-wall.png
Binary files differ
diff --git a/assets/blocks/environment/stone-wall1.png b/assets/blocks/environment/stone-wall1.png
deleted file mode 100644
index bd1dd27..0000000
--- a/assets/blocks/environment/stone-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/stone1.png b/assets/blocks/environment/stone.png
index 9fdeff0..9fdeff0 100644
--- a/assets/blocks/environment/stone1.png
+++ b/assets/blocks/environment/stone.png
Binary files differ
diff --git a/assets/blocks/environment/stone2.png b/assets/blocks/environment/stone2.png
deleted file mode 100644
index c29a296..0000000
--- a/assets/blocks/environment/stone2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/stone3.png b/assets/blocks/environment/stone3.png
deleted file mode 100644
index a227028..0000000
--- a/assets/blocks/environment/stone3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/tendrils3.png b/assets/blocks/environment/tendrils.png
index 31727ee..31727ee 100644
--- a/assets/blocks/environment/tendrils3.png
+++ b/assets/blocks/environment/tendrils.png
Binary files differ
diff --git a/assets/blocks/environment/tendrils1.png b/assets/blocks/environment/tendrils1.png
deleted file mode 100644
index 90345f2..0000000
--- a/assets/blocks/environment/tendrils1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/tendrils2.png b/assets/blocks/environment/tendrils2.png
deleted file mode 100644
index 84f4ea9..0000000
--- a/assets/blocks/environment/tendrils2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/vibrant-crystal-cluster1.png b/assets/blocks/environment/vibrant-crystal-cluster.png
index 0f61531..0f61531 100644
--- a/assets/blocks/environment/vibrant-crystal-cluster1.png
+++ b/assets/blocks/environment/vibrant-crystal-cluster.png
Binary files differ
diff --git a/assets/blocks/environment/vibrant-crystal-cluster2.png b/assets/blocks/environment/vibrant-crystal-cluster2.png
deleted file mode 100644
index cc3e71a..0000000
--- a/assets/blocks/environment/vibrant-crystal-cluster2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/vibrant-crystal-cluster3.png b/assets/blocks/environment/vibrant-crystal-cluster3.png
deleted file mode 100644
index 6f2ca86..0000000
--- a/assets/blocks/environment/vibrant-crystal-cluster3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/yellow-stone-boulder1.png b/assets/blocks/environment/yellow-stone-boulder.png
index bafe3b5..bafe3b5 100644
--- a/assets/blocks/environment/yellow-stone-boulder1.png
+++ b/assets/blocks/environment/yellow-stone-boulder.png
Binary files differ
diff --git a/assets/blocks/environment/yellow-stone-boulder2.png b/assets/blocks/environment/yellow-stone-boulder2.png
deleted file mode 100644
index d360339..0000000
--- a/assets/blocks/environment/yellow-stone-boulder2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/yellow-stone-plates3.png b/assets/blocks/environment/yellow-stone-plates.png
index 9f8a04b..9f8a04b 100644
--- a/assets/blocks/environment/yellow-stone-plates3.png
+++ b/assets/blocks/environment/yellow-stone-plates.png
Binary files differ
diff --git a/assets/blocks/environment/yellow-stone-plates1.png b/assets/blocks/environment/yellow-stone-plates1.png
deleted file mode 100644
index e4e4728..0000000
--- a/assets/blocks/environment/yellow-stone-plates1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/yellow-stone-plates2.png b/assets/blocks/environment/yellow-stone-plates2.png
deleted file mode 100644
index 29364f9..0000000
--- a/assets/blocks/environment/yellow-stone-plates2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/yellow-stone-vent1.png b/assets/blocks/environment/yellow-stone-vent.png
index effb1ca..effb1ca 100644
--- a/assets/blocks/environment/yellow-stone-vent1.png
+++ b/assets/blocks/environment/yellow-stone-vent.png
Binary files differ
diff --git a/assets/blocks/environment/yellow-stone-vent2.png b/assets/blocks/environment/yellow-stone-vent2.png
deleted file mode 100644
index d61aae4..0000000
--- a/assets/blocks/environment/yellow-stone-vent2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/yellow-stone-wall2.png b/assets/blocks/environment/yellow-stone-wall.png
index dc91f82..dc91f82 100644
--- a/assets/blocks/environment/yellow-stone-wall2.png
+++ b/assets/blocks/environment/yellow-stone-wall.png
Binary files differ
diff --git a/assets/blocks/environment/yellow-stone-wall1.png b/assets/blocks/environment/yellow-stone-wall1.png
deleted file mode 100644
index 20d3921..0000000
--- a/assets/blocks/environment/yellow-stone-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/yellow-stone1.png b/assets/blocks/environment/yellow-stone.png
index fb0c640..fb0c640 100644
--- a/assets/blocks/environment/yellow-stone1.png
+++ b/assets/blocks/environment/yellow-stone.png
Binary files differ
diff --git a/assets/blocks/environment/yellow-stone2.png b/assets/blocks/environment/yellow-stone2.png
deleted file mode 100644
index 2836cae..0000000
--- a/assets/blocks/environment/yellow-stone2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/yellow-stone3.png b/assets/blocks/environment/yellow-stone3.png
deleted file mode 100644
index a723497..0000000
--- a/assets/blocks/environment/yellow-stone3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/environment/yellowcoral.png b/assets/blocks/environment/yellowcoral.png
index c78ee38..5e3d6cc 100644
--- a/assets/blocks/environment/yellowcoral.png
+++ b/assets/blocks/environment/yellowcoral.png
Binary files differ
diff --git a/build.rs b/build.rs
index a023dc5..3921cad 100644
--- a/build.rs
+++ b/build.rs
@@ -22,6 +22,13 @@ fn main() {
for mut f in [&full, &eigh, &quar] {
f.write_all(b"phf::phf_map! {\n").unwrap();
}
+ for i in 1..=16 {
+ n += 1;
+ writeln!(full, r#" "build{}" => &EMPTY_FULL,"#, i).unwrap();
+ writeln!(quar, r#" "build{}" => &EMPTY_QUAR,"#, i).unwrap();
+ writeln!(eigh, r#" "build{}" => &EMPTY_EIGH,"#, i).unwrap();
+ }
+
for e in walkdir.into_iter().filter_map(|e| e.ok()) {
let path = e.path();
if path.is_file() && let Some(e) = path.extension() && e == "png" {
@@ -53,8 +60,8 @@ fn main() {
let x = new.width();
let y = new.height();
buf.write_all(&new.into_raw()).unwrap();
- writeln!($ext,
- r#" "{path}" => r!(LazyLock::new(|| RgbaImage::from_vec({x}, {y}, include_bytes!(concat!(env!("OUT_DIR"), "/{n}-{}")).to_vec()).unwrap())),"#,
+ writeln!($ext,
+ r#" "{path}" => r!(RgbaImage::from_vec({x}, {y}, include_bytes!(concat!(env!("OUT_DIR"), "/{n}-{}")).to_vec()).unwrap()),"#,
stringify!($ext)
).unwrap();
};
diff --git a/src/block/environment.rs b/src/block/environment.rs
index 4642730..7b0b250 100644
--- a/src/block/environment.rs
+++ b/src/block/environment.rs
@@ -2,211 +2,195 @@
use crate::block::make_register;
use crate::block::simple::make_simple;
use crate::data::renderer::*;
-use tinyrand::RandRange;
-use tinyrand_std::thread_rand;
-
macro_rules! register_env {
- ($($field:literal: $size:literal @ $variations:literal;)+) => {
+ ($($field:literal: $size:literal;)+) => {
make_register!(
$($field => EnvironmentBlock::new($size, true, &[]);)*
);
-
- make_simple!(EnvironmentBlock, |_, name, _, _, _, s| {
- match name {
- $($field => {
- #[allow(clippy::reversed_empty_ranges)]
- match $variations {
- 2..=6 => load(&format!("{}{}", $field, thread_rand().next_range(1usize..$variations)), s),
- 1 => load($field, s),
- 0 => ImageHolder::from(RgbaImage::new(s * $size, s * $size)),
- _ => unreachable!(),
- }
- },)*
- _ => { unreachable!() }
- }
- });
};
}
+make_simple!(EnvironmentBlock, |_, name, _, _, _, s| load(name, s));
+
register_env! {
- "darksand": 1@3;
- "sand-floor": 1@3;
- "yellow-stone": 1@3;
- "arkyic-stone": 1@3;
- "carbon-stone": 1@4;
- "ore-beryllium": 1@3;
- "ore-copper": 1@3;
- "ore-lead": 1@3;
- "ore-coal": 1@3;
- "ore-scrap": 1@3;
- "ore-thorium": 1@3;
- "ore-titanium": 1@3;
- "ore-tungsten": 1@3;
- "ore-crystal-thorium": 1@3;
- "ore-wall-beryllium": 1@3;
- "ore-wall-thorium": 1@3;
- "ore-wall-tungsten": 1@3;
- "graphitic-wall": 1@3;
- "graphitic-wall-large": 2@1;
- "dacite": 1@3;
- "dirt": 1@3;
- "arkycite-floor": 1@1;
- "basalt": 1@3;
- "ice": 1@3;
- "molten-slag": 1@1;
- "moss": 1@3;
- "mud": 1@3;
- "magmarock": 1@3;
- "grass": 1@3;
- "ice-snow": 1@3;
- "hotrock": 1@3;
- "char": 1@3;
- "snow": 1@3;
- "salt": 1@1;
- "shale": 1@3;
- "metal-floor": 1@1;
- "metal-floor-2": 1@1;
- "metal-floor-3": 1@1;
- "metal-floor-4": 1@1;
- "metal-floor-5": 1@1;
- "dark-panel-1": 1@1;
- "dark-panel-2": 1@1;
- "dark-panel-3": 1@1;
- "dark-panel-4": 1@1;
- "dark-panel-5": 1@1;
- "dark-panel-6": 1@1;
- "darksand-tainted-water": 1@1;
- "darksand-water": 1@1;
- "deep-tainted-water": 1@1;
- "deep-water": 1@1;
- "sand-water": 1@1;
- "shallow-water": 1@1;
- "space": 1@1;
- "stone": 1@3;
- "build1": 1@0;
- "boulder": 1@2;
- "arkyic-vent": 3@2;
- "arkyic-wall-large": 2@1;
- "arkyic-wall": 1@3;
- "beryllic-stone-wall-large": 2@1;
- "beryllic-stone-wall": 1@2;
- "beryllic-stone": 1@4;
- "bluemat": 1@3;
- "carbon-vent": 3@2;
- "carbon-wall-large": 2@1;
- "carbon-wall": 1@2;
- "cliff": 1@7;
- "core-zone": 1@1;
- "crater-stone": 1@6;
- "crystal-floor": 1@4;
- "crystalline-stone-wall-large": 2@1;
- "crystalline-stone-wall": 1@4;
- "crystalline-stone": 1@5;
- "crystalline-vent": 3@2;
- "dacite-wall-large": 2@1;
- "dacite-wall": 1@2;
- "dark-metal-large": 2@1;
- "dark-metal": 1@2;
- "metal-floor-damaged": 1@3;
- "dense-red-stone": 1@4;
- "dirt-wall-large": 2@1;
- "dirt-wall": 1@2;
- "dune-wall-large": 2@1;
- "dune-wall": 1@2;
- "ferric-craters": 1@3; // ferris section
- "ferric-stone-wall-large": 2@1;
- "ferric-stone-wall": 1@2;
- "ferric-stone": 1@4;
- "ice-wall-large": 2@1;
- "ice-wall": 1@2;
- "pebbles": 1@3;
- "pine": 1@1;
- "pooled-cryofluid": 1@1;
- "red-diamond-wall": 1@3;
- "red-ice-wall-large": 2@1;
- "red-ice-wall": 1@2;
- "red-ice": 1@3;
- "red-stone-vent": 3@2;
- "red-stone-wall-large": 2@1;
- "red-stone-wall": 1@3;
- "red-stone": 1@4;
- "redmat": 1@3;
- "regolith-wall-large": 2@1;
- "regolith-wall": 1@2;
- "regolith": 1@3;
- "rhyolite-crater": 1@3;
- "rhyolite-vent": 3@2;
- "rhyolite-wall-large": 2@1;
- "rhyolite-wall": 1@2;
- "rhyolite": 1@3;
- "rough-rhyolite": 1@3;
- "salt-wall-large": 2@1;
- "salt-wall": 1@2;
- "sand-wall-large": 2@1;
- "sand-wall": 1@2;
- "shale-wall-large": 2@1;
- "shale-wall": 1@2;
- "shrubs-large": 2@1;
- "shrubs": 1@2;
- "snow-pine": 1@1;
- "snow-wall-large": 2@1;
- "snow-wall": 1@2;
- "spawn": 1@1;
- "spore-moss": 1@3;
- "spore-pine": 1@1;
- "spore-wall-large": 2@1;
- "spore-wall": 1@2;
- "stone-wall-large": 2@1;
- "stone-wall": 1@2;
- "tainted-water": 1@1;
- "tar": 1@1;
- "yellow-stone-plates": 1@3;
- "yellow-stone-vent": 3@2;
- "yellow-stone-wall-large": 2@1;
- "yellow-stone-wall": 1@2;
+ "darksand": 1;
+ "sand-floor": 1;
+ "yellow-stone": 1;
+ "arkyic-stone": 1;
+ "carbon-stone": 1;
+ "ore-beryllium": 1;
+ "ore-copper": 1;
+ "ore-lead": 1;
+ "ore-coal": 1;
+ "ore-scrap": 1;
+ "ore-thorium": 1;
+ "ore-titanium": 1;
+ "ore-tungsten": 1;
+ "ore-crystal-thorium": 1;
+ "ore-wall-beryllium": 1;
+ "ore-wall-thorium": 1;
+ "ore-wall-tungsten": 1;
+ "graphitic-wall": 1;
+ "graphitic-wall-large": 2;
+ "dacite": 1;
+ "dirt": 1;
+ "arkycite-floor": 1;
+ "basalt": 1;
+ "ice": 1;
+ "molten-slag": 1;
+ "moss": 1;
+ "mud": 1;
+ "magmarock": 1;
+ "grass": 1;
+ "ice-snow": 1;
+ "hotrock": 1;
+ "char": 1;
+ "snow": 1;
+ "salt": 1;
+ "shale": 1;
+ "metal-floor": 1;
+ "metal-floor-2": 1;
+ "metal-floor-3": 1;
+ "metal-floor-4": 1;
+ "metal-floor-5": 1;
+ "dark-panel-1": 1;
+ "dark-panel-2": 1;
+ "dark-panel-3": 1;
+ "dark-panel-4": 1;
+ "dark-panel-5": 1;
+ "dark-panel-6": 1;
+ "darksand-tainted-water": 1;
+ "darksand-water": 1;
+ "deep-tainted-water": 1;
+ "deep-water": 1;
+ "sand-water": 1;
+ "shallow-water": 1;
+ "space": 1;
+ "stone": 1;
+ "build1": 1;
+ "boulder": 1;
+ "arkyic-vent": 3;
+ "arkyic-wall-large": 2;
+ "arkyic-wall": 1;
+ "beryllic-stone-wall-large": 2;
+ "beryllic-stone-wall": 1;
+ "beryllic-stone": 1;
+ "bluemat": 1;
+ "carbon-vent": 3;
+ "carbon-wall-large": 2;
+ "carbon-wall": 1;
+ "cliff": 1;
+ "core-zone": 1;
+ "crater-stone": 1;
+ "crystal-floor": 1;
+ "crystalline-stone-wall-large": 2;
+ "crystalline-stone-wall": 1;
+ "crystalline-stone": 1;
+ "crystalline-vent": 3;
+ "dacite-wall-large": 2;
+ "dacite-wall": 1;
+ "dark-metal-large": 2;
+ "dark-metal": 1;
+ "metal-floor-damaged": 1;
+ "dense-red-stone": 1;
+ "dirt-wall-large": 2;
+ "dirt-wall": 1;
+ "dune-wall-large": 2;
+ "dune-wall": 1;
+ "ferric-craters": 1; // ferris section
+ "ferric-stone-wall-large": 2;
+ "ferric-stone-wall": 1;
+ "ferric-stone": 1;
+ "ice-wall-large": 2;
+ "ice-wall": 1;
+ "pebbles": 1;
+ "pine": 1;
+ "pooled-cryofluid": 1;
+ "red-diamond-wall": 1;
+ "red-ice-wall-large": 2;
+ "red-ice-wall": 1;
+ "red-ice": 1;
+ "red-stone-vent": 3;
+ "red-stone-wall-large": 2;
+ "red-stone-wall": 1;
+ "red-stone": 1;
+ "redmat": 1;
+ "regolith-wall-large": 2;
+ "regolith-wall": 1;
+ "regolith": 1;
+ "rhyolite-crater": 1;
+ "rhyolite-vent": 3;
+ "rhyolite-wall-large": 2;
+ "rhyolite-wall": 1;
+ "rhyolite": 1;
+ "rough-rhyolite": 1;
+ "salt-wall-large": 2;
+ "salt-wall": 1;
+ "sand-wall-large": 2;
+ "sand-wall": 1;
+ "shale-wall-large": 2;
+ "shale-wall": 1;
+ "shrubs-large": 2;
+ "shrubs": 1;
+ "snow-pine": 1;
+ "snow-wall-large": 2;
+ "snow-wall": 1;
+ "spawn": 1;
+ "spore-moss": 1;
+ "spore-pine": 1;
+ "spore-wall-large": 2;
+ "spore-wall": 1;
+ "stone-wall-large": 2;
+ "stone-wall": 1;
+ "tainted-water": 1;
+ "tar": 1;
+ "yellow-stone-plates": 1;
+ "yellow-stone-vent": 3;
+ "yellow-stone-wall-large": 2;
+ "yellow-stone-wall": 1;
// props
- "yellow-stone-boulder": 1@2;
- "snow-boulder": 1@2;
- "shale-boulder": 1@2;
- "arkyic-boulder": 1@3;
- "basalt-boulder": 1@2;
- "beryllic-boulder": 1@2;
- "carbon-boulder": 1@2;
- "crystalline-boulder": 1@2;
- "dacite-boulder": 1@2;
- "ferric-boulder": 1@2;
- "red-ice-boulder": 1@3;
- "red-stone-boulder": 1@4;
- "rhyolite-boulder": 1@3;
- "sand-boulder": 1@2;
- "yellow-sand-boulder": 1@2;
- "pur-bush": 1@1;
- "tendrils": 1@3;
+ "yellow-stone-boulder": 1;
+ "snow-boulder": 1;
+ "shale-boulder": 1;
+ "arkyic-boulder": 1;
+ "basalt-boulder": 1;
+ "beryllic-boulder": 1;
+ "carbon-boulder": 1;
+ "crystalline-boulder": 1;
+ "dacite-boulder": 1;
+ "ferric-boulder": 1;
+ "red-ice-boulder": 1;
+ "red-stone-boulder": 1;
+ "rhyolite-boulder": 1;
+ "sand-boulder": 1;
+ "yellow-sand-boulder": 1;
+ "pur-bush": 1;
+ "tendrils": 1;
// these are tall but uh (TODO layering)
- "white-tree-dead": 1@1;
- "yellowcoral": 1@1;
- "white-tree": 1@1;
- "redweed": 1@3;
- "spore-cluster": 1@3;
- "crystal-blocks": 1@3;
- "crystal-cluster": 1@3;
- "vibrant-crystal-cluster": 1@3;
- "crystal-orbs": 1@3;
+ "white-tree-dead": 1;
+ "yellowcoral": 1;
+ "white-tree": 1;
+ "redweed": 1;
+ "spore-cluster": 1;
+ "crystal-blocks": 1;
+ "crystal-cluster": 1;
+ "vibrant-crystal-cluster": 1;
+ "crystal-orbs": 1;
// end tall
- "build2": 1@0;
- "build3": 1@0;
- "build4": 1@0;
- "build5": 1@0;
- "build6": 1@0;
- "build7": 1@0;
- "build8": 1@0;
- "build9": 1@0;
- "build10": 1@0;
- "build11": 1@0;
- "build12": 1@0;
- "build13": 1@0;
- "build14": 1@0;
- "build15": 1@0;
- "build16": 1@0;
+ "build2": 1;
+ "build3": 1;
+ "build4": 1;
+ "build5": 1;
+ "build6": 1;
+ "build7": 1;
+ "build8": 1;
+ "build9": 1;
+ "build10": 1;
+ "build11": 1;
+ "build12": 1;
+ "build13": 1;
+ "build14": 1;
+ "build15": 1;
+ "build16": 1;
}
diff --git a/src/block/walls.rs b/src/block/walls.rs
index 7ae1d22..d0f437b 100644
--- a/src/block/walls.rs
+++ b/src/block/walls.rs
@@ -3,14 +3,16 @@ use crate::block::simple::*;
use crate::block::*;
use crate::data::dynamic::DynType;
use crate::data::renderer::{load, read_with};
-use tinyrand::{Rand, RandRange, Seeded, StdRand};
-use tinyrand_std::clock_seed::ClockSeed;
+use tinyrand::RandRange;
+use tinyrand_std::thread_rand;
make_simple!(WallBlock, |_, name, _, _, _, s| {
macro_rules! pick {
($name: literal => load $n: literal) => {{
- let mut rand = StdRand::seed(ClockSeed::default().next_u64());
- load(&format!("{}{}", $name, rand.next_range(1usize..$n)), s)
+ load(
+ &format!("{}{}", $name, thread_rand().next_range(1usize..$n)),
+ s,
+ )
}};
}
match name {
diff --git a/src/data/renderer.rs b/src/data/renderer.rs
index de64e3f..502c81e 100644
--- a/src/data/renderer.rs
+++ b/src/data/renderer.rs
@@ -15,12 +15,16 @@ use super::GridPos;
macro_rules! r {
($v:expr) => {{
- static TMP: LazyLock<RgbaImage> = $v;
+ static TMP: LazyLock<RgbaImage> = LazyLock::new(|| $v);
&TMP
}};
}
type Images = phf::Map<&'static str, &'static LazyLock<RgbaImage>>;
+static EMPTY_FULL: LazyLock<RgbaImage> = LazyLock::new(|| RgbaImage::new(32, 32));
+static EMPTY_QUAR: LazyLock<RgbaImage> = LazyLock::new(|| RgbaImage::new(8, 8));
+static EMPTY_EIGH: LazyLock<RgbaImage> = LazyLock::new(|| RgbaImage::new(4, 4));
+
static FULL: Images = include!(concat!(env!("OUT_DIR"), "/full.rs"));
// static HALF: Images = include!(concat!(env!("OUT_DIR"), "/half.rs"));
static QUAR: Images = include!(concat!(env!("OUT_DIR"), "/quar.rs"));
@@ -120,12 +124,11 @@ impl std::ops::Mul<u32> for Scale {
}
pub(crate) fn try_load(name: &str, scale: Scale) -> Option<&'static RgbaImage> {
- let key = name.to_string();
match scale {
- Scale::Quarter => QUAR.get(&key).map(|v| LazyLock::force(v)),
- Scale::Eigth => EIGH.get(&key).map(|v| LazyLock::force(v)),
- Scale::Full => FULL.get(&key).map(|v| LazyLock::force(v)),
- // Scale::Half => HALF.get(&key).map(|v| LazyLock::force(v)),
+ Scale::Quarter => QUAR.get(&name).map(|v| LazyLock::force(v)),
+ Scale::Eigth => EIGH.get(&name).map(|v| LazyLock::force(v)),
+ Scale::Full => FULL.get(&name).map(|v| LazyLock::force(v)),
+ // Scale::Half => HALF.get(&name).map(|v| LazyLock::force(v)),
}
}