Skip to content

Commit 875e389

Browse files
authored
Update to 1.18.0 (#95)
* Fix furnace, lit furnace to use top texture * Fix issues when bitsPerBlock == 0 (#91) * Fix y-level ranges * Update textures to 1.18 * Fix issues with render size * Various fixes * Improve candle rendering * Improve grindstone rendering * Improve lever rendering * Improve sign/banner rendering * Improve repeater/comparator rendering * Improve string rendering It looks like in the game it is scaled down more, so this is the best we can do. * Improve bell rendering * Fix lectern rotation * Fix loom rotation * Fix some comments * Fix cocoa beans * Fix bamboo
1 parent 44ea82a commit 875e389

File tree

155 files changed

+1190
-4920
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+1190
-4920
lines changed

MapLoader.NUnitTests/MapLoader.NUnitTests.csproj

+6-2,142
Large diffs are not rendered by default.

MapLoader.NUnitTests/textures/terrain_texture.json

+213
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,18 @@
189189
"birch_trapdoor" : {
190190
"textures" : "textures/blocks/birch_trapdoor"
191191
},
192+
"black_candle" : {
193+
"textures" : [
194+
"textures/blocks/candles/black_candle",
195+
"textures/blocks/candles/black_candle_lit"
196+
]
197+
},
198+
"black_candle_cake" : {
199+
"textures" : "textures/blocks/cake"
200+
},
201+
"black_candle_carried" : {
202+
"textures" : "textures/items/candles/black_candle"
203+
},
192204
"black_glazed_terracotta" : {
193205
"textures" : "textures/blocks/glazed_terracotta_black"
194206
},
@@ -230,6 +242,18 @@
230242
"textures/blocks/blast_furnace_top"
231243
]
232244
},
245+
"blue_candle" : {
246+
"textures" : [
247+
"textures/blocks/candles/blue_candle",
248+
"textures/blocks/candles/blue_candle_lit"
249+
]
250+
},
251+
"blue_candle_cake" : {
252+
"textures" : "textures/blocks/cake"
253+
},
254+
"blue_candle_carried" : {
255+
"textures" : "textures/items/candles/blue_candle"
256+
},
233257
"blue_glazed_terracotta" : {
234258
"textures" : "textures/blocks/glazed_terracotta_blue"
235259
},
@@ -260,6 +284,18 @@
260284
"brick" : {
261285
"textures" : "textures/blocks/brick"
262286
},
287+
"brown_candle" : {
288+
"textures" : [
289+
"textures/blocks/candles/brown_candle",
290+
"textures/blocks/candles/brown_candle_lit"
291+
]
292+
},
293+
"brown_candle_cake" : {
294+
"textures" : "textures/blocks/cake"
295+
},
296+
"brown_candle_carried" : {
297+
"textures" : "textures/items/candles/brown_candle"
298+
},
263299
"brown_glazed_terracotta" : {
264300
"textures" : "textures/blocks/glazed_terracotta_brown"
265301
},
@@ -351,6 +387,18 @@
351387
"campfire_log_lit" : {
352388
"textures" : "textures/blocks/campfire_log_lit"
353389
},
390+
"candle" : {
391+
"textures" : [
392+
"textures/blocks/candles/candle",
393+
"textures/blocks/candles/candle_lit"
394+
]
395+
},
396+
"candle_cake" : {
397+
"textures" : "textures/blocks/cake"
398+
},
399+
"candle_carried" : {
400+
"textures" : "textures/items/candles/candle"
401+
},
354402
"carrots" : {
355403
"textures" : [
356404
"textures/blocks/carrots_stage_0",
@@ -727,6 +775,18 @@
727775
"cut_copper" : {
728776
"textures" : "textures/blocks/cut_copper"
729777
},
778+
"cyan_candle" : {
779+
"textures" : [
780+
"textures/blocks/candles/cyan_candle",
781+
"textures/blocks/candles/cyan_candle_lit"
782+
]
783+
},
784+
"cyan_candle_cake" : {
785+
"textures" : "textures/blocks/cake"
786+
},
787+
"cyan_candle_carried" : {
788+
"textures" : "textures/items/candles/cyan_candle"
789+
},
730790
"cyan_glazed_terracotta" : {
731791
"textures" : "textures/blocks/glazed_terracotta_cyan"
732792
},
@@ -1217,9 +1277,33 @@
12171277
"gravel" : {
12181278
"textures" : "textures/blocks/gravel"
12191279
},
1280+
"gray_candle" : {
1281+
"textures" : [
1282+
"textures/blocks/candles/gray_candle",
1283+
"textures/blocks/candles/gray_candle_lit"
1284+
]
1285+
},
1286+
"gray_candle_cake" : {
1287+
"textures" : "textures/blocks/cake"
1288+
},
1289+
"gray_candle_carried" : {
1290+
"textures" : "textures/items/candles/gray_candle"
1291+
},
12201292
"gray_glazed_terracotta" : {
12211293
"textures" : "textures/blocks/glazed_terracotta_gray"
12221294
},
1295+
"green_candle" : {
1296+
"textures" : [
1297+
"textures/blocks/candles/green_candle",
1298+
"textures/blocks/candles/green_candle_lit"
1299+
]
1300+
},
1301+
"green_candle_cake" : {
1302+
"textures" : "textures/blocks/cake"
1303+
},
1304+
"green_candle_carried" : {
1305+
"textures" : "textures/items/candles/green_candle"
1306+
},
12231307
"green_glazed_terracotta" : {
12241308
"textures" : "textures/blocks/glazed_terracotta_green"
12251309
},
@@ -1436,12 +1520,45 @@
14361520
"textures/items/light_block_15"
14371521
]
14381522
},
1523+
"light_blue_candle" : {
1524+
"textures" : [
1525+
"textures/blocks/candles/light_blue_candle",
1526+
"textures/blocks/candles/light_blue_candle_lit"
1527+
]
1528+
},
1529+
"light_blue_candle_carried" : {
1530+
"textures" : "textures/items/candles/light_blue_candle"
1531+
},
14391532
"light_blue_glazed_terracotta" : {
14401533
"textures" : "textures/blocks/glazed_terracotta_light_blue"
14411534
},
1535+
"light_gray_candle" : {
1536+
"textures" : [
1537+
"textures/blocks/candles/light_gray_candle",
1538+
"textures/blocks/candles/light_gray_candle_lit"
1539+
]
1540+
},
1541+
"light_gray_candle_cake" : {
1542+
"textures" : "textures/blocks/cake"
1543+
},
1544+
"light_gray_candle_carried" : {
1545+
"textures" : "textures/items/candles/light_gray_candle"
1546+
},
14421547
"lightning_rod" : {
14431548
"textures" : "textures/blocks/lightning_rod"
14441549
},
1550+
"lime_candle" : {
1551+
"textures" : [
1552+
"textures/blocks/candles/lime_candle",
1553+
"textures/blocks/candles/lime_candle_lit"
1554+
]
1555+
},
1556+
"lime_candle_cake" : {
1557+
"textures" : "textures/blocks/cake"
1558+
},
1559+
"lime_candle_carried" : {
1560+
"textures" : "textures/items/candles/lime_candle"
1561+
},
14451562
"lime_glazed_terracotta" : {
14461563
"textures" : "textures/blocks/glazed_terracotta_lime"
14471564
},
@@ -1493,6 +1610,15 @@
14931610
"loom_top" : {
14941611
"textures" : "textures/blocks/loom_top"
14951612
},
1613+
"magenta_candle" : {
1614+
"textures" : [
1615+
"textures/blocks/candles/magenta_candle",
1616+
"textures/blocks/candles/magenta_candle_lit"
1617+
]
1618+
},
1619+
"magenta_candle_carried" : {
1620+
"textures" : "textures/items/candles/magenta_candle"
1621+
},
14961622
"magenta_glazed_terracotta" : {
14971623
"textures" : "textures/blocks/glazed_terracotta_magenta"
14981624
},
@@ -1858,6 +1984,15 @@
18581984
"obsidian" : {
18591985
"textures" : "textures/blocks/obsidian"
18601986
},
1987+
"orange_candle" : {
1988+
"textures" : [
1989+
"textures/blocks/candles/orange_candle",
1990+
"textures/blocks/candles/orange_candle_lit"
1991+
]
1992+
},
1993+
"orange_candle_carried" : {
1994+
"textures" : "textures/items/candles/orange_candle"
1995+
},
18611996
"orange_glazed_terracotta" : {
18621997
"textures" : "textures/blocks/glazed_terracotta_orange"
18631998
},
@@ -1867,6 +2002,18 @@
18672002
"oxidized_cut_copper" : {
18682003
"textures" : "textures/blocks/oxidized_cut_copper"
18692004
},
2005+
"pink_candle" : {
2006+
"textures" : [
2007+
"textures/blocks/candles/pink_candle",
2008+
"textures/blocks/candles/pink_candle_lit"
2009+
]
2010+
},
2011+
"pink_candle_cake" : {
2012+
"textures" : "textures/blocks/cake"
2013+
},
2014+
"pink_candle_carried" : {
2015+
"textures" : "textures/items/candles/pink_candle"
2016+
},
18702017
"pink_glazed_terracotta" : {
18712018
"textures" : "textures/blocks/glazed_terracotta_pink"
18722019
},
@@ -1960,6 +2107,24 @@
19602107
"textures/blocks/potatoes_stage_3"
19612108
]
19622109
},
2110+
"potted_azalea_bush_plant" : {
2111+
"textures" : "textures/blocks/potted_azalea_bush_plant"
2112+
},
2113+
"potted_azalea_bush_side" : {
2114+
"textures" : "textures/blocks/potted_azalea_bush_side"
2115+
},
2116+
"potted_azalea_bush_top" : {
2117+
"textures" : "textures/blocks/potted_azalea_bush_top"
2118+
},
2119+
"potted_flowering_azalea_bush_plant" : {
2120+
"textures" : "textures/blocks/potted_flowering_azalea_bush_plant"
2121+
},
2122+
"potted_flowering_azalea_bush_side" : {
2123+
"textures" : "textures/blocks/potted_flowering_azalea_bush_side"
2124+
},
2125+
"potted_flowering_azalea_bush_top" : {
2126+
"textures" : "textures/blocks/potted_flowering_azalea_bush_top"
2127+
},
19632128
"powder_snow" : {
19642129
"textures" : "textures/blocks/powder_snow"
19652130
},
@@ -2000,6 +2165,18 @@
20002165
"textures/blocks/pumpkin_top"
20012166
]
20022167
},
2168+
"purple_candle" : {
2169+
"textures" : [
2170+
"textures/blocks/candles/purple_candle",
2171+
"textures/blocks/candles/purple_candle_lit"
2172+
]
2173+
},
2174+
"purple_candle_cake" : {
2175+
"textures" : "textures/blocks/cake"
2176+
},
2177+
"purple_candle_carried" : {
2178+
"textures" : "textures/items/candles/purple_candle"
2179+
},
20032180
"purple_glazed_terracotta" : {
20042181
"textures" : "textures/blocks/glazed_terracotta_purple"
20052182
},
@@ -2094,6 +2271,18 @@
20942271
"textures/blocks/reactor_core_stage_2"
20952272
]
20962273
},
2274+
"red_candle" : {
2275+
"textures" : [
2276+
"textures/blocks/candles/red_candle",
2277+
"textures/blocks/candles/red_candle_lit"
2278+
]
2279+
},
2280+
"red_candle_cake" : {
2281+
"textures" : "textures/blocks/cake"
2282+
},
2283+
"red_candle_carried" : {
2284+
"textures" : "textures/items/candles/red_candle"
2285+
},
20972286
"red_flower" : {
20982287
"textures" : [
20992288
"textures/blocks/flower_rose",
@@ -2928,6 +3117,18 @@
29283117
"textures/blocks/wheat_stage_7"
29293118
]
29303119
},
3120+
"white_candle" : {
3121+
"textures" : [
3122+
"textures/blocks/candles/white_candle",
3123+
"textures/blocks/candles/white_candle_lit"
3124+
]
3125+
},
3126+
"white_candle_cake" : {
3127+
"textures" : "textures/blocks/cake"
3128+
},
3129+
"white_candle_carried" : {
3130+
"textures" : "textures/items/candles/white_candle"
3131+
},
29313132
"white_glazed_terracotta" : {
29323133
"textures" : "textures/blocks/glazed_terracotta_white"
29333134
},
@@ -2988,6 +3189,18 @@
29883189
"textures/blocks/wool_colored_black"
29893190
]
29903191
},
3192+
"yellow_candle" : {
3193+
"textures" : [
3194+
"textures/blocks/candles/yellow_candle",
3195+
"textures/blocks/candles/yellow_candle_lit"
3196+
]
3197+
},
3198+
"yellow_candle_cake" : {
3199+
"textures" : "textures/blocks/cake"
3200+
},
3201+
"yellow_candle_carried" : {
3202+
"textures" : "textures/items/candles/yellow_candle"
3203+
},
29913204
"yellow_flower" : {
29923205
"textures" : "textures/blocks/flower_dandelion"
29933206
},

0 commit comments

Comments
 (0)