1.21.0

build.gradle

@@ -1,11 +1,15 @@
 plugins {
-    id 'fabric-loom' version '1.1-SNAPSHOT'
+    id 'fabric-loom' version '1.7-SNAPSHOT'
     id 'maven-publish'
 }
 
 version = project.mod_version
 group = project.maven_group
 
+base {
+    archivesName = project.archives_base_name
+}
+
 repositories {
     // Add repositories to retrieve artifacts from in here.
     // You should only use this when depending on other mods because
@@ -18,6 +22,17 @@ repositories {
     }
 }
 
+loom {
+    splitEnvironmentSourceSets()
+
+    mods {
+        "cmods" {
+            sourceSet sourceSets.client
+            sourceSet sourceSets.main
+        }
+    }
+}
+
 dependencies {
     // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
@@ -31,47 +46,37 @@ dependencies {
 
 processResources {
     inputs.property "version", project.version
-    filteringCharset "UTF-8"
 
     filesMatching("fabric.mod.json") {
         expand "version": project.version
     }
 }
 
-def targetJavaVersion = 17
 tasks.withType(JavaCompile).configureEach {
-    // ensure that the encoding is set to UTF-8, no matter what the system default is
-    // this fixes some edge cases with special characters not displaying correctly
-    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-    // If Javadoc is generated, this must be specified in that task too.
-    it.options.encoding = "UTF-8"
-    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
-        it.options.release = targetJavaVersion
-    }
+    it.options.release = 21
 }
 
 java {
-    def javaVersion = JavaVersion.toVersion(targetJavaVersion)
-    if (JavaVersion.current() < javaVersion) {
-        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
-    }
-    archivesBaseName = project.archives_base_name
     // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
     // if it is present.
     // If you remove this line, sources will not be generated.
     withSourcesJar()
+
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {
     from("LICENSE") {
-        rename { "${it}_${project.archivesBaseName}" }
+        rename { "${it}_${project.base.archivesName.get()}"}
     }
 }
 
 // configure the maven publication
 publishing {
     publications {
-        mavenJava(MavenPublication) {
+        create("mavenJava", MavenPublication) {
+            artifactId = project.archives_base_name
             from components.java
         }
     }
@@ -84,3 +89,91 @@ publishing {
         // retrieving dependencies.
     }
 }
+
+
+//plugins {
+//    id 'fabric-loom' version '1.7-SNAPSHOT'
+//    id 'maven-publish'
+//}
+//
+//version = project.mod_version
+//group = project.maven_group
+//
+//repositories {
+//    // Add repositories to retrieve artifacts from in here.
+//    // You should only use this when depending on other mods because
+//    // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+//    // See https://docs.gradle.org/current/userguide/declaring_repositories.html
+//    // for more information about repositories.
+//    maven {
+//        name = 'TerraformersMC'
+//        url = 'https://maven.terraformersmc.com/releases'
+//    }
+//}
+//
+//dependencies {
+//    // To change the versions see the gradle.properties file
+//    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+//    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+//    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+//
+//    // Fabric API. This is technically optional, but you probably want it anyway.
+//    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+//    modCompileOnly "com.terraformersmc:modmenu:4.1.1"
+//}
+//
+//processResources {
+//    inputs.property "version", project.version
+//    filteringCharset "UTF-8"
+//
+//    filesMatching("fabric.mod.json") {
+//        expand "version": project.version
+//    }
+//}
+//
+//def targetJavaVersion = 21
+//tasks.withType(JavaCompile).configureEach {
+//    // ensure that the encoding is set to UTF-8, no matter what the system default is
+//    // this fixes some edge cases with special characters not displaying correctly
+//    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+//    // If Javadoc is generated, this must be specified in that task too.
+//    it.options.encoding = "UTF-8"
+//    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
+//        it.options.release = targetJavaVersion
+//    }
+//}
+//
+//java {
+//    def javaVersion = JavaVersion.toVersion(targetJavaVersion)
+//    if (JavaVersion.current() < javaVersion) {
+//        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
+//    }
+//    archivesBaseName = project.archives_base_name
+//    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+//    // if it is present.
+//    // If you remove this line, sources will not be generated.
+//    withSourcesJar()
+//}
+//
+//jar {
+//    from("LICENSE") {
+//        rename { "${it}_${project.archivesBaseName}" }
+//    }
+//}
+//
+//// configure the maven publication
+//publishing {
+//    publications {
+//        mavenJava(MavenPublication) {
+//            from components.java
+//        }
+//    }
+//
+//    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+//    repositories {
+//        // Add repositories to publish to here.
+//        // Notice: This block does NOT have the same function as the block in the top level.
+//        // The repositories here will be used for publishing your artifact, not for
+//        // retrieving dependencies.
+//    }
+//}

gradle.properties

@@ -1,14 +1,15 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.3
-loader_version=0.15.6
+minecraft_version=1.21
+yarn_mappings=1.21+build.7
+loader_version=0.15.11
 # Mod Properties
-mod_version=1.2.1
+mod_version=1.2.2
 maven_group=cmods
 archives_base_name=cmods
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.96.1+1.20.4
+fabric_version=0.100.4+1.21

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Sun Jun 30 01:31:47 MDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/client/java/cmods/cmods/CmodsClient.java

@@ -1,4 +1,4 @@
-package cmods.cmods.client;
+package cmods.cmods;
 
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;

src/client/java/cmods/cmods/ModMenuConfig.java

@@ -1,6 +1,6 @@
-package cmods.cmods.client;
+package cmods.cmods;
 
-import cmods.cmods.client.ui.CmodsOptionsScreen;
+import cmods.cmods.ui.CmodsOptionsScreen;
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
 import net.minecraft.client.gui.screen.Screen;

src/client/java/cmods/cmods/api/HudRenderCallback.java

@@ -1,6 +1,6 @@
 package cmods.cmods.api;
 
-import cmods.cmods.client.ui.Line;
+import cmods.cmods.ui.Line;
 import net.minecraft.util.Pair;
 
 import java.util.ArrayList;

src/client/java/cmods/cmods/api/Module.java

@@ -1,9 +1,9 @@
 package cmods.cmods.api;
 
-import cmods.cmods.client.options.CmodsOptions;
-import cmods.cmods.client.ui.CmodsOptionsScreen;
-import cmods.cmods.client.ui.Line;
-import cmods.cmods.client.ui.UIOptionsScreen;
+import cmods.cmods.options.CmodsOptions;
+import cmods.cmods.ui.CmodsOptionsScreen;
+import cmods.cmods.ui.Line;
+import cmods.cmods.ui.UIOptionsScreen;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;

src/client/java/cmods/cmods/mixin/HudMixin.java

@@ -1,13 +1,14 @@
 package cmods.cmods.mixin;
 
 import cmods.cmods.api.HudRenderCallback;
-import cmods.cmods.client.options.CmodsOptions;
-import cmods.cmods.client.ui.Line;
+import cmods.cmods.options.CmodsOptions;
+import cmods.cmods.ui.Line;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.DebugHud;
 import net.minecraft.client.gui.hud.InGameHud;
+import net.minecraft.client.render.RenderTickCounter;
 import net.minecraft.text.Text;
 import net.minecraft.util.Pair;
 import net.minecraft.util.math.BlockPos;
@@ -31,7 +32,7 @@ public abstract class HudMixin {
     @Shadow @Final private DebugHud debugHud;
 
     @Inject(at = @At("TAIL"), method = "render")
-    private void render(DrawContext context, float tickDelta, CallbackInfo ci) {
+    private void render(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) {
         CmodsOptions options = CmodsOptions.getInstance();
 
         if (this.debugHud.shouldShowDebugHud() || this.client.isPaused() || client.player == null ||
@@ -41,7 +42,6 @@ public abstract class HudMixin {
 
         TextRenderer textRenderer = this.getTextRenderer();
         ArrayList<Line> lines = new ArrayList<>();
-        this.client.getCurrentFps();
 
         int x = 5;
         int y = 5;

src/client/java/cmods/cmods/mixin/OptionsMixin.java

@@ -1,6 +1,6 @@
 package cmods.cmods.mixin;
 
-import cmods.cmods.client.ui.CmodsOptionsScreen;
+import cmods.cmods.ui.CmodsOptionsScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;

src/client/java/cmods/cmods/mixin/PauseMixin.java

@@ -1,7 +1,7 @@
 package cmods.cmods.mixin;
 
 
-import cmods.cmods.client.ui.CmodsOptionsScreen;
+import cmods.cmods.ui.CmodsOptionsScreen;
 import net.minecraft.client.gui.screen.GameMenuScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;

src/client/java/cmods/cmods/options/BooleanOption.java

@@ -1,4 +1,4 @@
-package cmods.cmods.client.options;
+package cmods.cmods.options;
 
 public class BooleanOption extends Option<Boolean> {
     public BooleanOption(Boolean default_value) {

src/client/java/cmods/cmods/options/CmodsOptions.java

@@ -1,4 +1,4 @@
-package cmods.cmods.client.options;
+package cmods.cmods.options;
 
 import cmods.cmods.api.ModuleOptions;
 import net.fabricmc.loader.api.FabricLoader;

src/client/java/cmods/cmods/options/IntegerOption.java

@@ -1,4 +1,4 @@
-package cmods.cmods.client.options;
+package cmods.cmods.options;
 
 public class IntegerOption extends Option<Integer> {
     public IntegerOption(Integer default_value) {

src/client/java/cmods/cmods/options/Option.java

@@ -1,4 +1,4 @@
-package cmods.cmods.client.options;
+package cmods.cmods.options;
 
 public class Option<T> {
     public T value;

src/client/java/cmods/cmods/ui/CmodsOptionsScreen.java

@@ -1,8 +1,8 @@
-package cmods.cmods.client.ui;
+package cmods.cmods.ui;
 
 import cmods.cmods.api.ButtonBuilder;
-import cmods.cmods.client.CmodsClient;
-import cmods.cmods.client.options.CmodsOptions;
+import cmods.cmods.CmodsClient;
+import cmods.cmods.options.CmodsOptions;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -14,7 +14,7 @@ import net.minecraft.util.Pair;
 
 import java.util.ArrayList;
 
-import static cmods.cmods.client.ui.Constants.*;
+import static cmods.cmods.ui.Constants.*;
 
 public class CmodsOptionsScreen extends Screen {
     private final CmodsOptions options = CmodsOptions.getInstance();
@@ -68,14 +68,14 @@ public class CmodsOptionsScreen extends Screen {
     }
 
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-        renderBackground(context, mouseX, mouseY, delta);
-        Text versionText = Text.literal("v" + CmodsClient.version);
+//        renderBackground(context, mouseX, mouseY, delta);
+        super.render(context, mouseX, mouseY, delta);
 
+        Text versionText = Text.literal("v" + CmodsClient.version);
 
         context.drawCenteredTextWithShadow(textRenderer, title, this.width / 2, 15, 0xffffff);
         context.drawTextWithShadow(textRenderer, versionText, this.width - textRenderer.getWidth(versionText) - 2,
                 this.height - textRenderer.fontHeight - 2, 0xffffff);
-        super.render(context, mouseX, mouseY, delta);
     }
 
     public void removed() {

src/client/java/cmods/cmods/ui/Constants.java

@@ -1,4 +1,4 @@
-package cmods.cmods.client.ui;
+package cmods.cmods.ui;
 
 public class Constants {
     public static final int buttonWidth = 150;

src/client/java/cmods/cmods/ui/IntegerAdjustWidget.java

@@ -1,6 +1,6 @@
-package cmods.cmods.client.ui;
+package cmods.cmods.ui;
 
-import cmods.cmods.client.options.IntegerOption;
+import cmods.cmods.options.IntegerOption;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.Widget;
 import net.minecraft.client.gui.widget.WrapperWidget;

src/client/java/cmods/cmods/ui/Line.java

@@ -1,4 +1,4 @@
-package cmods.cmods.client.ui;
+package cmods.cmods.ui;
 
 import net.minecraft.text.Text;
 

src/client/java/cmods/cmods/ui/ToggleButton.java

@@ -1,6 +1,6 @@
-package cmods.cmods.client.ui;
+package cmods.cmods.ui;
 
-import cmods.cmods.client.options.BooleanOption;
+import cmods.cmods.options.BooleanOption;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.text.Text;
@@ -15,7 +15,7 @@ public class ToggleButton extends ButtonWidget {
 
 
     public ToggleButton(int x, int y, int width, int height, Text name, BooleanOption option) {
-        this(x, y, width, height, name, option, ButtonWidget.DEFAULT_NARRATION_SUPPLIER);
+        this(x, y, width, height, name, option, DEFAULT_NARRATION_SUPPLIER);
     }
 
     public ToggleButton(int x, int y, int width, int height, Text name, BooleanOption option,

src/client/java/cmods/cmods/ui/UIOptionsScreen.java

@@ -1,7 +1,7 @@
-package cmods.cmods.client.ui;
+package cmods.cmods.ui;
 
 import cmods.cmods.api.ButtonBuilder;
-import cmods.cmods.client.options.CmodsOptions;
+import cmods.cmods.options.CmodsOptions;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -13,7 +13,7 @@ import net.minecraft.util.Pair;
 
 import java.util.ArrayList;
 
-import static cmods.cmods.client.ui.Constants.*;
+import static cmods.cmods.ui.Constants.*;
 
 public class UIOptionsScreen extends Screen {
     private final Screen parent;
@@ -73,9 +73,9 @@ public class UIOptionsScreen extends Screen {
     }
 
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-        this.renderBackground(context, mouseX, mouseY, delta);
-        context.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 15, 0xffffff);
+//        this.renderBackground(context, mouseX, mouseY, delta);
         super.render(context, mouseX, mouseY, delta);
+        context.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 15, 0xffffff);
     }
 
     public void removed() {

src/client/resources/cmods.client.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "cmods.cmods.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
   ],
   "client": [

src/main/resources/fabric.mod.json

@@ -8,21 +8,29 @@
     "Cameron Reed"
   ],
   "contact": {
-    "repo": "https://gitea.cam123.dev/"
+    "sources": "https://gitea.cam123.dev/"
   },
   "license": "MIT",
   "icon": "assets/cmods/icon.png",
   "environment": "client",
   "entrypoints": {
-    "client": ["cmods.cmods.client.CmodsClient"],
-    "modmenu": ["cmods.cmods.client.ModMenuConfig"]
+    "client": [
+      "cmods.cmods.CmodsClient"
+    ],
+    "modmenu": [
+      "cmods.cmods.ModMenuConfig"
+    ]
   },
   "mixins": [
-    "cmods.mixins.json"
+    {
+      "config": "cmods.client.mixins.json",
+      "environment": "client"
+    }
   ],
   "depends": {
     "fabricloader": ">=0.14.10",
-    "fabric": "*",
-    "minecraft": "1.20.4"
+    "minecraft": "1.21.0",
+    "java": ">=21",
+    "fabric-api": "*"
   }
 }