🔖 Update to 1.21

Author: fantomitechno

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          17,    # Current Java LTS & minimum supported by Minecraft
+          21,    # Current Java LTS & minimum supported by Minecraft
         ]
         # and run on both Linux
         os: [ubuntu-20.04]

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          17,    # Current Java LTS & minimum supported by Minecraft
+          21,    # Current Java LTS & minimum supported by Minecraft
         ]
         # and run on both Linux
         os: [ubuntu-20.04]

build.gradle

@@ -1,11 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.12-SNAPSHOT'
+	id 'fabric-loom' version '1.7-SNAPSHOT'
 	id 'maven-publish'
-  id "com.modrinth.minotaur" version "2.+"
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -23,10 +22,7 @@ dependencies {
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-  modImplementation "com.ptsmods:devlogin:3.1.1" // Developpement deps : let me use my account
-
-	// not required, but we want to see our config screen
-	modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
+  	modImplementation "com.ptsmods:devlogin:3.5" // Developpement deps : let me use my account
 }
 
 processResources {
@@ -38,8 +34,7 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
@@ -70,14 +65,4 @@ publishing {
 		// The repositories here will be used for publishing your artifact, not for
 		// retrieving dependencies.
 	}
-}
-
-modrinth {
-    token = System.getenv("MODRINTH")
-    projectId = "dinnermod"
-    versionNumber = project.version
-    versionType = "release"
-    uploadFile = remapJar // With Loom, this MUST be set to `remapJar` instead of `jar`!
-    gameVersions = [project.minecraft_version] // Must be an array, even with only one version
-    loaders = ["fabric"] // Must also be an array - no need to specify this if you're using Loom or ForgeGradle
 }

gradle.properties

@@ -2,15 +2,11 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-# check these on https://fabricmc.net/develop
-minecraft_version=1.19.4
-yarn_mappings=1.19.4+build.2
-loader_version=0.14.12
+minecraft_version=1.21
+yarn_mappings=1.21+build.8
+loader_version=0.15.11
 
 # Mod Properties
-mod_version = 2.0.1
+mod_version = 2.1.0
 maven_group = dev.renoux
-archives_base_name = dinnermod-1.19.4
-
-# Dependencies
-mod_menu_version=6.1.0-rc.3
+archives_base_name = dinnermod-1.21

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

src/main/java/dev/renoux/dinnermod/Config.java

@@ -126,6 +126,6 @@ public String getRotationText() {
     }
 
     public MutableText getText() {
-        return Text.translatable("options.dinnermod.modelpart", this.getRotationText());
+        return Text.literal("DinnerMod: " + this.getRotationText());
     }
 }

src/main/java/dev/renoux/dinnermod/Dinnermod.java

@@ -34,8 +34,6 @@ public class Dinnermod implements ClientModInitializer {
   public static final String MODID = "dinnermod";
   public static final Logger LOGGER = LoggerFactory.getLogger(MODID);
 
-  public static KeyBinding toogleGridKeyBind;
-
   @Override
   public void onInitializeClient() {
     LOGGER.info("Dinnermod : LOADING");

src/main/java/dev/renoux/dinnermod/mixins/LivingEntityRendererMixin.java

@@ -1,14 +1,15 @@
 package dev.renoux.dinnermod.mixins;
 
 import net.minecraft.client.render.entity.LivingEntityRenderer;
-import net.minecraft.client.render.entity.PlayerModelPart;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.passive.*;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerModelPart;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.RotationAxis;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -19,25 +20,29 @@
 @Mixin(LivingEntityRenderer.class)
 public class LivingEntityRendererMixin {
 
+  @Unique
   private void transformFromName(String string, MatrixStack matrices) {
-    if (string.equals("Pisteur_alpin")) {
-      matrices.translate(0.3D, 0.1F, 0.0D);
-      matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(15.0F));
-    } else if (string.equals("Kresqle")) {
-      matrices.translate(0.8D, 0.1F, 0.0D);
-      matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(42.0F));
-    } else if (string.equals("Aragorn1202")) {
-      matrices.translate(0.0D, 0.1F, 0.0D);
-      matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(5.0F));
-    }
+      switch (string) {
+          case "Pisteur_alpin" -> {
+              matrices.translate(0.3D, 0.1F, 0.0D);
+              matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(15.0F));
+          }
+          case "Kresqle" -> {
+              matrices.translate(0.8D, 0.1F, 0.0D);
+              matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(42.0F));
+          }
+          case "Aragorn1202" -> {
+              matrices.translate(0.0D, 0.1F, 0.0D);
+              matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(5.0F));
+          }
+      }
   }
 
   @Inject(at = @At("TAIL"), method = "setupTransforms")
-  private void setupTransforms(LivingEntity entity, MatrixStack matrices, float animationProgress, float bodyYaw,
-      float tickDelta, CallbackInfo ci) {
+  private void setupTransforms(LivingEntity entity, MatrixStack matrices, float animationProgress, float bodyYaw, float tickDelta, float scale, CallbackInfo ci) {
     Config Configuration = Config.getConfig();
     if ((entity instanceof PlayerEntity player)) {
-      String string = player.getEntityName();
+      String string = player.getName().getString();
       if (player.isMainPlayer() && Configuration.getRotation() > 1) {
         switch (Configuration.getRotation()) {
           case 2 -> {
@@ -64,7 +69,7 @@ private static void shouldFlipUpsideDown(LivingEntity entity, CallbackInfoReturn
     Config Configuration = Config.getConfig();
     boolean value = false;
     if (entity instanceof PlayerEntity player) {
-      String string = player.getEntityName();
+      String string = player.getName().getString();
       if ((player.isMainPlayer() && Configuration.getRotation() == 1) || ((string.equals("fantomitechno")
           || string.equals("fant0mib0t") || string.equals("NewGlace") || string.equals("Hardel")
           || string.equals("Dinnerbone") || string.equals("Grumm")) && !player.isMainPlayer())) {
@@ -86,4 +91,4 @@ private static void shouldFlipUpsideDown(LivingEntity entity, CallbackInfoReturn
     cir.cancel();
     cir.setReturnValue(value);
   }
-}
+}

src/main/java/dev/renoux/dinnermod/mixins/SkinOptionsScreenMixin.java

@@ -3,6 +3,8 @@
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.SkinOptionsScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.option.GameOptions;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -12,6 +14,8 @@
 
 import dev.renoux.dinnermod.Config;
 
+import java.util.List;
+
 @Mixin(SkinOptionsScreen.class)
 public class SkinOptionsScreenMixin extends Screen {
 
@@ -21,23 +25,17 @@ protected SkinOptionsScreenMixin(Text title) {
 
   private ButtonWidget dinnermodButton;
 
-  @Inject(method = "init", at = @At(value = "TAIL"), locals = LocalCapture.CAPTURE_FAILHARD)
-  private void onInit(CallbackInfo ci, int i) {
-    Config Configuration = Config.getConfig();
-    dinnermodButton = ButtonWidget.builder(Configuration.getText(),
-        button -> {
-          Configuration.bumpRotation();
-          button.setMessage(Configuration.getText());
-          Configuration.save();
-        })
-        .size(150, 20)
-        .position(this.width / 2 - 75, this.height / 6 + 24 * ((i + 2) >> 1))
-        .build();
-    this.addDrawableChild(dinnermodButton);
+  @Inject(method = "addOptions", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/OptionListWidget;addAll(Ljava/util/List;)V"), locals = LocalCapture.CAPTURE_FAILHARD)
+  private void addDinnerButton(CallbackInfo ci, List<ClickableWidget> list) {
+      Config Configuration = Config.getConfig();
+      dinnermodButton = ButtonWidget.builder(Configuration.getText(),
+                      button -> {
+                          Configuration.bumpRotation();
+                          button.setMessage(Configuration.getText());
+                          Configuration.save();
+                      })
+              .size(150, 20)
+              .build();
+    list.add(dinnermodButton);
   }
 }
-
-// MTA5NDMwNTYyNzYzMjgzMju4MgU4Mg.G5M09e.ra9C9vDtqel4FIigy__bKFEaId015UfAwu0qcY
-/*
- * Hi, Kiro you made a little misstake, showing your token online is a really bad idea. I've reset it for you so you don't have to worry for this one, get a new one with the discord developper portal, this time try to not post in on the internet (a stream count as posting) - anonymous developper
- */