From 594db19bfbb710df2a84727ac2a652ace52b65e5 Mon Sep 17 00:00:00 2001
From: octarine-noise <octarine.noise@gmail.com>
Date: Tue, 27 Apr 2021 15:15:26 +0200
Subject: [PATCH] update block configs

---
 .../mods/betterfoliage/config/BlockConfig.kt       | 14 +++++++-------
 .../assets/betterfoliage/cactus_default.cfg        |  3 ++-
 .../assets/betterfoliage/crop_default.cfg          | 13 +++++++------
 .../assets/betterfoliage/lilypad_default.cfg       |  6 ++----
 .../assets/betterfoliage/log_blocks_default.cfg    |  3 ++-
 .../betterfoliage/mycelium_blocks_default.cfg      |  3 ++-
 .../betterfoliage/netherrack_blocks_default.cfg    |  2 --
 .../assets/betterfoliage/sand_default.cfg          |  6 ++----
 8 files changed, 24 insertions(+), 26 deletions(-)
 delete mode 100644 src/main/resources/assets/betterfoliage/netherrack_blocks_default.cfg

diff --git a/src/main/kotlin/mods/betterfoliage/config/BlockConfig.kt b/src/main/kotlin/mods/betterfoliage/config/BlockConfig.kt
index e8e5111..a203799 100644
--- a/src/main/kotlin/mods/betterfoliage/config/BlockConfig.kt
+++ b/src/main/kotlin/mods/betterfoliage/config/BlockConfig.kt
@@ -14,15 +14,15 @@ class BlockConfig  {
     val leafModels = models("leaves_models_default.cfg")
     val grassBlocks = blocks("grass_blocks_default.cfg")
     val grassModels = models("grass_models_default.cfg")
-    val mycelium = blocks("mycelium_blocks_default.cfg")
-    //    val dirt = blocks("dirt_default.cfg")
-    val crops = blocks("crop_default.cfg")
+//    val mycelium = blocks("mycelium_blocks_default.cfg")
+//    val dirt = blocks("dirt_default.cfg")
+//    val crops = blocks("crop_default.cfg")
     val logBlocks = blocks("log_blocks_default.cfg")
     val logModels = models("log_models_default.cfg")
-    val sand = blocks("sand_default.cfg")
-    val lilypad = blocks("lilypad_default.cfg")
-    val cactus = blocks("cactus_default.cfg")
-    val netherrack = blocks("netherrack_blocks_default.cfg")
+//    val sand = blocks("sand_default.cfg")
+//    val lilypad = blocks("lilypad_default.cfg")
+//    val cactus = blocks("cactus_default.cfg")
+//    val netherrack = blocks("netherrack_blocks_default.cfg")
 
     private fun blocks(cfgName: String) = ConfigurableBlockMatcher(BetterFoliage.logDetail, Identifier(BetterFoliage.MOD_ID, cfgName)).apply { list.add(this) }
     private fun models(cfgName: String) = ModelTextureListConfiguration(BetterFoliage.logDetail, Identifier(BetterFoliage.MOD_ID, cfgName)).apply { list.add(this) }
diff --git a/src/main/resources/assets/betterfoliage/cactus_default.cfg b/src/main/resources/assets/betterfoliage/cactus_default.cfg
index 33675c2..f678135 100644
--- a/src/main/resources/assets/betterfoliage/cactus_default.cfg
+++ b/src/main/resources/assets/betterfoliage/cactus_default.cfg
@@ -1,2 +1,3 @@
 // Vanilla
-net.minecraft.block.CactusBlock
+//net.minecraft.block.CactusBlock
+net.minecraft.class_2266
diff --git a/src/main/resources/assets/betterfoliage/crop_default.cfg b/src/main/resources/assets/betterfoliage/crop_default.cfg
index 778ccbf..b6cbf0a 100644
--- a/src/main/resources/assets/betterfoliage/crop_default.cfg
+++ b/src/main/resources/assets/betterfoliage/crop_default.cfg
@@ -1,10 +1,11 @@
 // Vanilla
-net.minecraft.block.TallGrassBlock
-net.minecraft.block.CropsBlock
--net.minecraft.block.ReedBlock
--net.minecraft.block.DoublePlantBlock
--net.minecraft.block.CarrotBlock
--net.minecraft.block.PotatoBlock
+//net.minecraft.block.FernBlock
+net.minecraft.class_2526
+//net.minecraft.block.CropBlock
+net.minecraft.class_2302
+
+//-net.minecraft.block.TallPlantBlock
+-net.minecraft.class_2320
 
 // Biomes O'Plenty
 biomesoplenty.common.block.BlockBOPFlower
diff --git a/src/main/resources/assets/betterfoliage/lilypad_default.cfg b/src/main/resources/assets/betterfoliage/lilypad_default.cfg
index 1408f60..d7d535f 100644
--- a/src/main/resources/assets/betterfoliage/lilypad_default.cfg
+++ b/src/main/resources/assets/betterfoliage/lilypad_default.cfg
@@ -1,8 +1,6 @@
 // Vanilla
-net.minecraft.block.BlockLilyPad
+//net.minecraft.block.LilyPadBlock
+net.minecraft.class_2553
 
 // Biomes O'Plenty
 biomesoplenty.common.block.BlockBOPLilypad
-
-// TerraFirmaCraft
-com.bioxx.tfc.Blocks.Vanilla.BlockCustomLilyPad
diff --git a/src/main/resources/assets/betterfoliage/log_blocks_default.cfg b/src/main/resources/assets/betterfoliage/log_blocks_default.cfg
index b71b073..8dcbc2d 100644
--- a/src/main/resources/assets/betterfoliage/log_blocks_default.cfg
+++ b/src/main/resources/assets/betterfoliage/log_blocks_default.cfg
@@ -1,2 +1,3 @@
 // Vanilla
-net.minecraft.block.LogBlock
+//net.minecraft.block.LogBlock
+net.minecraft.class_2410
diff --git a/src/main/resources/assets/betterfoliage/mycelium_blocks_default.cfg b/src/main/resources/assets/betterfoliage/mycelium_blocks_default.cfg
index 73e1a43..318f28a 100644
--- a/src/main/resources/assets/betterfoliage/mycelium_blocks_default.cfg
+++ b/src/main/resources/assets/betterfoliage/mycelium_blocks_default.cfg
@@ -1,2 +1,3 @@
 // Vanilla
-net.minecraft.block.MyceliumBlock
+//net.minecraft.block.MyceliumBlock
+net.minecraft.class_2418
diff --git a/src/main/resources/assets/betterfoliage/netherrack_blocks_default.cfg b/src/main/resources/assets/betterfoliage/netherrack_blocks_default.cfg
deleted file mode 100644
index 7ff4300..0000000
--- a/src/main/resources/assets/betterfoliage/netherrack_blocks_default.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-// Vanilla
-net.minecraft.block.NetherrackBlock
diff --git a/src/main/resources/assets/betterfoliage/sand_default.cfg b/src/main/resources/assets/betterfoliage/sand_default.cfg
index a1330e8..4c44a25 100644
--- a/src/main/resources/assets/betterfoliage/sand_default.cfg
+++ b/src/main/resources/assets/betterfoliage/sand_default.cfg
@@ -1,5 +1,3 @@
 // Vanilla
-net.minecraft.block.BlockSand
-
-// TerraFirmaCraft
-com.bioxx.tfc.Blocks.Terrain.BlockSand
\ No newline at end of file
+//net.minecraft.block.SandBlock
+net.minecraft.class_2468