Updated SimpleClient to 1.20.1

Author: FabiPunktExe

changelog.md

@@ -1,2 +1,2 @@
 ## SimpleClient %version%
-- Added Lowfire
+- Updated SimpleClient to 1.20.1

settings.gradle

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

simpleclient-1.20.1/build.gradle

@@ -0,0 +1,48 @@
+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}"
+}
+
+loom {
+    accessWidenerPath = file('src/main/resources/simpleclient.accesswidener')
+}
+
+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
+}
+
+task copyJar(type: Copy) {
+    group = 'build'
+    from remapJar
+    if (!rootProject.file('build/libs').exists()) rootProject.file('build/libs').mkdirs()
+    into rootProject.file('build/libs')
+}
+remapJar.finalizedBy copyJar

simpleclient-1.20.1/gradle.properties

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

simpleclient-1.20.1/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

simpleclient-1.20.1/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,25 @@
+package simpleclient;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import simpleclient.adapter.TranslationAdapter;
+import simpleclient.adapter.TranslationAdapterImpl;
+import simpleclient.feature.FeatureManager;
+
+public class SimpleClient implements ClientModInitializer {
+    public static final Logger LOGGER = LoggerFactory.getLogger("simpleclient");
+    public static String VERSION = "unknown";
+
+    @Override
+    public void onInitializeClient() {
+        VERSION = loadVersion();
+        TranslationAdapter.INSTANCE = new TranslationAdapterImpl();
+        FeatureManager.INSTANCE.init();
+    }
+
+    public String loadVersion() {
+        return FabricLoader.getInstance().getModContainer("simpleclient").get().getMetadata().getVersion().getFriendlyString();
+    }
+}

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

@@ -0,0 +1,12 @@
+package simpleclient;
+
+import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
+import simpleclient.feature.FeatureManager;
+import simpleclient.feature.FeatureManagerImpl;
+
+public class SimpleClientPreLaunch implements PreLaunchEntrypoint {
+    @Override
+    public void onPreLaunch() {
+        FeatureManager.INSTANCE = new FeatureManagerImpl();
+    }
+}

simpleclient-1.20.1/src/main/java/simpleclient/SimpleClientPreLaunch.java

@@ -0,0 +1,32 @@
+package simpleclient.adapter;
+
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.ResourceLocation;
+
+public class ItemAdapter {
+    public static net.minecraft.world.item.ItemStack adapt(simpleclient.item.ItemStack stack) {
+        net.minecraft.world.item.Item item = BuiltInRegistries.ITEM.get(new ResourceLocation(stack.getItem().getId()));
+        net.minecraft.world.item.ItemStack adapted = new net.minecraft.world.item.ItemStack(item);
+        adapted.setCount(stack.getCount());
+        adapted.setDamageValue(stack.getDamage());
+        return adapted;
+    }
+
+    public static simpleclient.item.ItemStack adapt(net.minecraft.world.item.ItemStack stack) {
+        simpleclient.item.Item item = new simpleclient.item.Item(BuiltInRegistries.ITEM.getKey(stack.getItem()).toString());
+        simpleclient.item.ItemStack adapted = new simpleclient.item.ItemStack(item);
+        adapted.setCount(stack.getCount());
+        adapted.setDamage(stack.getDamageValue());
+        return adapted;
+    }
+
+    public static net.minecraft.world.entity.EquipmentSlot adapt(simpleclient.item.EquipmentSlot slot) {
+        if (slot == simpleclient.item.EquipmentSlot.MAINHAND) return net.minecraft.world.entity.EquipmentSlot.MAINHAND;
+        if (slot == simpleclient.item.EquipmentSlot.OFFHAND) return net.minecraft.world.entity.EquipmentSlot.OFFHAND;
+        if (slot == simpleclient.item.EquipmentSlot.FEET) return net.minecraft.world.entity.EquipmentSlot.FEET;
+        if (slot == simpleclient.item.EquipmentSlot.LEGS) return net.minecraft.world.entity.EquipmentSlot.LEGS;
+        if (slot == simpleclient.item.EquipmentSlot.CHEST) return net.minecraft.world.entity.EquipmentSlot.CHEST;
+        if (slot == simpleclient.item.EquipmentSlot.HEAD) return net.minecraft.world.entity.EquipmentSlot.HEAD;
+        return null;
+    }
+}

simpleclient-1.20.1/src/main/java/simpleclient/adapter/ItemAdapter.java

@@ -0,0 +1,18 @@
+package simpleclient.adapter;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import simpleclient.item.ItemStack;
+
+public class ItemRendererAdapterImpl extends ItemRendererAdapter {
+    private final GuiGraphics guiGraphics;
+
+    public ItemRendererAdapterImpl(GuiGraphics guiGraphics) {
+        this.guiGraphics = guiGraphics;
+    }
+
+    @Override
+    public void renderItem(ItemStack stack, int x, int y) {
+        guiGraphics.renderFakeItem(ItemAdapter.adapt(stack), x, y);
+    }
+}