[WIP] 1.14.4 port

src/main/kotlin/mods/betterfoliage/client/Client.kt

@@ -1,53 +1,48 @@
 package mods.betterfoliage.client
 
-import mods.betterfoliage.BetterFoliageMod
+import mods.betterfoliage.BetterFoliage
 import mods.betterfoliage.client.chunk.ChunkOverlayManager
-import mods.betterfoliage.client.gui.ConfigGuiFactory
-import mods.betterfoliage.client.integration.*
+import mods.betterfoliage.client.config.BlockConfig
+import mods.betterfoliage.client.integration.ForestryIntegration
+import mods.betterfoliage.client.integration.IC2RubberIntegration
+import mods.betterfoliage.client.integration.OptifineCustomColors
+import mods.betterfoliage.client.integration.TechRebornRubberIntegration
 import mods.betterfoliage.client.render.*
 import mods.betterfoliage.client.texture.*
-import mods.octarinecore.client.KeyHandler
 import mods.octarinecore.client.gui.textComponent
 import mods.octarinecore.client.render.AbstractBlockRenderingHandler
 import mods.octarinecore.client.resource.CenteringTextureGenerator
 import mods.octarinecore.client.resource.GeneratorPack
-import net.minecraft.block.Block
-import net.minecraft.block.state.IBlockState
+import mods.octarinecore.client.resource.IConfigChangeListener
+import net.minecraft.block.BlockState
 import net.minecraft.client.Minecraft
 import net.minecraft.util.math.BlockPos
-import net.minecraft.util.text.TextComponentTranslation
 import net.minecraft.util.text.TextFormatting
-import net.minecraftforge.fml.client.FMLClientHandler
-import net.minecraftforge.fml.relauncher.Side
-import net.minecraftforge.fml.relauncher.SideOnly
+import net.minecraft.util.text.TranslationTextComponent
+import net.minecraftforge.eventbus.api.SubscribeEvent
+import net.minecraftforge.fml.config.ModConfig
+import net.minecraftforge.registries.ForgeRegistries
 import org.apache.logging.log4j.Level
 
 /**
  * Object responsible for initializing (and holding a reference to) all the infrastructure of the mod
  * except for the call hooks.
- *
- * This and all other singletons are annotated [SideOnly] to avoid someone accidentally partially
- * initializing the mod on a server environment.
  */
-@SideOnly(Side.CLIENT)
 object Client {
+    var renderers= emptyList<AbstractBlockRenderingHandler>()
+    var configListeners = emptyList<IConfigChangeListener>()
 
-    lateinit var renderers: List<AbstractBlockRenderingHandler>
-    val suppressRenderErrors = mutableSetOf<IBlockState>()
+    val suppressRenderErrors = mutableSetOf<BlockState>()
 
-    // texture generation stuff
+    // texture generators
     val genGrass = GrassGenerator("bf_gen_grass")
     val genLeaves = LeafGenerator("bf_gen_leaves")
     val genReeds = CenteringTextureGenerator("bf_gen_reeds", 1, 2)
 
-    val generatorPack = GeneratorPack(
-        "Better Foliage generated",
-        genGrass,
-        genLeaves,
-        genReeds
-    )
-
     fun init() {
+        // add resource generators to pack
+        listOf(genGrass, genLeaves, genReeds).forEach { BetterFoliage.genPack.generators.add(it) }
+
         // init renderers
         renderers = listOf(
             RenderGrass(),
@@ -66,6 +61,7 @@ object Client {
 
         // init other singletons
         val singletons = listOf(
+            BlockConfig,
             StandardCactusRegistry,
             LeafParticleRegistry,
             ChunkOverlayManager,
@@ -75,7 +71,7 @@ object Client {
 
         // init mod integrations
         val integrations = listOf(
-            ShadersModIntegration,
+//            ShadersModIntegration,
             OptifineCustomColors,
             ForestryIntegration,
             IC2RubberIntegration,
@@ -87,30 +83,26 @@ object Client {
         LeafRegistry.addRegistry(StandardLeafRegistry)
         LogRegistry.addRegistry(StandardLogRegistry)
 
-        // init config hotkey
-        val configKey = KeyHandler(BetterFoliageMod.MOD_NAME, 66, "key.betterfoliage.gui") {
-            FMLClientHandler.instance().showGuiScreen(
-                ConfigGuiFactory.createBFConfigGui(Minecraft.getMinecraft().currentScreen)
-            )
-        }
+        configListeners = listOf(renderers, singletons, integrations).flatten().filterIsInstance<IConfigChangeListener>()
+        configListeners.forEach { it.onConfigChange() }
     }
 
     fun log(level: Level, msg: String) {
-        BetterFoliageMod.log.log(level, "[BetterFoliage] $msg")
-        BetterFoliageMod.logDetail.log(level, msg)
+        BetterFoliage.log.log(level, "[BetterFoliage] $msg")
+        BetterFoliage.logDetail.log(level, msg)
     }
 
     fun logDetail(msg: String) {
-        BetterFoliageMod.logDetail.log(Level.DEBUG, msg)
+        BetterFoliage.logDetail.log(Level.DEBUG, msg)
     }
 
-    fun logRenderError(state: IBlockState, location: BlockPos) {
+    fun logRenderError(state: BlockState, location: BlockPos) {
         if (state in suppressRenderErrors) return
         suppressRenderErrors.add(state)
 
-        val blockName = Block.REGISTRY.getNameForObject(state.block).toString()
+        val blockName = ForgeRegistries.BLOCKS.getKey(state.block).toString()
         val blockLoc = "${location.x},${location.y},${location.z}"
-        Minecraft.getMinecraft().ingameGUI.chatGUI.printChatMessage(TextComponentTranslation(
+        Minecraft.getInstance().ingameGUI.chatGUI.printChatMessage(TranslationTextComponent(
             "betterfoliage.rendererror",
             textComponent(blockName, TextFormatting.GOLD),
             textComponent(blockLoc, TextFormatting.GOLD)