1.20 port

Author: FabiPunktExe

gradle.properties

@@ -3,4 +3,4 @@ org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
 # SimpleClient
-simpleclient_version=0.0.1-dev
+simpleclient_version=0.1.0-dev

settings.gradle

@@ -7,4 +7,5 @@ pluginManagement {
 }
 rootProject.name = 'simpleclient'
 include 'simpleclient-core'
-include 'simpleclient-1.19.4'
+include 'simpleclient-1.19.4'
+include 'simpleclient-1.20'

simpleclient-1.19.4/src/main/java/simpleclient/SimpleClient.java

@@ -7,7 +7,6 @@
 import simpleclient.adapter.TranslationAdapter;
 import simpleclient.adapter.TranslationAdapterImpl;
 import simpleclient.feature.FeatureManager;
-import simpleclient.feature.FeatureManagerImpl;
 
 public class SimpleClient implements ClientModInitializer {
     public static final Logger LOGGER = LoggerFactory.getLogger("simpleclient");

simpleclient-1.19.4/src/main/java/simpleclient/feature/FeatureManagerImpl.java

@@ -4,14 +4,12 @@
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.KeyMapping;
-import net.minecraft.client.Minecraft;
 import org.lwjgl.glfw.GLFW;
 import simpleclient.gui.EditFeaturesScreen;
 
 public class FeatureManagerImpl extends FeatureManager {
     @Override
     public void init() {
-        Minecraft mc = Minecraft.getInstance();
         KeyMapping editFeaturesKey = KeyBindingHelper.registerKeyBinding(new KeyMapping("simpleclient.edit_features", InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_RIGHT_SHIFT, "key.categories.simpleclient"));
         ClientTickEvents.END_CLIENT_TICK.register(minecraft -> {
             if (editFeaturesKey.consumeClick() && minecraft.screen == null && minecraft.level != null) {

…a/simpleclient/mixin/InGameHudMixin.java …in/java/simpleclient/mixin/GuiMixin.javasimpleclient-1.19.4/src/main/java/simpleclient/mixin/InGameHudMixin.java renamed to simpleclient-1.19.4/src/main/java/simpleclient/mixin/GuiMixin.java simpleclient-1.19.4/src/main/java/simpleclient/mixin/InGameHudMixin.java renamed to simpleclient-1.19.4/src/main/java/simpleclient/mixin/GuiMixin.java

@@ -4,6 +4,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.Gui;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -20,18 +21,21 @@
 import simpleclient.gui.EditFeaturesScreen;
 
 @Mixin(Gui.class)
-public abstract class InGameHudMixin {
+public abstract class GuiMixin {
+    @Shadow @Final private Minecraft minecraft;
+
+    @Shadow public abstract Font getFont();
+
     @Inject(at = @At("TAIL"), method = "render")
-    private void renderHud(PoseStack poseStack, float tickDelta, CallbackInfo ci) {
-        Minecraft mc = Minecraft.getInstance();
-        TextRendererAdapter textRenderer = new TextRendererAdapterImpl(poseStack, mc.font);
+    private void render(PoseStack poseStack, float tickDelta, CallbackInfo ci) {
+        TextRendererAdapter textRenderer = new TextRendererAdapterImpl(poseStack, getFont());
         ItemRendererAdapter itemRenderer = new ItemRendererAdapterImpl(poseStack);
         // Watermark
-        mc.font.drawShadow(poseStack, "SimpleClient " + SimpleClient.VERSION, mc.getWindow().getGuiScaledWidth() - mc.font.width("SimpleClient " + SimpleClient.VERSION) - 1, 1, 0xFFAAAAAA);
+        getFont().drawShadow(poseStack, "SimpleClient " + SimpleClient.VERSION, minecraft.getWindow().getGuiScaledWidth() - getFont().width("SimpleClient " + SimpleClient.VERSION) - 1, 1, 0xFFAAAAAA);
         // Features
-        if (!(mc.screen instanceof EditFeaturesScreen)) {
-            int width = mc.getWindow().getGuiScaledWidth();
-            int height = mc.getWindow().getGuiScaledHeight();
+        if (!(minecraft.screen instanceof EditFeaturesScreen)) {
+            int width = minecraft.getWindow().getGuiScaledWidth();
+            int height = minecraft.getWindow().getGuiScaledHeight();
             for (Feature feature : FeatureManager.INSTANCE.getFeatures()) {
                 if (feature instanceof RenderableFeature rf && rf.isEnabled()) {
                     rf.render(textRenderer, itemRenderer, width, height);

simpleclient-1.19.4/src/main/resources/simpleclient.mixins.json

@@ -6,7 +6,7 @@
   "mixins": [
   ],
   "client": [
-    "InGameHudMixin",
+    "GuiMixin",
     "performance.CubeMixin",
     "performance.SharedConstantsMixin"
   ],

simpleclient-1.20/build.gradle

@@ -0,0 +1,36 @@
+plugins {
+    id 'java'
+    id 'fabric-loom' version '1.1-SNAPSHOT'
+}
+
+repositories {
+    maven { url = "https://ladysnake.jfrog.io/artifactory/mods" }
+}
+
+dependencies {
+    // Minecraft
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings loom.officialMojangMappings()
+    modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
+    // Core
+    implementation project(path: ':simpleclient-core')
+    include project(path: ':simpleclient-core')
+    // Dependencies
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+    //modImplementation "io.github.ladysnake:satin:${project.satin_version}"
+    //include "io.github.ladysnake:satin:${project.satin_version}"
+}
+
+sourceSets {
+    main.resources.srcDirs += "${project(':simpleclient-core').projectDir}/src/main/resources"
+}
+
+processResources {
+    filesMatching('fabric.mod.json') {
+        expand 'version': version, 'minecraft_version': project.minecraft_version, 'fabric_loader_version': project.fabric_loader_version, 'fabric_api_version': project.fabric_api_version
+	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+    it.options.release = 17
+}

simpleclient-1.20/gradle.properties

@@ -0,0 +1,7 @@
+# Minecraft (https://fabricmc.net/develop)
+minecraft_version=1.20
+fabric_loader_version=0.14.21
+
+# Dependencies
+fabric_api_version=0.83.0+1.20
+#satin_version=

simpleclient-1.20/gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists