Cave & Cliffs Update: Part 1 support (#77)

* Include updated block textures from pack * Add in missing textures * Re-use tripwire hook render correct method for lightning rod * Fix lightning rod placement & added more Transparent blocks * Do not use TripWire render method * Render dripstone Only render tip texture. Centered. Orientation fixed. * Fix render glow lichen Will only render top and bottom facing texture. TODO transform base texture and place for side facing lichen. * Fix lightning rod render top/bottom orientation * Fix render glow item frame Will only render top and bottom facing texture. TODO transform base texture and place for side facing lichen. * Fix wrong texture for some azalea blocks * Fix amethyst cluster render orientation * Fix amethyst buds orientation and translation * Variable for clarity * Fix small dripleaf orientation * Fix lightning rod orientation when placed sideways * Added missing "double-cut" variants texture map * Add missing rendering rules for cave vines and variants Fix for #78
papyrus-mc · Jun 26, 2021 · 74f9dbd · 74f9dbd
1 parent 8032db8
commit 74f9dbd
Show file tree

Hide file tree

Showing 95 changed files with 624 additions and 21 deletions.
diff --git a/Maploader/Renderer/ChunkRenderer.cs b/Maploader/Renderer/ChunkRenderer.cs
@@ -259,7 +259,7 @@ public void RenderChunk(TImage dest, Chunk c, int xOffset, int zOffset)
                         textureFinder.FindTexturePath(block.Block.Id, block.Block.Data, block.X, block.Z, block.Y);
                     if (textures == null)
                     {
-                        Console.WriteLine($"\nMissing Texture(2): {block.ToString().PadRight(30)}");
+                        Console.WriteLine($"Missing Texture(2): {block.ToString().PadRight(30)}");
                         MissingTextures.Add($"ID: {block.Block.Id}");
                         continue;
                     }

diff --git a/Maploader/Renderer/Texture/TextureFinder.cs b/Maploader/Renderer/Texture/TextureFinder.cs
diff --git a/Maploader/World/World.cs b/Maploader/World/World.cs
@@ -430,7 +430,7 @@ private static (string, Dictionary<string, Object>) GetNbtVal(MemoryStream ms)
                                 IEnumerable<fNbt.Tags.NbtTag> enumTag = (IEnumerable<fNbt.Tags.NbtTag>)tag;
                                 foreach(var subtag in enumTag)
                                 {
-                                    if((subtag.Name == "direction") || (subtag.Name == "facing_direction") || (subtag.Name == "open_bit"))
+                                    if((subtag.Name == "direction") || (subtag.Name == "facing_direction") || (subtag.Name == "open_bit") || (subtag.Name == "multi_face_direction_bits"))
                                     {
                                         int subtagvalue = GetTagValue(subtag);
                                         dictParams.Add(subtag.Name, subtagvalue); 
@@ -442,6 +442,15 @@ private static (string, Dictionary<string, Object>) GetNbtVal(MemoryStream ms)
                                             dictParams.Add(subtag.Name, subtag.StringValue); 
                                         }
                                     }
+                                    if(subtag.Name == "dripstone_thickness")
+                                    {
+                                        dictParams.Add(subtag.Name, subtag.StringValue); 
+                                    }
+                                    if(subtag.Name == "hanging")
+                                    {
+                                        int subtagvalue = GetTagValue(subtag);
+                                        dictParams.Add(subtag.Name, subtagvalue); 
+                                    }
                                 }
                             break;
                         case "val":

diff --git a/PapyrusCs/textures/blocks/amethyst_block.png b/PapyrusCs/textures/blocks/amethyst_block.png
diff --git a/PapyrusCs/textures/blocks/amethyst_cluster.png b/PapyrusCs/textures/blocks/amethyst_cluster.png
diff --git a/PapyrusCs/textures/blocks/azalea_leaves.png b/PapyrusCs/textures/blocks/azalea_leaves.png
diff --git a/PapyrusCs/textures/blocks/azalea_leaves_flowers.png b/PapyrusCs/textures/blocks/azalea_leaves_flowers.png
diff --git a/PapyrusCs/textures/blocks/azalea_leaves_flowers_opaque.png b/PapyrusCs/textures/blocks/azalea_leaves_flowers_opaque.png
diff --git a/PapyrusCs/textures/blocks/azalea_leaves_opaque.png b/PapyrusCs/textures/blocks/azalea_leaves_opaque.png
diff --git a/PapyrusCs/textures/blocks/azalea_plant.png b/PapyrusCs/textures/blocks/azalea_plant.png
diff --git a/PapyrusCs/textures/blocks/azalea_side.png b/PapyrusCs/textures/blocks/azalea_side.png
diff --git a/PapyrusCs/textures/blocks/azalea_top.png b/PapyrusCs/textures/blocks/azalea_top.png
diff --git a/PapyrusCs/textures/blocks/big_dripleaf_side1.png b/PapyrusCs/textures/blocks/big_dripleaf_side1.png
diff --git a/PapyrusCs/textures/blocks/big_dripleaf_side2.png b/PapyrusCs/textures/blocks/big_dripleaf_side2.png
diff --git a/PapyrusCs/textures/blocks/big_dripleaf_stem.png b/PapyrusCs/textures/blocks/big_dripleaf_stem.png
diff --git a/PapyrusCs/textures/blocks/big_dripleaf_top.png b/PapyrusCs/textures/blocks/big_dripleaf_top.png
diff --git a/PapyrusCs/textures/blocks/blackstone.png b/PapyrusCs/textures/blocks/blackstone.png
diff --git a/PapyrusCs/textures/blocks/budding_amethyst.png b/PapyrusCs/textures/blocks/budding_amethyst.png
diff --git a/PapyrusCs/textures/blocks/calcite.png b/PapyrusCs/textures/blocks/calcite.png
diff --git a/PapyrusCs/textures/blocks/cave_vines_body.png b/PapyrusCs/textures/blocks/cave_vines_body.png
diff --git a/PapyrusCs/textures/blocks/cave_vines_body_berries.png b/PapyrusCs/textures/blocks/cave_vines_body_berries.png
diff --git a/PapyrusCs/textures/blocks/cave_vines_head.png b/PapyrusCs/textures/blocks/cave_vines_head.png
diff --git a/PapyrusCs/textures/blocks/cave_vines_head_berries.png b/PapyrusCs/textures/blocks/cave_vines_head_berries.png
diff --git a/PapyrusCs/textures/blocks/coal_ore.png b/PapyrusCs/textures/blocks/coal_ore.png
diff --git a/PapyrusCs/textures/blocks/copper_block.png b/PapyrusCs/textures/blocks/copper_block.png
diff --git a/PapyrusCs/textures/blocks/copper_ore.png b/PapyrusCs/textures/blocks/copper_ore.png
diff --git a/PapyrusCs/textures/blocks/cut_copper.png b/PapyrusCs/textures/blocks/cut_copper.png
diff --git a/PapyrusCs/textures/blocks/deepslate/chiseled_deepslate.png b/PapyrusCs/textures/blocks/deepslate/chiseled_deepslate.png
diff --git a/PapyrusCs/textures/blocks/deepslate/cobbled_deepslate.png b/PapyrusCs/textures/blocks/deepslate/cobbled_deepslate.png
diff --git a/PapyrusCs/textures/blocks/deepslate/cracked_deepslate_bricks.png b/PapyrusCs/textures/blocks/deepslate/cracked_deepslate_bricks.png
diff --git a/PapyrusCs/textures/blocks/deepslate/cracked_deepslate_tiles.png b/PapyrusCs/textures/blocks/deepslate/cracked_deepslate_tiles.png
diff --git a/PapyrusCs/textures/blocks/deepslate/deepslate.png b/PapyrusCs/textures/blocks/deepslate/deepslate.png
diff --git a/PapyrusCs/textures/blocks/deepslate/deepslate_bricks.png b/PapyrusCs/textures/blocks/deepslate/deepslate_bricks.png
diff --git a/PapyrusCs/textures/blocks/deepslate/deepslate_coal_ore.png b/PapyrusCs/textures/blocks/deepslate/deepslate_coal_ore.png
diff --git a/PapyrusCs/textures/blocks/deepslate/deepslate_copper_ore.png b/PapyrusCs/textures/blocks/deepslate/deepslate_copper_ore.png
diff --git a/PapyrusCs/textures/blocks/deepslate/deepslate_diamond_ore.png b/PapyrusCs/textures/blocks/deepslate/deepslate_diamond_ore.png
diff --git a/PapyrusCs/textures/blocks/deepslate/deepslate_emerald_ore.png b/PapyrusCs/textures/blocks/deepslate/deepslate_emerald_ore.png
diff --git a/PapyrusCs/textures/blocks/deepslate/deepslate_gold_ore.png b/PapyrusCs/textures/blocks/deepslate/deepslate_gold_ore.png
diff --git a/PapyrusCs/textures/blocks/deepslate/deepslate_iron_ore.png b/PapyrusCs/textures/blocks/deepslate/deepslate_iron_ore.png
diff --git a/PapyrusCs/textures/blocks/deepslate/deepslate_lapis_ore.png b/PapyrusCs/textures/blocks/deepslate/deepslate_lapis_ore.png
diff --git a/PapyrusCs/textures/blocks/deepslate/deepslate_redstone_ore.png b/PapyrusCs/textures/blocks/deepslate/deepslate_redstone_ore.png
diff --git a/PapyrusCs/textures/blocks/deepslate/deepslate_tiles.png b/PapyrusCs/textures/blocks/deepslate/deepslate_tiles.png
diff --git a/PapyrusCs/textures/blocks/deepslate/deepslate_top.png b/PapyrusCs/textures/blocks/deepslate/deepslate_top.png
diff --git a/PapyrusCs/textures/blocks/deepslate/polished_deepslate.png b/PapyrusCs/textures/blocks/deepslate/polished_deepslate.png
diff --git a/PapyrusCs/textures/blocks/diamond_ore.png b/PapyrusCs/textures/blocks/diamond_ore.png
diff --git a/PapyrusCs/textures/blocks/dirt_with_roots.png b/PapyrusCs/textures/blocks/dirt_with_roots.png
diff --git a/PapyrusCs/textures/blocks/dripstone_block.png b/PapyrusCs/textures/blocks/dripstone_block.png
diff --git a/PapyrusCs/textures/blocks/emerald_ore.png b/PapyrusCs/textures/blocks/emerald_ore.png
diff --git a/PapyrusCs/textures/blocks/exposed_copper.png b/PapyrusCs/textures/blocks/exposed_copper.png
diff --git a/PapyrusCs/textures/blocks/exposed_cut_copper.png b/PapyrusCs/textures/blocks/exposed_cut_copper.png
diff --git a/PapyrusCs/textures/blocks/flowering_azalea_side.png b/PapyrusCs/textures/blocks/flowering_azalea_side.png
diff --git a/PapyrusCs/textures/blocks/flowering_azalea_top.png b/PapyrusCs/textures/blocks/flowering_azalea_top.png
diff --git a/PapyrusCs/textures/blocks/gilded_blackstone.png b/PapyrusCs/textures/blocks/gilded_blackstone.png
diff --git a/PapyrusCs/textures/blocks/glow_item_frame.png b/PapyrusCs/textures/blocks/glow_item_frame.png
diff --git a/PapyrusCs/textures/blocks/glow_lichen.png b/PapyrusCs/textures/blocks/glow_lichen.png
diff --git a/PapyrusCs/textures/blocks/gold_ore.png b/PapyrusCs/textures/blocks/gold_ore.png
diff --git a/PapyrusCs/textures/blocks/grass_block_snow.png b/PapyrusCs/textures/blocks/grass_block_snow.png
diff --git a/PapyrusCs/textures/blocks/hanging_roots.png b/PapyrusCs/textures/blocks/hanging_roots.png
diff --git a/PapyrusCs/textures/blocks/iron_ore.png b/PapyrusCs/textures/blocks/iron_ore.png
diff --git a/PapyrusCs/textures/blocks/lapis_ore.png b/PapyrusCs/textures/blocks/lapis_ore.png
diff --git a/PapyrusCs/textures/blocks/large_amethyst_bud.png b/PapyrusCs/textures/blocks/large_amethyst_bud.png
diff --git a/PapyrusCs/textures/blocks/lightning_rod.png b/PapyrusCs/textures/blocks/lightning_rod.png
diff --git a/PapyrusCs/textures/blocks/medium_amethyst_bud.png b/PapyrusCs/textures/blocks/medium_amethyst_bud.png
diff --git a/PapyrusCs/textures/blocks/moss_block.png b/PapyrusCs/textures/blocks/moss_block.png
diff --git a/PapyrusCs/textures/blocks/oxidized_copper.png b/PapyrusCs/textures/blocks/oxidized_copper.png
diff --git a/PapyrusCs/textures/blocks/oxidized_cut_copper.png b/PapyrusCs/textures/blocks/oxidized_cut_copper.png
diff --git a/PapyrusCs/textures/blocks/pointed_dripstone_down_base.png b/PapyrusCs/textures/blocks/pointed_dripstone_down_base.png
diff --git a/PapyrusCs/textures/blocks/pointed_dripstone_down_frustum.png b/PapyrusCs/textures/blocks/pointed_dripstone_down_frustum.png
diff --git a/PapyrusCs/textures/blocks/pointed_dripstone_down_merge.png b/PapyrusCs/textures/blocks/pointed_dripstone_down_merge.png
diff --git a/PapyrusCs/textures/blocks/pointed_dripstone_down_middle.png b/PapyrusCs/textures/blocks/pointed_dripstone_down_middle.png
diff --git a/PapyrusCs/textures/blocks/pointed_dripstone_down_tip.png b/PapyrusCs/textures/blocks/pointed_dripstone_down_tip.png
diff --git a/PapyrusCs/textures/blocks/pointed_dripstone_up_base.png b/PapyrusCs/textures/blocks/pointed_dripstone_up_base.png
diff --git a/PapyrusCs/textures/blocks/pointed_dripstone_up_frustum.png b/PapyrusCs/textures/blocks/pointed_dripstone_up_frustum.png
diff --git a/PapyrusCs/textures/blocks/pointed_dripstone_up_merge.png b/PapyrusCs/textures/blocks/pointed_dripstone_up_merge.png
diff --git a/PapyrusCs/textures/blocks/pointed_dripstone_up_middle.png b/PapyrusCs/textures/blocks/pointed_dripstone_up_middle.png
diff --git a/PapyrusCs/textures/blocks/pointed_dripstone_up_tip.png b/PapyrusCs/textures/blocks/pointed_dripstone_up_tip.png
diff --git a/PapyrusCs/textures/blocks/powder_snow.png b/PapyrusCs/textures/blocks/powder_snow.png
diff --git a/PapyrusCs/textures/blocks/raw_copper_block.png b/PapyrusCs/textures/blocks/raw_copper_block.png
diff --git a/PapyrusCs/textures/blocks/raw_gold_block.png b/PapyrusCs/textures/blocks/raw_gold_block.png
diff --git a/PapyrusCs/textures/blocks/raw_iron_block.png b/PapyrusCs/textures/blocks/raw_iron_block.png
diff --git a/PapyrusCs/textures/blocks/redstone_ore.png b/PapyrusCs/textures/blocks/redstone_ore.png
diff --git a/PapyrusCs/textures/blocks/small_amethyst_bud.png b/PapyrusCs/textures/blocks/small_amethyst_bud.png
diff --git a/PapyrusCs/textures/blocks/small_dripleaf_side.png b/PapyrusCs/textures/blocks/small_dripleaf_side.png
diff --git a/PapyrusCs/textures/blocks/small_dripleaf_stem_bottom.png b/PapyrusCs/textures/blocks/small_dripleaf_stem_bottom.png
diff --git a/PapyrusCs/textures/blocks/small_dripleaf_stem_top.png b/PapyrusCs/textures/blocks/small_dripleaf_stem_top.png
diff --git a/PapyrusCs/textures/blocks/small_dripleaf_top.png b/PapyrusCs/textures/blocks/small_dripleaf_top.png
diff --git a/PapyrusCs/textures/blocks/smoker_top.png b/PapyrusCs/textures/blocks/smoker_top.png
diff --git a/PapyrusCs/textures/blocks/smooth_basalt.png b/PapyrusCs/textures/blocks/smooth_basalt.png
diff --git a/PapyrusCs/textures/blocks/spore_blossom.png b/PapyrusCs/textures/blocks/spore_blossom.png
diff --git a/PapyrusCs/textures/blocks/spore_blossom_base.png b/PapyrusCs/textures/blocks/spore_blossom_base.png
diff --git a/PapyrusCs/textures/blocks/tinted_glass.png b/PapyrusCs/textures/blocks/tinted_glass.png
diff --git a/PapyrusCs/textures/blocks/tuff.png b/PapyrusCs/textures/blocks/tuff.png
diff --git a/PapyrusCs/textures/blocks/weathered_copper.png b/PapyrusCs/textures/blocks/weathered_copper.png
diff --git a/PapyrusCs/textures/blocks/weathered_cut_copper.png b/PapyrusCs/textures/blocks/weathered_cut_copper.png