From e1b33121aa7c00432dd077edfc4e888bbf2e59c3 Mon Sep 17 00:00:00 2001
From: Alexander Minges <alexander.minges@gmail.com>
Date: Mon, 18 May 2020 18:36:39 +0200
Subject: [PATCH] Update Optifine's natural.properties to match current texture
 names

---
 assets/minecraft/optifine/natural.properties | 283 ++++++++-----------
 1 file changed, 111 insertions(+), 172 deletions(-)

diff --git a/assets/minecraft/optifine/natural.properties b/assets/minecraft/optifine/natural.properties
index ec0758a..3db8ab7 100644
--- a/assets/minecraft/optifine/natural.properties
+++ b/assets/minecraft/optifine/natural.properties
@@ -1,181 +1,120 @@
-# Template configuration for OptiFine's Natural Textures
-#
-# Rename this file to "natural.properties" to activate the configuration.
+# Configuration for OptiFine's Natural Textures feature
+# Location: /assets/minecraft/optifine/natural.properties
 #
 # Configuration format
-# <texture_file>:<tile_num>=<value>
+# <texture_name> = <value>
 #
 # Values
-# 4 = Rotate x 90� (4 variations)
-# 2 = Rotate x 180� (2 variations)
-# F = Flip texture horizontally (2 variations)
-# 4F = 4 + Flip (8 variations)
-# 2F = 2 + Flip (4 variations)
+# 4 = Rotate x 90° (4 variants)
+# 2 = Rotate x 180° (2 variants)
+# F = Flip texture horizontally (2 variants)
+# 4F = 4 + Flip (8 variants)
+# 2F = 2 + Flip (4 variants)
 #
-# Example for grass texture which can rotate with 4 variations and flip
-# /terrain.png:0=4F
+# Example for obsidian texture which can rotate with 4 variants and flip
+# obsidian = 4F
 #
 
 # Grass
-grass_top=4F
-# Stone
-stone=2
-# Dirt
-#dirt=F
-# Grass side
-#grass_side=F
-#grass_side_overlay=F
-# Slab
-stoneslab_top=F
-# Bedrock
-bedrock=2F
-# Sand
-#sand=2
-# Gravel
-gravel=4
-# log sides
-log_oak=F
-log_spruce=F
-log_birch=F
-log_jungle=F
-# Wood top
-log_oak_top=4F
-
-log_jungle_top=4F
-
-log_birch_top=4F
-
-log_spruce_top=4F
-# Ores (gold, iron, coal, diamond, redstone, lapis)
-gold_ore=F
-iron_ore=F
-coal_ore=F
-diamond_ore=F
-redstone_ore=F
-lapis_ore=F
-emerald_ore=F
-quartz_ore=F
-# Obsidian
-#obsidian=4F
-# Leaves 
-leaves_oak=F
-leaves_oak_opaque=F
-# Jungle leaves
-leaves_jungle=2
-leaves_jungle_opaque=2
+grass_block_top = 4F
+grass_block_top1 = 4F
+grass_block_top2 = 4F
+grass_block_top3 = 4F
+# Grass extras (flowers)
+grass_block_top_extra = 4F
+grass_block_top_extra1 = 4F
+# grass_block_side = F
+# grass_block_side_overlay = F
+grass_block_snow = F
+mycelium_side = F
+mycelium_top = 4F
+grass_path_top = 4
+grass_path_side = F
 # Snow
-snow=2F
-# Snow grass side
-snow_side=F
-# Cactus side
-#cactus_side=F
-# Clay
-clay=F
-# Mycelium side
-mycelium_side=F
-# Mycelium top
-mycelium_top=4F
-# Farmland hydrated
-farmland_wet=2F
-# Farmland
-farmland_dry=F
-# Netherrack
-netherrack=4
-# Soul sand
-soul_sand=4F
-# Glowstone
-glowstone=4
-# Pine leaves
-#leaves_spruce=2F
-#leaves_spruce_opaque=2F
-# Endstone
-#end_stone=F
-# Sandstone top
-sandstone_top=4
-# Sandstone bottom
-sandstone_bottom=4F
-# Redstone lamp
-#redstone_lamp_off=4F
-#redstone_lamp_on=4F
-#quartz_block_chiseled_top=4
-#hardened_clay=2
-
-#hardened_clay_stained_black=2
-
-#hardened_clay_stained_blue=2
-
-#hardened_clay_stained_brown=2
-
-#hardened_clay_stained_cyan=2
-
-#hardened_clay_stained_gray=2
-#hardened_clay_stained_green=2
-
-#hardened_clay_stained_light_blue=2
-
-#hardened_clay_stained_lime=2
-
-#hardened_clay_stained_magenta=2
-
-#hardened_clay_stained_orange=2
-
-#hardened_clay_stained_pink=2
-
-#hardened_clay_stained_purple=2
-
-#hardened_clay_stained_red=2
-
-#hardened_clay_stained_silver=2
-
-#hardened_clay_stained_white=2
-
-#hardened_clay_stained_yellow=2
-
-hay_block_top=4
-
-cake_top=4F
-
-cake_side=F
-
-carrots_stage_0=F
-
-carrots_stage_1=F
-
-carrots_stage_2=F
-
-carrots_stage_3=F
-
-potatoes_stage_0=F
-
-potatoes_stage_1=F
-
-potatoes_stage_2=F
-
-potatoes_stage_3=F
-
-wheat_stage_7=F
-#lava_flow=4F
-
-#lava_still=4
-
-mushroom_block_inside=F
-
-mushroom_block_skin_brown=4F
-
-mushroom_block_skin_red=4F
-
-mushroom_block_skin_stem=F
-
-portal=4F
-
-redstone_dust_cross_overlay=4F
-
-redstone_dust_cross=4F
-
-redstone_dust_line_overlay=4F
-
-redstone_dust_line=4F
-
-#water_still=4F
-
-waterlily=4F
\ No newline at end of file
+snow = 4F
+# Dirt
+coarse_dirt = 4F
+podzol_top = 4F
+# podzol_side = F
+farmland = 2F
+farmland_moist = 2F
+# Stone
+granite = 2F
+granite1 = 2F
+diorite = 2F
+diorite1 = 2F
+andesite = 2F
+andesite1 = 2F
+sandstone_top = 4
+sandstone_bottom = 4F
+stone = 2
+stone1 = 2
+stone2 = 2
+stone3 = 2
+stone4 = 2
+stone5 = 2
+stone_slab_top = F
+end_stone = 4
+# Gravel
+gravel = 4
+clay = F
+# Logs
+oak_log = F
+oak_log1 = F
+spruce_log = F
+spruce_log1 = F
+birch_log = F
+birch_log1 = F
+jungle_log = F
+jungle_log1 = F
+acacia_log = F
+acacia_log1 = F
+dark_oak_log = F
+oak_log_top = 4F
+spruce_log_top = 4F
+birch_log_top = 4F
+jungle_log_top = 4F
+acacia_log_top = 4F
+dark_oak_log_top = 4F
+# Leaves
+oak_leaves = 4F
+oak_leaves1 = 4F
+spruce_leaves = 4F
+spruce_leaves1 = 4F
+birch_leaves = 4F
+birch_leaves1 = 4F
+jungle_leaves = 4F
+jungle_leaves1 = 4F
+dark_oak_leaves = 4F
+dark_oak_leaves1 = 4F
+acacia_leaves = 4F
+acacia_leaves1 = 4F
+# Ores
+gold_ore = F
+gold_ore1 = F
+iron_ore = F
+iron_ore1 = F
+coal_ore = F
+coal_ore1 = F
+coal_ore2 = F
+diamond_ore = F
+diamond_ore1 = F
+emerald_ore = F
+emerald_ore1 = F
+redstone_ore = F
+redstone_ore1 = F
+lapis_ore = F
+lapis_ore1 = F
+# Nether
+netherrack = 4
+nether_quartz_ore = 2
+soul_sand = 4F
+glowstone = 4
+# Redstone
+# redstone_lamp_on = 4F
+# redstone_lamp = 4F
+# Prismarine
+prismarine = 4F
+# Misc
+obsidian = 2
+cactus_top = 4F
\ No newline at end of file