From 0c78c2b73f4b8616b3040c7a22699c3af9fc8fab Mon Sep 17 00:00:00 2001
From: Ashley Wright <ashley@msrandom.net>
Date: Tue, 27 Aug 2024 04:00:39 +0300
Subject: [PATCH 1/2] Basic cloche migration

---
 build.gradle.kts                              | 119 +++++++--------
 gradle.properties                             |   6 +-
 settings.gradle.kts                           |   4 +-
 .../earth/terrarium/tempad/data/TempadData.kt |   0
 .../tempad/data/client/ModItemModelData.kt    |   0
 .../28205fb7d31429f22ad1b73c98b1db1855765172  |  29 ----
 .../assets/tempad/models/item/blank_card.json |   6 -
 .../tempad/models/item/chronon_generator.json |  26 ----
 .../models/item/chronon_generator_1.json      |   7 -
 .../models/item/chronon_generator_2.json      |   7 -
 .../models/item/chronon_generator_3.json      |   7 -
 .../tempad/models/item/location_card.json     |   6 -
 .../models/item/new_location_upgrade.json     |   6 -
 .../models/item/player_teleport_upgrade.json  |   6 -
 .../assets/tempad/models/item/tempad.json     | 136 ------------------
 .../models/item/tempad/attached_idle_0.json   |   6 -
 .../models/item/tempad/attached_idle_1.json   |   7 -
 .../models/item/tempad/attached_idle_2.json   |   7 -
 .../models/item/tempad/attached_idle_3.json   |   7 -
 .../models/item/tempad/attached_in_use_0.json |   7 -
 .../models/item/tempad/attached_in_use_1.json |   8 --
 .../models/item/tempad/attached_in_use_2.json |   8 --
 .../models/item/tempad/attached_in_use_3.json |   8 --
 .../models/item/tempad/base_idle_0.json       |   6 -
 .../models/item/tempad/base_idle_1.json       |   7 -
 .../models/item/tempad/base_idle_2.json       |   7 -
 .../models/item/tempad/base_idle_3.json       |   7 -
 .../models/item/tempad/base_in_use_0.json     |   7 -
 .../models/item/tempad/base_in_use_1.json     |   8 --
 .../models/item/tempad/base_in_use_2.json     |   8 --
 .../models/item/tempad/base_in_use_3.json     |   8 --
 .../tempad/models/item/temporal_beacon.json   |  14 --
 .../models/item/temporal_beacon_on.json       |   6 -
 .../tempad/models/item/time_twister.json      |   6 -
 34 files changed, 54 insertions(+), 453 deletions(-)
 rename src/{main => data}/kotlin/earth/terrarium/tempad/data/TempadData.kt (100%)
 rename src/{main => data}/kotlin/earth/terrarium/tempad/data/client/ModItemModelData.kt (100%)
 delete mode 100644 src/generated/resources/.cache/28205fb7d31429f22ad1b73c98b1db1855765172
 delete mode 100644 src/generated/resources/assets/tempad/models/item/blank_card.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/chronon_generator.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/chronon_generator_1.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/chronon_generator_2.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/chronon_generator_3.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/location_card.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/new_location_upgrade.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/player_teleport_upgrade.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/attached_idle_0.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/attached_idle_1.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/attached_idle_2.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/attached_idle_3.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_0.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_1.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_2.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_3.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/base_idle_0.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/base_idle_1.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/base_idle_2.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/base_idle_3.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/base_in_use_0.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/base_in_use_1.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/base_in_use_2.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/tempad/base_in_use_3.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/temporal_beacon.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/temporal_beacon_on.json
 delete mode 100644 src/generated/resources/assets/tempad/models/item/time_twister.json

diff --git a/build.gradle.kts b/build.gradle.kts
index ce5bc9af..ea49009f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,25 +1,23 @@
 import groovy.json.StringEscapeUtils
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    java
-    idea
     kotlin("jvm") version "2.0.0"
-    id("maven-publish")
+    id("earth.terrarium.cloche") version "0.1.4"
+
     id("com.teamresourceful.resourcefulgradle") version "0.0.+"
-    id("net.neoforged.gradle.userdev") version "7.0.153"
+
+    `maven-publish`
 }
 
-val minecraftVersion: String by project
 val modId: String by project
 
-base {
-    archivesName.set("$modId-$minecraftVersion")
-}
+val parchmentMinecraftVersion: String by project
+val parchmentMappingsVersion: String by project
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(21)
-jarJar.enable()
+val minecraftVersion: String by project
+val neoforgeVersion: String by project
+
+private val _minecraftVersion = minecraftVersion
 
 repositories {
     maven(url = "https://maven.architectury.dev/")
@@ -32,10 +30,30 @@ repositories {
     mavenLocal()
 }
 
-dependencies {
-    val neoforgeVersion: String by project
-    val minecraft_version: String by project
+tasks.jar {
+    archiveClassifier.set(minecraftVersion)
+}
+
+cloche {
+    val _modId = modId
+
+    metadata {
+        modId.set(_modId)
+    }
+
+    minecraftVersion.set(_minecraftVersion)
+
+    neoforge {
+        loaderVersion.set(neoforgeVersion)
+    }
+
+    mappings {
+        official()
+        parchment(parchmentMappingsVersion, minecraftVersion=parchmentMinecraftVersion)
+    }
+}
 
+dependencies {
     val resourcefulConfigVersion: String by project
     val resourcefulLibVersion: String by project
     val resourcefulLibKtVersion: String by project
@@ -46,8 +64,6 @@ dependencies {
     val jadeVersion: String by project
     val jeiVersion: String by project
 
-    implementation("net.neoforged:neoforge:${neoforgeVersion}")
-
     compileOnly("mekanism:Mekanism:${mekanismVersion}:api")
 
     runtimeOnly("mekanism:Mekanism:${mekanismVersion}")
@@ -55,25 +71,29 @@ dependencies {
     runtimeOnly("mekanism:Mekanism:${mekanismVersion}:generators")
     runtimeOnly("mekanism:Mekanism:${mekanismVersion}:tools")
 
-    implementation("com.teamresourceful.resourcefulconfig:resourcefulconfig-neoforge-${minecraft_version}:${resourcefulConfigVersion}")
-    implementation("com.teamresourceful.resourcefullib:resourcefullib-neoforge-${minecraft_version}:${resourcefulLibVersion}")
+    implementation("com.teamresourceful.resourcefulconfig:resourcefulconfig-neoforge-${minecraftVersion}:${resourcefulConfigVersion}")
+    implementation("com.teamresourceful.resourcefullib:resourcefullib-neoforge-${minecraftVersion}:${resourcefulLibVersion}")
     compileOnly("com.teamresourceful:bytecodecs:1.1.0")
     implementation("thedarkcolour:kotlinforforge-neoforge:${kotlinForForgeVersion}")
-    implementation("com.teamresourceful.resourcefullibkt:resourcefullibkt-neoforge-${minecraft_version}:${resourcefulLibKtVersion}") {
+    implementation("com.teamresourceful.resourcefullibkt:resourcefullibkt-neoforge-${minecraftVersion}:${resourcefulLibKtVersion}") {
         isTransitive = false
     }
 
+    /*
     jarJar(group = "com.teamresourceful.resourcefullibkt", name = "resourcefullibkt-neoforge-${minecraft_version}", version = resourcefulLibKtVersion).also {
         jarJar.pin(it, "[${resourcefulLibKtVersion})")
     }
+    */
 
     implementation(group = "earth.terrarium.olympus", name = "olympus-neoforge-$minecraftVersion", version = "1.0.1") {
         isTransitive = false
     }
 
+    /*
     jarJar(group = "earth.terrarium.olympus", name = "olympus-neoforge-$minecraftVersion", version = "1.0.1").also {
         jarJar.pin(it, "[1.0.1)")
     }
+    */
 
     implementation("top.theillusivec4.curios:curios-neoforge:${curiosVersion}")
 
@@ -83,30 +103,16 @@ dependencies {
     implementation("maven.modrinth:jade:$jadeVersion")
 
     // compile against the JEI API but do not include it at runtime
-    compileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jeiVersion}")
-    compileOnly("mezz.jei:jei-${minecraft_version}-neoforge-api:${jeiVersion}")
+    compileOnly("mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}")
+    compileOnly("mezz.jei:jei-${minecraftVersion}-neoforge-api:${jeiVersion}")
     // at runtime, use the full JEI jar for NeoForge
-    runtimeOnly("mezz.jei:jei-${minecraft_version}-neoforge:${jeiVersion}")
-}
-
-java {
-    withSourcesJar()
-}
-
-tasks.jar {
-    archiveClassifier.set("dev")
-}
-
-tasks.processResources {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    filesMatching(listOf("META-INF/neoforge.mods.toml")) {
-        expand("version" to project.version)
-    }
+    runtimeOnly("mezz.jei:jei-${minecraftVersion}-neoforge:${jeiVersion}")
 }
 
 kotlin {
+    jvmToolchain(21)
+
     compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_21)
         freeCompilerArgs.add("-Xjvm-default=all")
         freeCompilerArgs.add("-Xcontext-receivers")
     }
@@ -119,7 +125,6 @@ kotlin {
 publishing {
     publications {
         create<MavenPublication>("maven") {
-            artifactId = "$modId-$minecraftVersion"
             from(components["java"])
 
             pom {
@@ -154,42 +159,16 @@ publishing {
 resourcefulGradle {
     templates {
         register("embed") {
-            val minecraftVersion: String by project
-            val version: String by project
             val changelog: String = file("changelog.md").readText(Charsets.UTF_8)
-            val fabricLink: String? = System.getenv("FABRIC_RELEASE_URL")
             val forgeLink: String? = System.getenv("FORGE_RELEASE_URL")
 
             source.set(file("templates/embed.json.template"))
             injectedValues.set(mapOf(
-                    "minecraft" to minecraftVersion,
-                    "version" to version,
-                    "changelog" to StringEscapeUtils.escapeJava(changelog),
-                    "fabric_link" to fabricLink,
-                    "forge_link" to forgeLink
+                "minecraft" to minecraftVersion,
+                "version" to version.toString(),
+                "changelog" to StringEscapeUtils.escapeJava(changelog),
+                "forge_link" to forgeLink
             ))
         }
     }
 }
-
-runs {
-    // other run configurations here
-
-    maybeCreate("data").apply {
-        programArguments.addAll(
-            "--mod", modId,
-            "--all",
-            "--output", file("src/generated/resources").absolutePath,
-            "--existing", file("src/main/resources/").absolutePath,
-            "--client",
-            "--server"
-        )
-    }
-}
-
-idea {
-    module {
-        isDownloadJavadoc = true
-        isDownloadSources = true
-    }
-}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 7e57c6d5..280a8f65 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,10 +5,8 @@ group=me.codexadrian.tempad
 modId=tempad
 version=3.0.0-beta.1
 
-neogradle.subsystems.parchment.minecraftVersion=1.20.6
-neogradle.subsystems.parchment.mappingsVersion=2024.05.01
-
-minecraft_version=1.21
+parchmentMinecraftVersion=1.20.6
+parchmentMappingsVersion=2024.05.01
 
 minecraftVersion=1.21
 neoforgeVersion=21.0.166
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b38b14ac..8259a50d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,12 +1,14 @@
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
-rootProject.name = "Tempad"
+rootProject.name = "tempad"
 
 pluginManagement {
     repositories {
+        mavenLocal()
         maven(url = "https://maven.architectury.dev/")
         maven(url = "https://maven.neoforged.net/releases/")
         maven(url = "https://maven.resourcefulbees.com/repository/maven-public/")
+        maven(url = "https://jitpack.io/")
         gradlePluginPortal()
     }
 }
diff --git a/src/main/kotlin/earth/terrarium/tempad/data/TempadData.kt b/src/data/kotlin/earth/terrarium/tempad/data/TempadData.kt
similarity index 100%
rename from src/main/kotlin/earth/terrarium/tempad/data/TempadData.kt
rename to src/data/kotlin/earth/terrarium/tempad/data/TempadData.kt
diff --git a/src/main/kotlin/earth/terrarium/tempad/data/client/ModItemModelData.kt b/src/data/kotlin/earth/terrarium/tempad/data/client/ModItemModelData.kt
similarity index 100%
rename from src/main/kotlin/earth/terrarium/tempad/data/client/ModItemModelData.kt
rename to src/data/kotlin/earth/terrarium/tempad/data/client/ModItemModelData.kt
diff --git a/src/generated/resources/.cache/28205fb7d31429f22ad1b73c98b1db1855765172 b/src/generated/resources/.cache/28205fb7d31429f22ad1b73c98b1db1855765172
deleted file mode 100644
index 2c210e80..00000000
--- a/src/generated/resources/.cache/28205fb7d31429f22ad1b73c98b1db1855765172
+++ /dev/null
@@ -1,29 +0,0 @@
-// 1.21	2024-08-08T16:22:39.44563	Item Models: tempad
-b082791e0cd6b411cdddc9cee15b1a26a275dea3 assets/tempad/models/item/blank_card.json
-f427fd812e3771ea58aad949a0f18012337248ba assets/tempad/models/item/chronon_generator.json
-cfd8d5ad10e6fef4451144d3e8498c3082d95e4f assets/tempad/models/item/chronon_generator_1.json
-0a50f68f8d5c2893d31f7472795d74a8e2e17833 assets/tempad/models/item/chronon_generator_2.json
-dbcaa12278503891be96d4ed97f70076883bc549 assets/tempad/models/item/chronon_generator_3.json
-aad2eaa06be7fda98d61da34e91618e6abd4b1f4 assets/tempad/models/item/location_card.json
-755a24eed4ef1a60e211debf7100ae74acc85d94 assets/tempad/models/item/new_location_upgrade.json
-bf3ed08965e4dc2013579cbcd3f506ed0298d4c2 assets/tempad/models/item/player_teleport_upgrade.json
-fb0bc39d28d65dc627aee6391afc8cfdb98d383d assets/tempad/models/item/tempad.json
-2db9c2f6ab8a412b41107e2d1155e2790e6ba47d assets/tempad/models/item/tempad/attached_idle_0.json
-a6764bfdd5412c7e770b979812260b8c3a7c9e10 assets/tempad/models/item/tempad/attached_idle_1.json
-d93eedaa4b6b4e5ecb66a45d9e1d75d121face28 assets/tempad/models/item/tempad/attached_idle_2.json
-faf6b816061bf0b85e13513575eca1269fe7ed1e assets/tempad/models/item/tempad/attached_idle_3.json
-a04d9f6dd658cb1b5c65d4897556e451a3b9004b assets/tempad/models/item/tempad/attached_in_use_0.json
-f31e96dd6730a54c309af3628e39b1f7718867c4 assets/tempad/models/item/tempad/attached_in_use_1.json
-17cf3e7c409bed28eb9044bbfe7f1c305bb6f2d2 assets/tempad/models/item/tempad/attached_in_use_2.json
-3708d3b90c46ae1cd66a14965039b6c39e4131d3 assets/tempad/models/item/tempad/attached_in_use_3.json
-76bedc41fef25db9456e7446eb4cc521cfe36920 assets/tempad/models/item/tempad/base_idle_0.json
-dd41f855de3b860b2e4de106bfae68a548705a0c assets/tempad/models/item/tempad/base_idle_1.json
-3c61910892b55be947b154e482269737ec805bff assets/tempad/models/item/tempad/base_idle_2.json
-204e94e5746c6f028270c60e852c0333b28a4a35 assets/tempad/models/item/tempad/base_idle_3.json
-5c32fd417a7fd74446ffbf7a2d6f4a4ad6751701 assets/tempad/models/item/tempad/base_in_use_0.json
-5e664209ef686a0aeb7e23c4504e555785788850 assets/tempad/models/item/tempad/base_in_use_1.json
-90f82972ef92ca2c814ad2879d75c846a50813ea assets/tempad/models/item/tempad/base_in_use_2.json
-af05fa778f7b708bf0712518e63c6e01e416953e assets/tempad/models/item/tempad/base_in_use_3.json
-c2f35aac567f05aaa9b3892551d8dda7995e8bfb assets/tempad/models/item/temporal_beacon.json
-52aed78867fd1e1e241ace0302e93647cbfe75e0 assets/tempad/models/item/temporal_beacon_on.json
-b4d9d0d641442d2f783900d2697efb40f749f28a assets/tempad/models/item/time_twister.json
diff --git a/src/generated/resources/assets/tempad/models/item/blank_card.json b/src/generated/resources/assets/tempad/models/item/blank_card.json
deleted file mode 100644
index 01b02a88..00000000
--- a/src/generated/resources/assets/tempad/models/item/blank_card.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/blank_card"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/chronon_generator.json b/src/generated/resources/assets/tempad/models/item/chronon_generator.json
deleted file mode 100644
index cc1a4574..00000000
--- a/src/generated/resources/assets/tempad/models/item/chronon_generator.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "overrides": [
-    {
-      "model": "tempad:item/chronometer_1",
-      "predicate": {
-        "tempad:charge": 0.33
-      }
-    },
-    {
-      "model": "tempad:item/chronometer_2",
-      "predicate": {
-        "tempad:charge": 0.66
-      }
-    },
-    {
-      "model": "tempad:item/chronometer_3",
-      "predicate": {
-        "tempad:charge": 1.0
-      }
-    }
-  ],
-  "textures": {
-    "layer0": "tempad:item/chronometer"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/chronon_generator_1.json b/src/generated/resources/assets/tempad/models/item/chronon_generator_1.json
deleted file mode 100644
index 263208ab..00000000
--- a/src/generated/resources/assets/tempad/models/item/chronon_generator_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/chronometer",
-    "layer1": "tempad:item/chronometer/charge_1"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/chronon_generator_2.json b/src/generated/resources/assets/tempad/models/item/chronon_generator_2.json
deleted file mode 100644
index 92377a93..00000000
--- a/src/generated/resources/assets/tempad/models/item/chronon_generator_2.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/chronometer",
-    "layer1": "tempad:item/chronometer/charge_2"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/chronon_generator_3.json b/src/generated/resources/assets/tempad/models/item/chronon_generator_3.json
deleted file mode 100644
index a80c548e..00000000
--- a/src/generated/resources/assets/tempad/models/item/chronon_generator_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/chronometer",
-    "layer1": "tempad:item/chronometer/charge_3"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/location_card.json b/src/generated/resources/assets/tempad/models/item/location_card.json
deleted file mode 100644
index d7413d18..00000000
--- a/src/generated/resources/assets/tempad/models/item/location_card.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/location_card"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/new_location_upgrade.json b/src/generated/resources/assets/tempad/models/item/new_location_upgrade.json
deleted file mode 100644
index 46f57a27..00000000
--- a/src/generated/resources/assets/tempad/models/item/new_location_upgrade.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/new_location_upgrade"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/player_teleport_upgrade.json b/src/generated/resources/assets/tempad/models/item/player_teleport_upgrade.json
deleted file mode 100644
index 1e424fa9..00000000
--- a/src/generated/resources/assets/tempad/models/item/player_teleport_upgrade.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/player_teleport_upgrade"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad.json b/src/generated/resources/assets/tempad/models/item/tempad.json
deleted file mode 100644
index 981645e8..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "overrides": [
-    {
-      "model": "tempad:item/tempad/base_idle_0",
-      "predicate": {
-        "tempad:attached": 0.0,
-        "tempad:charge": 0.0,
-        "tempad:in_use": 0.0
-      }
-    },
-    {
-      "model": "tempad:item/tempad/base_idle_1",
-      "predicate": {
-        "tempad:attached": 0.0,
-        "tempad:charge": 0.33,
-        "tempad:in_use": 0.0
-      }
-    },
-    {
-      "model": "tempad:item/tempad/base_idle_2",
-      "predicate": {
-        "tempad:attached": 0.0,
-        "tempad:charge": 0.66,
-        "tempad:in_use": 0.0
-      }
-    },
-    {
-      "model": "tempad:item/tempad/base_idle_3",
-      "predicate": {
-        "tempad:attached": 0.0,
-        "tempad:charge": 1.0,
-        "tempad:in_use": 0.0
-      }
-    },
-    {
-      "model": "tempad:item/tempad/base_in_use_0",
-      "predicate": {
-        "tempad:attached": 0.0,
-        "tempad:charge": 0.0,
-        "tempad:in_use": 1.0
-      }
-    },
-    {
-      "model": "tempad:item/tempad/base_in_use_1",
-      "predicate": {
-        "tempad:attached": 0.0,
-        "tempad:charge": 0.33,
-        "tempad:in_use": 1.0
-      }
-    },
-    {
-      "model": "tempad:item/tempad/base_in_use_2",
-      "predicate": {
-        "tempad:attached": 0.0,
-        "tempad:charge": 0.66,
-        "tempad:in_use": 1.0
-      }
-    },
-    {
-      "model": "tempad:item/tempad/base_in_use_3",
-      "predicate": {
-        "tempad:attached": 0.0,
-        "tempad:charge": 1.0,
-        "tempad:in_use": 1.0
-      }
-    },
-    {
-      "model": "tempad:item/tempad/attached_idle_0",
-      "predicate": {
-        "tempad:attached": 1.0,
-        "tempad:charge": 0.0,
-        "tempad:in_use": 0.0
-      }
-    },
-    {
-      "model": "tempad:item/tempad/attached_idle_1",
-      "predicate": {
-        "tempad:attached": 1.0,
-        "tempad:charge": 0.33,
-        "tempad:in_use": 0.0
-      }
-    },
-    {
-      "model": "tempad:item/tempad/attached_idle_2",
-      "predicate": {
-        "tempad:attached": 1.0,
-        "tempad:charge": 0.66,
-        "tempad:in_use": 0.0
-      }
-    },
-    {
-      "model": "tempad:item/tempad/attached_idle_3",
-      "predicate": {
-        "tempad:attached": 1.0,
-        "tempad:charge": 1.0,
-        "tempad:in_use": 0.0
-      }
-    },
-    {
-      "model": "tempad:item/tempad/attached_in_use_0",
-      "predicate": {
-        "tempad:attached": 1.0,
-        "tempad:charge": 0.0,
-        "tempad:in_use": 1.0
-      }
-    },
-    {
-      "model": "tempad:item/tempad/attached_in_use_1",
-      "predicate": {
-        "tempad:attached": 1.0,
-        "tempad:charge": 0.33,
-        "tempad:in_use": 1.0
-      }
-    },
-    {
-      "model": "tempad:item/tempad/attached_in_use_2",
-      "predicate": {
-        "tempad:attached": 1.0,
-        "tempad:charge": 0.66,
-        "tempad:in_use": 1.0
-      }
-    },
-    {
-      "model": "tempad:item/tempad/attached_in_use_3",
-      "predicate": {
-        "tempad:attached": 1.0,
-        "tempad:charge": 1.0,
-        "tempad:in_use": 1.0
-      }
-    }
-  ],
-  "textures": {
-    "layer0": "tempad:item/tempad/base"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/attached_idle_0.json b/src/generated/resources/assets/tempad/models/item/tempad/attached_idle_0.json
deleted file mode 100644
index d72ee96f..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/attached_idle_0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base_with_twister"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/attached_idle_1.json b/src/generated/resources/assets/tempad/models/item/tempad/attached_idle_1.json
deleted file mode 100644
index 8a96021e..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/attached_idle_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base_with_twister",
-    "layer2": "tempad:item/tempad/charge_1"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/attached_idle_2.json b/src/generated/resources/assets/tempad/models/item/tempad/attached_idle_2.json
deleted file mode 100644
index cc403c10..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/attached_idle_2.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base_with_twister",
-    "layer2": "tempad:item/tempad/charge_2"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/attached_idle_3.json b/src/generated/resources/assets/tempad/models/item/tempad/attached_idle_3.json
deleted file mode 100644
index 5f6fec16..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/attached_idle_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base_with_twister",
-    "layer2": "tempad:item/tempad/charge_3"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_0.json b/src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_0.json
deleted file mode 100644
index 1ee20527..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base_with_twister",
-    "layer1": "tempad:item/tempad/screen_on"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_1.json b/src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_1.json
deleted file mode 100644
index 3d94559b..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_1.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base_with_twister",
-    "layer1": "tempad:item/tempad/screen_on",
-    "layer2": "tempad:item/tempad/charge_1"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_2.json b/src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_2.json
deleted file mode 100644
index d0d238da..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_2.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base_with_twister",
-    "layer1": "tempad:item/tempad/screen_on",
-    "layer2": "tempad:item/tempad/charge_2"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_3.json b/src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_3.json
deleted file mode 100644
index 292b031a..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/attached_in_use_3.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base_with_twister",
-    "layer1": "tempad:item/tempad/screen_on",
-    "layer2": "tempad:item/tempad/charge_3"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/base_idle_0.json b/src/generated/resources/assets/tempad/models/item/tempad/base_idle_0.json
deleted file mode 100644
index aabe0933..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/base_idle_0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/base_idle_1.json b/src/generated/resources/assets/tempad/models/item/tempad/base_idle_1.json
deleted file mode 100644
index 196f70a1..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/base_idle_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base",
-    "layer2": "tempad:item/tempad/charge_1"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/base_idle_2.json b/src/generated/resources/assets/tempad/models/item/tempad/base_idle_2.json
deleted file mode 100644
index a327fe51..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/base_idle_2.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base",
-    "layer2": "tempad:item/tempad/charge_2"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/base_idle_3.json b/src/generated/resources/assets/tempad/models/item/tempad/base_idle_3.json
deleted file mode 100644
index 17ee3900..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/base_idle_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base",
-    "layer2": "tempad:item/tempad/charge_3"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/base_in_use_0.json b/src/generated/resources/assets/tempad/models/item/tempad/base_in_use_0.json
deleted file mode 100644
index d94deae4..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/base_in_use_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base",
-    "layer1": "tempad:item/tempad/screen_on"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/base_in_use_1.json b/src/generated/resources/assets/tempad/models/item/tempad/base_in_use_1.json
deleted file mode 100644
index 67294a0c..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/base_in_use_1.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base",
-    "layer1": "tempad:item/tempad/screen_on",
-    "layer2": "tempad:item/tempad/charge_1"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/base_in_use_2.json b/src/generated/resources/assets/tempad/models/item/tempad/base_in_use_2.json
deleted file mode 100644
index 20721e18..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/base_in_use_2.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base",
-    "layer1": "tempad:item/tempad/screen_on",
-    "layer2": "tempad:item/tempad/charge_2"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/tempad/base_in_use_3.json b/src/generated/resources/assets/tempad/models/item/tempad/base_in_use_3.json
deleted file mode 100644
index 5735bf2e..00000000
--- a/src/generated/resources/assets/tempad/models/item/tempad/base_in_use_3.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/tempad/base",
-    "layer1": "tempad:item/tempad/screen_on",
-    "layer2": "tempad:item/tempad/charge_3"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/temporal_beacon.json b/src/generated/resources/assets/tempad/models/item/temporal_beacon.json
deleted file mode 100644
index 3abc74c8..00000000
--- a/src/generated/resources/assets/tempad/models/item/temporal_beacon.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "overrides": [
-    {
-      "model": "tempad:item/temporal_beacon_on",
-      "predicate": {
-        "tempad:enabled": 1.0
-      }
-    }
-  ],
-  "textures": {
-    "layer0": "tempad:item/temporal_beacon"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/temporal_beacon_on.json b/src/generated/resources/assets/tempad/models/item/temporal_beacon_on.json
deleted file mode 100644
index fd9566fc..00000000
--- a/src/generated/resources/assets/tempad/models/item/temporal_beacon_on.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/temporal_beacon_on"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/tempad/models/item/time_twister.json b/src/generated/resources/assets/tempad/models/item/time_twister.json
deleted file mode 100644
index 9ddbc21b..00000000
--- a/src/generated/resources/assets/tempad/models/item/time_twister.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "tempad:item/time_twister"
-  }
-}
\ No newline at end of file

From 1f1869e9187d20831819fec9b64b8b3a9ccbfb10 Mon Sep 17 00:00:00 2001
From: Ashley Wright <ashley@msrandom.net>
Date: Tue, 27 Aug 2024 04:02:19 +0300
Subject: [PATCH 2/2] Version bump

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ea49009f..c70e2767 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,7 @@ import groovy.json.StringEscapeUtils
 
 plugins {
     kotlin("jvm") version "2.0.0"
-    id("earth.terrarium.cloche") version "0.1.4"
+    id("earth.terrarium.cloche") version "0.1.5"
 
     id("com.teamresourceful.resourcefulgradle") version "0.0.+"