Skip to content

Commit

Permalink
Squashed commit of textures-1.17
Browse files Browse the repository at this point in the history
Includes up to 393b4ac
- Initial texture updates
- ~~(remove before symlink)~~
- ~~(symlink textures folder)~~
- Initial updates stuff
- ~~(un-symlink things)~~
- Some more fixes
- fix lantern+pickle
- ~~(shuddup)~~
- ~~(Merge bennydiamond/cave_part_1)~~
- Fix itemframe by renaming RenderGlowItemFrame
- Fix buttons and fence gates
- Separate out pressure plate render
- Overload Render... methods for either argument order
- Fix cobblestone_wall types
- Woods, fences, and walls
- More technically correct fence gates
- (Fix item frame for button)
- Button improvements
- Fix slabs and purpur pillars
- Add hay/bone rotation
- Move all pillar-type blocks into one method
- WET SPONGE
- Fix rails / revamp RenderRail (and fix sponges)
- Fix leaves and cake slices
- Various fixes
- Move "rotation" to method + anvil fixes
- Remove all LegacyGetOldDataValue references, coral, & more
- Merge papyrus-mc#81
- Two forgotten pillars
- Stone brick, bed, and stair fixes
- One bed fix and rotation catch-all
- Quartz fixes
- Add dead chorus flowers
- Centre lightning rod rod and correct rotation
- Fix end rods
  • Loading branch information
hrmorley34 committed Jul 4, 2021
1 parent 74f9dbd commit 80c094b
Show file tree
Hide file tree
Showing 187 changed files with 1,626 additions and 479 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MapLoader.NUnitTests/textures/blocks/azalea_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MapLoader.NUnitTests/textures/blocks/azalea_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified MapLoader.NUnitTests/textures/blocks/blackstone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MapLoader.NUnitTests/textures/blocks/calcite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified MapLoader.NUnitTests/textures/blocks/coal_ore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MapLoader.NUnitTests/textures/blocks/copper_ore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MapLoader.NUnitTests/textures/blocks/cut_copper.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified MapLoader.NUnitTests/textures/blocks/diamond_ore.png
Binary file modified MapLoader.NUnitTests/textures/blocks/emerald_ore.png
Binary file modified MapLoader.NUnitTests/textures/blocks/gilded_blackstone.png
Binary file added MapLoader.NUnitTests/textures/blocks/glow_lichen.png
Binary file modified MapLoader.NUnitTests/textures/blocks/gold_ore.png
Binary file modified MapLoader.NUnitTests/textures/blocks/iron_ore.png
Binary file modified MapLoader.NUnitTests/textures/blocks/lapis_ore.png
Binary file added MapLoader.NUnitTests/textures/blocks/moss_block.png
Binary file added MapLoader.NUnitTests/textures/blocks/powder_snow.png
Binary file modified MapLoader.NUnitTests/textures/blocks/redstone_ore.png
Binary file modified MapLoader.NUnitTests/textures/blocks/smoker_top.png
Binary file added MapLoader.NUnitTests/textures/blocks/tuff.png
258 changes: 249 additions & 9 deletions MapLoader.NUnitTests/textures/terrain_texture.json

Large diffs are not rendered by default.

1,222 changes: 829 additions & 393 deletions Maploader/Renderer/Texture/TextureFinder.cs

Large diffs are not rendered by default.

18 changes: 3 additions & 15 deletions Maploader/World/World.cs
Original file line number Diff line number Diff line change
Expand Up @@ -430,26 +430,14 @@ 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") || (subtag.Name == "multi_face_direction_bits"))
if((subtag.Name == "direction") || (subtag.Name == "facing_direction") || (subtag.Name == "open_bit") || (subtag.Name == "multi_face_direction_bits") || (subtag.Name == "stripped_bit") || (subtag.Name == "wall_post_bit") || (subtag.Name == "button_pressed_bit") || (subtag.Name == "rail_direction") || (subtag.Name == "rail_data_bit") || (subtag.Name == "bite_counter") || (subtag.Name == "respawn_anchor_charge") || (subtag.Name == "growth") || (subtag.Name == "powered_bit") || (subtag.Name == "upper_block_bit") || (subtag.Name == "hanging") || (subtag.Name == "coral_direction") || (subtag.Name == "coral_hang_type_bit") || (subtag.Name == "dead_bit") || (subtag.Name == "end_portal_eye_bit") || (subtag.Name == "head_piece_bit") || (subtag.Name == "age"))
{
int subtagvalue = GetTagValue(subtag);
dictParams.Add(subtag.Name, subtagvalue);
}
if((subtag.Name == "color") || (subtag.Name == "lever_direction"))
if((subtag.Name == "color") || (subtag.Name == "lever_direction") || (subtag.Name == "wall_block_type") || (subtag.Name == "pillar_axis") || (subtag.Name == "wood_type") || (subtag.Name == "old_log_type") || (subtag.Name == "new_log_type") || (subtag.Name == "old_leaf_type") || (subtag.Name == "new_leaf_type") || (subtag.Name == "sapling_type") || subtag.Name.StartsWith("wall_connection_type_") || (subtag.Name == "chisel_type") || subtag.Name.StartsWith("stone_slab_type") || (subtag.Name == "sponge_type") || (subtag.Name == "double_plant_type") || (subtag.Name == "flower_type") || (subtag.Name == "sand_type") || (subtag.Name == "stone_type") || (subtag.Name == "damage") || (subtag.Name == "dripstone_thickness") || (subtag.Name == "coral_color") || (subtag.Name == "monster_egg_stone_type") || (subtag.Name == "stone_brick_type"))
{
if(subtag.TagType == NbtTagType.String)
{
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);
dictParams.Add(subtag.Name, subtag.StringValue);
}
}
break;
Expand Down
349 changes: 296 additions & 53 deletions PapyrusCs/PapyrusCs.csproj

Large diffs are not rendered by default.

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

0 comments on commit 80c094b

Please sign in to comment.