Minor config and salt changes to prep for release.

SirLyle · Nov 22, 2019 · 82e34df · 82e34df
1 parent 8cdd709
commit 82e34df
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/main/kotlin/exnihilofabrico/ExNihiloFabrico.kt b/src/main/kotlin/exnihilofabrico/ExNihiloFabrico.kt
@@ -69,7 +69,8 @@ object ExNihiloFabrico: ModInitializer {
             LOGGER.info("Creating Loot Tables")
             ArtificeUtils.generateLootTables(builder)
         }
-        dataPack.dumpResources("exnihilofabrico_generated")
+        if(config.modules.general.dumpGeneratedResource)
+            dataPack.dumpResources("exnihilofabrico_generated")
     }
 
     private fun registerCompatModules() {

diff --git a/src/main/kotlin/exnihilofabrico/ExNihiloFabricoClient.kt b/src/main/kotlin/exnihilofabrico/ExNihiloFabricoClient.kt
@@ -133,5 +133,7 @@ object ExNihiloFabricoClient: ClientModInitializer {
             }
         }
         ExNihiloFabrico.LOGGER.info("Created Resources")
+        if(ExNihiloFabrico.config.modules.general.dumpGeneratedResource)
+            resourcePack.dumpResources("exnihilofabrico_generated")
     }
 }
diff --git a/src/main/kotlin/exnihilofabrico/ExNihiloFabricoConfig.kt b/src/main/kotlin/exnihilofabrico/ExNihiloFabricoConfig.kt
@@ -25,7 +25,9 @@ class ModuleConfig {
 
 class GeneralConfig {
     @Comment("Load json files from <config>/exnihilofabrico/*.json")
-    var useJsonRecipes: Boolean = true
+    var useJsonRecipes: Boolean = false
+    @Comment("Dump generated json files to <minecraft>/exnihilofabrico_generated")
+    var dumpGeneratedResource: Boolean = false
 }
 
 class BarrelConfig {
@@ -58,9 +60,9 @@ class CrucibleConfig {
     var stoneVolume = 4
     @Comment("How many buckets of liquid can a wooden crucible store")
     var woodVolume = 1
-    @Comment("Can crucibles be enchanted with efficiency. (WIP)")
+    @Comment("Can crucibles be enchanted with efficiency.")
     var efficiency: Boolean = true
-    @Comment("Can stone crucibles be enchanted with flame. (WIP)")
+    @Comment("Can stone crucibles be enchanted with fire aspect.")
     var fireAspect: Boolean = true
 }
 

diff --git a/src/main/kotlin/exnihilofabrico/impl/BottleHarvestingImpl.kt b/src/main/kotlin/exnihilofabrico/impl/BottleHarvestingImpl.kt
@@ -11,7 +11,7 @@ object BottleHarvestingImpl {
         return if(target.block != Blocks.SAND)
             ItemStack.EMPTY
         else
-            ItemStack(getExNihiloItem("salt"))
+            ItemStack(getExNihiloItem("salt_bottle"))
     }
 
 }