;uylkrjteztdrf

build.gradle.kts

···
 plugins {
     java
     kotlin("jvm") version "2.0.21"
-    id("earth.terrarium.cloche") version "0.8.1"
+    id("earth.terrarium.cloche") version "0.8.6"
     `maven-publish`
 }
 
···
 fun kotlinx(module: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$module:$version"
 
 cloche {
+    minecraftVersion = minecraft_version
     metadata {
         modId = prop("mod_id")
         name = prop("mod_name")
···
     }
 
     common {
-        minecraftVersion = minecraft_version
-
         client {
             val main = sourceSets.getByName("main")
             sourceSet.compileClasspath += main.compileClasspath
···
         }
 
         dependencies {
+            api(kotlin("stdlib"))
+            api(kotlin("stdlib-jdk8"))
             api(kotlin("reflect"))
             api(kotlinx("coroutines-core", "1.10.1"))
             //modCompileOnly("net.fabricmc.fabric-api:fabric-transitive-access-wideners-v1:4.3.1+1802ada577")
···
         accessWideners.from(file("src/main/kritter.accesswidener"))
     }
 
-    fabric("fabric:$minecraft_version") {
+    fabric("fabric") {
         loaderVersion = prop("fabric_loader_version")
-        minecraftVersion = minecraft_version
+        //minecraftVersion = minecraft_version
 
         dependencies {
             fabricApi(prop("fabric_version")!!)
···
             }
         }
 
-        accessWideners.from(file("src/fabric/1.20.1/kritter_fabric.accesswidener"))
+        accessWideners.from(file("src/fabric/kritter_fabric.accesswidener"))
     }
 
-    forge("forge:$minecraft_version") {
+    forge("forge") {
         loaderVersion = prop("forge_version")
-        minecraftVersion = minecraft_version
+        //minecraftVersion = minecraft_version
 
         runs {
             client()
···
         }
     }
 
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 java {

kritter-datagen/build.gradle.kts

···
-
-repositories {
-    mavenLocal()
-
-    gradlePluginPortal()
-
-    maven(url = "https://maven.msrandom.net/repository/root")
-}
-
-
-plugins {
-    java
-    kotlin("jvm") version "2.0.21"
-    id("earth.terrarium.cloche") version "0.8.1"
-    `maven-publish`
-}
-
-dependencies {
-    implementation(rootProject)
-}
+//
+//repositories {
+//    mavenLocal()
+//
+//    gradlePluginPortal()
+//
+//    maven(url = "https://maven.msrandom.net/repository/root")
+//}
+//
+//
+//plugins {
+//    java
+//    kotlin("jvm") version "2.0.21"
+//    id("earth.terrarium.cloche") version "0.8.3"
+//    `maven-publish`
+//}
+//
+//dependencies {
+//    implementation(rootProject)
+//}
+//
+//cloche {
+//    common {
+//        dependencies {
+//            implementation(dependencyFactory.create(rootProject))
+//        }
+//    }
+//}

src/fabric/1.20.1/main/kotlin/uwu/serenity/kritter/RegistryManagerFabric.kt src/fabric/main/kotlin/uwu/serenity/kritter/RegistryManagerFabric.kt

···
 package uwu.serenity.kritter
 
 import uwu.serenity.kritter.fabric.RegistryManagerImpl
+import uwu.serenity.kritter.RegistryManager
 
 @Suppress("ACTUAL_WITHOUT_EXPECT")
 public actual fun RegistryManager(modid: String): RegistryManager = RegistryManagerImpl(modid)

src/fabric/1.20.1/main/kotlin/uwu/serenity/kritter/api/creative/CreativeTabsFabric.kt src/fabric/main/kotlin/uwu/serenity/kritter/api/creative/CreativeTabsFabric.kt

···
 import net.minecraft.resources.ResourceKey
 import net.minecraft.world.item.CreativeModeTab
 import uwu.serenity.kritter.fabric.CreativeTabContextImpl
+import uwu.serenity.kritter.api.creative.CreativeTabContext
 import uwu.serenity.kritter.utils.plus
 import java.util.concurrent.ConcurrentHashMap
 
 private val tabCallbacks: MutableMap<ResourceKey<CreativeModeTab>, (CreativeTabContext) -> Unit> = ConcurrentHashMap()
 
+@Suppress("ACTUAL_WITHOUT_EXPECT")
 public actual fun ResourceKey<CreativeModeTab>.modify(modifier: CreativeTabContext.() -> Unit) {
     if(!tabCallbacks.containsKey(this)) {
         ItemGroupEvents.modifyEntriesEvent(this).register {

src/fabric/1.20.1/main/kotlin/uwu/serenity/kritter/fabric/CreativeTabContextImpl.kt src/fabric/main/kotlin/uwu/serenity/kritter/fabric/CreativeTabContextImpl.kt

···
         visibility: TabVisibility
     ) {
         when (placement) {
-            TabPlacement.START -> entries.selectStacks(visibility) { addAll(stacks) }
-            TabPlacement.END -> entries.selectStacks(visibility) { addAll(0, stacks) }
+            TabPlacement.START -> entries.selectStacks(visibility) { addAll(0, stacks) }
+            TabPlacement.END -> entries.acceptAll(stacks, visibility)
             is TabPlacement.BEFORE -> entries.addBefore(placement.predicate, stacks, visibility)
             is TabPlacement.AFTER -> entries.addAfter(placement.predicate, stacks, visibility)
         }

src/fabric/1.20.1/main/kotlin/uwu/serenity/kritter/fabric/RegistryManager.kt src/fabric/main/kotlin/uwu/serenity/kritter/fabric/RegistryManager.kt

···
 import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.resources.ResourceKey
+import net.minecraft.world.entity.SpawnPlacements
 import uwu.serenity.kritter.RegistryManager
 import uwu.serenity.kritter.api.Registrar
 import uwu.serenity.kritter.internal.InternalKritterAPI

src/fabric/1.20.1/main/kotlin/uwu/serenity/kritter/internal/Internal.kt src/fabric/main/kotlin/uwu/serenity/kritter/internal/Internal.kt

···
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.SpawnEggItem
 import uwu.serenity.kritter.RegistryManager
+import uwu.serenity.kritter.internal.InternalKritterAPI
 
 @InternalKritterAPI
 public actual object LibPlatform {

src/fabric/1.20.1/main/kotlin/uwu/serenity/kritter/platform/Fabric.kt src/fabric/main/kotlin/uwu/serenity/kritter/platform/Fabric.kt

···
 
 import net.fabricmc.api.EnvType
 import net.fabricmc.loader.api.FabricLoader
+import uwu.serenity.kritter.platform.Environment
 import java.nio.file.Path
 
 public actual val GAME_DIRECTORY: Path = FabricLoader.getInstance().gameDir

src/forge/1.20.1/main/kotlin/uwu/serenity/kritter/RegistryManagerForge.kt src/forge/kotlin/uwu/serenity/kritter/RegistryManagerForge.kt

···
     set(value) { (this as RegistryManagerImpl).eventBus = value }
 
 @Mod("kritter")
-public object KritterForge
+public class KritterForge

src/forge/1.20.1/main/kotlin/uwu/serenity/kritter/api/creative/CreativeTabsForge.kt src/forge/kotlin/uwu/serenity/kritter/api/creative/CreativeTabsForge.kt

···
 package uwu.serenity.kritter.api.creative
 
+import com.google.common.collect.MapMaker
+import com.mojang.serialization.RecordBuilder.MapBuilder
 import net.minecraft.resources.ResourceKey
 import net.minecraft.world.item.CreativeModeTab
 import uwu.serenity.kritter.utils.plus

src/main/kotlin/uwu/serenity/kritter/api/Registrar.kt

···
 ) : Registrar<T> {
 
     private val registry: RegistryHolder<T> = RegistryHolder(registry)
-    private var isCustomRegistry: Boolean = BuiltInRegistries.REGISTRY.containsKey(key.location())
+    private var isCustomRegistry: Boolean = !BuiltInRegistries.REGISTRY.containsKey(key.location())
 
     private val entries: MutableMap<ResourceKey<T>, RegistryEntry<out T>> = ConcurrentHashMap()
     private val siblings: MutableMap<ResourceKey<*>, Registrar<*>> = Object2ObjectOpenHashMap()

src/main/kotlin/uwu/serenity/kritter/stdlib/BlockEntities.kt

···
 public interface BlockEntityBlock<out BE : BlockEntity> : EntityBlock {
 
     /**
-     * This block's block entity type
+     * The block's block entity's class
      */
-    public val blockEntityType: BlockEntityType<out BE>
+    public val blockEntityClass: KClass<out BE>
 
     /**
-     * The block's block entity's class
+     * This block's block entity type
+     * Is a method to guarantee this is not accessed during instantation of the block
      */
-    public val blockEntityClass: KClass<out BE>
+    public fun getBlockEntityType(): BlockEntityType<out BE>
 
     /**
      * Extension function to get a block entity with the specidic type
      */
     @Suppress("UNCHECKED_CAST")
     public fun Level.getBlockEntityOfType(pos: BlockPos): BE? = getBlockEntity(pos)?.let {
-        if(blockEntityClass.isInstance(it) && it.type === blockEntityType) it as BE else null
+        if(blockEntityClass.isInstance(it) && it.type === getBlockEntityType()) it as BE else null
     }
 
     override fun <T : BlockEntity> getListener(level: ServerLevel, blockEntity: T): GameEventListener?
···
         } else null
 
 
-    override fun newBlockEntity(pos: BlockPos, state: BlockState): BlockEntity? = blockEntityType.create(pos, state)
+    override fun newBlockEntity(pos: BlockPos, state: BlockState): BlockEntity? = getBlockEntityType().create(pos, state)
 }
 
 public interface TickableBlockEntity {

src/main/kotlin/uwu/serenity/kritter/stdlib/Blocks.kt

···
 
     public inline fun <I : BlockItem> item(
         noinline factory: (Block, Item.Properties) -> I,
-        name: String = "",
+        name: String = this.name,
         builder: ItemBuilder<I>.() -> Unit = {}
     ) {
         val items = owner.sibling(Registries.ITEM)

src/main/kotlin/uwu/serenity/kritter/stdlib/Entities.kt

···
 import uwu.serenity.kritter.api.builders.Builder
 import uwu.serenity.kritter.api.builders.BuilderCallback
 import uwu.serenity.kritter.api.creative.TabPlacement
-import uwu.serenity.kritter.api.entry.RegistryEntry
 import uwu.serenity.kritter.internal.InternalKritterAPI
 import uwu.serenity.kritter.internal.LibPlatform
 import uwu.serenity.kritter.utils.plus
···
 }
 
 public fun <E : Mob> EntityBuilder<E>.spawnPlacement(decorator: SpawnPlacements.Type, heightmap: Heightmap.Types, predicate: SpawnPredicate<E>) {
-    // onRegister { SpawnPlacements.register(it, decorator, heightmap, predicate) }
+    onRegister { SpawnPlacements.register(it, decorator, heightmap, predicate) }
 }
 
 @OptIn(InternalKritterAPI::class)

testmod/build.gradle.kts

···
+plugins {
+    java
+    kotlin("jvm") version "2.0.21"
+    id("earth.terrarium.cloche") version "0.8.6"
+    idea
+}
+
+repositories {
+    maven(url = "https://maven.parchmentmc.org") { name = "Parchment" }
+    maven(url = "https://maven.fabricmc.net") { name = "FabricMC" }
+    maven(url = "https://maven.msrandom.net/repository/root") { name = "Ashley"}
+    maven(url = "https://maven.terraformersmc.com/releases/") { name = "TerraformersMC" }
+    maven(url = "https://thedarkcolour.github.io/KotlinForForge/") { name = "KotlinForForge" }
+    mavenCentral()
+}
+
+cloche {
+    minecraftVersion = "1.20.1"
+    common {
+        dependencies {
+            implementation(project(":"))
+        }
+    }
+
+    fabric {
+        loaderVersion = "0.16.9"
+        includedClient()
+
+        runs {
+            client()
+            server()
+        }
+
+        dependencies {
+            fabricApi("0.92.2+1.20.1")
+            modImplementation("net.fabricmc:fabric-language-kotlin:1.12.3+kotlin.2.0.21")
+        }
+    }
+
+    forge {
+        loaderVersion = "47.1.3"
+
+        runs {
+            client()
+            server()
+        }
+
+        dependencies {
+            implementation("thedarkcolour:kotlinforforge:4.11.0")
+        }
+    }
+}