[WIP] finishing touches

+bunch of renames to bring the 2 version closer

src/main/kotlin/mods/betterfoliage/resource/generated/GeneratedLeafSprite.kt

@@ -21,7 +21,7 @@ import java.awt.image.BufferedImage
  *
  * @param[domain] Resource domain of generator
  */
-data class GeneratedLeaf(val baseSprite: ResourceLocation, val leafType: String, val atlas: Atlas = Atlas.BLOCKS) {
+data class GeneratedLeafSprite(val baseSprite: ResourceLocation, val leafType: String, val atlas: Atlas = Atlas.BLOCKS) {
 
     fun register(pack: GeneratedTexturePack) = pack.register(atlas, this, this::draw)
 
@@ -73,7 +73,7 @@ data class GeneratedLeaf(val baseSprite: ResourceLocation, val leafType: String,
      * @param[maxSize] Preferred mask size.
      */
     fun getLeafMask(type: String, maxSize: Int) = getMultisizeTexture(maxSize) { size ->
-        ResourceLocation(BetterFoliageMod.MOD_ID, "textures/blocks/leafmask_${size}_${type}.png")
+        Atlas.BLOCKS.file(ResourceLocation(BetterFoliageMod.MOD_ID, "blocks/leafmask_${size}_${type}"))
     }
 
     /**

src/main/kotlin/mods/betterfoliage/resource/generated/ResourceGeneration.kt

@@ -2,6 +2,7 @@ package mods.betterfoliage.resource.generated
 
 import mods.betterfoliage.BetterFoliageMod
 import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.HasLogger
 import net.minecraft.client.Minecraft
 import net.minecraft.client.resources.ClientResourcePackInfo
 import net.minecraft.resources.*
@@ -22,10 +23,7 @@ import java.util.function.Supplier
  */
 class GeneratedTexturePack(
     val nameSpace: String, val packName: String
-) : IResourcePack {
-
-    val logger = BetterFoliageMod.detailLogger(this)
-
+) : HasLogger(), IResourcePack {
     override fun getName() = packName
     override fun getResourceNamespaces(type: ResourcePackType) = setOf(nameSpace)
     override fun <T : Any?> getMetadata(deserializer: IMetadataSectionSerializer<T>) = null
@@ -47,7 +45,7 @@ class GeneratedTexturePack(
 
         identifiers[key] = id
         resources[fileName] = resource
-        logger.log(INFO, "generated resource $key -> $fileName")
+        detailLogger.log(INFO, "generated resource $key -> $fileName")
         return id
     }