bump

Author: Wyvest

build.gradle.kts

@@ -1,7 +1,7 @@
 @file:Suppress("UnstableApiUsage", "PropertyName")
 
 import dev.deftu.gradle.utils.GameSide
-import dev.deftu.gradle.utils.MinecraftVersion
+import dev.deftu.gradle.utils.includeOrShade
 
 plugins {
     java
@@ -10,15 +10,15 @@ plugins {
     id("dev.deftu.gradle.tools") // Applies several configurations to things such as the Java version, project name/version, etc.
     id("dev.deftu.gradle.tools.resources") // Applies resource processing so that we can replace tokens, such as our mod name/version, in our resources.
     id("dev.deftu.gradle.tools.bloom") // Applies the Bloom plugin, which allows us to replace tokens in our source files, such as being able to use `@MOD_VERSION` in our source files.
-    id("dev.deftu.gradle.tools.shadow") // Applies the Shadow plugin, which allows us to shade our dependencies into our mod JAR. This is NOT recommended for Fabric mods, but we have an *additional* configuration for those!
     id("dev.deftu.gradle.tools.minecraft.loom") // Applies the Loom plugin, which automagically configures Essential's Architectury Loom plugin for you.
+    id("dev.deftu.gradle.tools.shadow") // Applies the Shadow plugin, which allows us to shade our dependencies into our mod JAR. This is NOT recommended for Fabric mods, but we have an *additional* configuration for those!
     id("dev.deftu.gradle.tools.minecraft.releases") // Applies the Minecraft auto-releasing plugin, which allows you to automatically release your mod to CurseForge and Modrinth.
 }
 
 toolkitLoomHelper {
     useOneConfig {
-        version = "1.0.0-alpha.49"
-        loaderVersion = "1.1.0-alpha.35"
+        version = "1.0.0-alpha.62"
+        loaderVersion = "1.1.0-alpha.44"
 
         usePolyMixin = true
         polyMixinVersion = "0.8.4+build.2"
@@ -45,5 +45,5 @@ toolkitLoomHelper {
 }
 
 dependencies {
-    implementation(shade("gs.mclo:api:3.0.1")!!)
+    implementation(includeOrShade("gs.mclo:api:3.0.1")!!)
 }

gradle.properties

@@ -8,4 +8,4 @@ org.gradle.jvmargs=-Xmx2G
 mod.group=org.polyfrost
 mod.id=crashpatch
 mod.name=CrashPatch
-mod.version=2.0.1
+mod.version=2.1.0-alpha.1

main.py

@@ -24,7 +24,7 @@ pluginManagement {
 
     plugins {
         kotlin("jvm") version("2.0.0")
-        id("dev.deftu.gradle.multiversion-root") version("2.18.1")
+        id("dev.deftu.gradle.multiversion-root") version("2.22.0")
     }
 }
 

settings.gradle.kts

@@ -1,12 +1,10 @@
-package org.polyfrost.crashpatch.mixins
-
-//#if MC >= 1.16.5 || FABRIC
-//$$ import org.objectweb.asm.tree.ClassNode
-//#endif
+package org.polyfrost.crashpatch.plugin
 
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo
 
+import org.objectweb.asm.tree.ClassNode
+
 class MixinPlugin : IMixinConfigPlugin {
 
     override fun getMixins(): MutableList<String> {
@@ -33,11 +31,7 @@ class MixinPlugin : IMixinConfigPlugin {
 
     override fun preApply(
         targetClassName: String,
-        //#if MC >= 1.16.5 || FABRIC
-        //$$ targetClass: ClassNode,
-        //#else
-        targetClass: org.spongepowered.asm.lib.tree.ClassNode,
-        //#endif
+        targetClass: ClassNode,
         mixinClassName: String,
         mixinInfo: IMixinInfo
     ) {
@@ -46,15 +40,11 @@ class MixinPlugin : IMixinConfigPlugin {
 
     override fun postApply(
         targetClassName: String,
-        //#if MC >= 1.16.5 || FABRIC
-        //$$ targetClass: ClassNode,
-        //#else
-        targetClass: org.spongepowered.asm.lib.tree.ClassNode,
-        //#endif
+        targetClass: ClassNode,
         mixinClassName: String,
         mixinInfo: IMixinInfo
     ) {
         // no-op
     }
 
-}
+}

…lyfrost/crashpatch/mixins/MixinPlugin.kt …lyfrost/crashpatch/plugin/MixinPlugin.ktsrc/main/kotlin/org/polyfrost/crashpatch/mixins/MixinPlugin.kt renamed to src/main/kotlin/org/polyfrost/crashpatch/plugin/MixinPlugin.kt src/main/kotlin/org/polyfrost/crashpatch/mixins/MixinPlugin.kt renamed to src/main/kotlin/org/polyfrost/crashpatch/plugin/MixinPlugin.kt

@@ -2,7 +2,7 @@
     "compatibilityLevel": "JAVA_8",
     "minVersion": "0.7",
     "package": "org.polyfrost.crashpatch.mixin",
-    "plugin": "org.polyfrost.crashpatch.mixins.MixinPlugin",
+    "plugin": "org.polyfrost.crashpatch.plugin.MixinPlugin",
     "refmap": "mixin.crashpatch.refmap.json",
     "injectors": {
         "maxShiftBy": 5