Merge pull request #1 from lukasabbe/1.0+26.1

26.1

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.15-SNAPSHOT'
+    id 'net.fabricmc.fabric-loom' version '1.15-SNAPSHOT'
     id 'maven-publish'
     id "com.modrinth.minotaur" version "2.+"
 }
@@ -25,15 +25,14 @@ repositories {
 
 dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings loom.officialMojangMappings()
+    implementation "net.fabricmc:fabric-loader:${project.loader_version}"
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     //Fabric API
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
     //ModMenu
-    modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
+    implementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
     //Yacl
-    modImplementation "dev.isxander:yet-another-config-lib:${project.yacl_version}"
+    implementation "dev.isxander:yet-another-config-lib:${project.yacl_version}"
 }
 
 processResources {
@@ -49,7 +48,7 @@ processResources {
     }
 }
 
-def targetJavaVersion = 21
+def targetJavaVersion = 25
 tasks.withType(JavaCompile).configureEach {
     it.options.encoding = "UTF-8"
     if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {

gradle.properties

@@ -2,14 +2,14 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.21.11
+minecraft_version=26.1
 loader_version=0.18.4
 # Mod Properties
-mod_version=1.0+1.21.11
+mod_version=1.0+26.1
-versionType=beta
+versionType=Release
 maven_group=com.lukasabbe
 archives_base_name=SimpleTransportHud
 # Dependencies
-fabric_version=0.141.3+1.21.11
+fabric_version=0.143.7+26.1
-mod_menu_version=17.0.0-alpha.1
+mod_menu_version=18.0.0-alpha.6
-yacl_version=3.8.1+1.21.11-fabric
+yacl_version=3.9.0+26.1-fabric

src/main/java/com/lukasabbe/simpletransporthud/SimpleTransportHudMod.java

@@ -8,7 +8,7 @@ import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElementRegistry;
 import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 
 import java.util.Arrays;
 import java.util.List;
@@ -37,7 +37,7 @@ public class SimpleTransportHudMod implements ClientModInitializer {
         ClientTickEvents.END_CLIENT_TICK.register(client -> EntityTools.tickEntityTools());
     }
 
-    public static void renderScaled(GuiGraphics graphics, DeltaTracker tracker, SimpleHud simpleHud){
+    public static void renderScaled(GuiGraphicsExtractor graphics, DeltaTracker tracker, SimpleHud simpleHud){
         var stack = graphics.pose();
         final float scale = (float) Config.HANDLER.instance().hudScale / 10;
         int width = graphics.guiWidth();

src/main/java/com/lukasabbe/simpletransporthud/huds/BoatHud.java

@@ -5,7 +5,7 @@ import com.lukasabbe.simpletransporthud.config.Config;
 import com.lukasabbe.simpletransporthud.config.HudPosition;
 import com.lukasabbe.simpletransporthud.tools.EntityTools;
 import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.resources.Identifier;
 import net.minecraft.util.Mth;
@@ -14,9 +14,9 @@ import net.minecraft.world.entity.vehicle.boat.Boat;
 public class BoatHud implements SimpleHud {
 
     @Override
-    public void render(GuiGraphics graphics, DeltaTracker tracker) {
+    public void render(GuiGraphicsExtractor graphics, DeltaTracker tracker) {
         if(!isHudActivated()) return;
-        if(client.noRender) return;
+        if(client.options.hideGui) return;
         if(!EntityTools.isRidingEntity(Boat.class)) return;
         if(client.player == null) return;
         if(EntityTools.getTime() < Config.HANDLER.instance().boatHudDelay) return;

src/main/java/com/lukasabbe/simpletransporthud/huds/ElytraHud.java

@@ -5,7 +5,7 @@ import com.lukasabbe.simpletransporthud.config.Config;
 import com.lukasabbe.simpletransporthud.config.HudPosition;
 import com.lukasabbe.simpletransporthud.tools.ElytraTools;
 import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.resources.Identifier;
 import net.minecraft.util.ARGB;
@@ -15,10 +15,10 @@ import net.minecraft.world.item.Items;
 public class ElytraHud implements SimpleHud {
 
     @Override
-    public void render(GuiGraphics graphics, DeltaTracker tracker) {
+    public void render(GuiGraphicsExtractor graphics, DeltaTracker tracker) {
         if(!isHudActivated()) return;
         if(!ElytraTools.isFlying()) return;
-        if(client.noRender) return;
+        if(client.options.hideGui) return;
         if(client.player == null) return;
         if(ElytraTools.getTime() < Config.HANDLER.instance().elytraHudDelay) return;
 

src/main/java/com/lukasabbe/simpletransporthud/huds/HappyGhastHud.java

@@ -6,14 +6,14 @@ import com.lukasabbe.simpletransporthud.config.HudPosition;
 import com.lukasabbe.simpletransporthud.config.SpeedEnum;
 import com.lukasabbe.simpletransporthud.tools.EntityTools;
 import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.entity.animal.happyghast.HappyGhast;
 
 public class HappyGhastHud extends RideableHud{
 
     @Override
-    public void render(GuiGraphics graphics, DeltaTracker tracker) {
+    public void render(GuiGraphicsExtractor graphics, DeltaTracker tracker) {
         if(!EntityTools.isRidingEntity(HappyGhast.class)) return;
         super.render(graphics, tracker);
     }

src/main/java/com/lukasabbe/simpletransporthud/huds/HorseHud.java

@@ -6,14 +6,14 @@ import com.lukasabbe.simpletransporthud.config.HudPosition;
 import com.lukasabbe.simpletransporthud.config.SpeedEnum;
 import com.lukasabbe.simpletransporthud.tools.EntityTools;
 import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.entity.animal.equine.AbstractHorse;
 
 public class HorseHud extends RideableHud {
 
     @Override
-    public void render(GuiGraphics graphics, DeltaTracker tracker) {
+    public void render(GuiGraphicsExtractor graphics, DeltaTracker tracker) {
         if(!EntityTools.isRidingEntity(AbstractHorse.class)) return;
         super.render(graphics, tracker);
     }

src/main/java/com/lukasabbe/simpletransporthud/huds/MinecartHud.java

@@ -5,7 +5,7 @@ import com.lukasabbe.simpletransporthud.config.Config;
 import com.lukasabbe.simpletransporthud.config.HudPosition;
 import com.lukasabbe.simpletransporthud.tools.EntityTools;
 import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.resources.Identifier;
 import net.minecraft.util.Mth;
@@ -13,9 +13,9 @@ import net.minecraft.world.entity.vehicle.minecart.Minecart;
 
 public class MinecartHud implements SimpleHud {
     @Override
-    public void render(GuiGraphics graphics, DeltaTracker tracker) {
+    public void render(GuiGraphicsExtractor graphics, DeltaTracker tracker) {
         if(!isHudActivated()) return;
-        if(client.noRender) return;
+        if(client.options.hideGui) return;
         if(!EntityTools.isRidingEntity(Minecart.class)) return;
         if(client.player == null) return;
         if(EntityTools.getTime() < Config.HANDLER.instance().minecartHudDelay) return;

src/main/java/com/lukasabbe/simpletransporthud/huds/NautilusHud.java

@@ -6,14 +6,14 @@ import com.lukasabbe.simpletransporthud.config.HudPosition;
 import com.lukasabbe.simpletransporthud.config.SpeedEnum;
 import com.lukasabbe.simpletransporthud.tools.EntityTools;
 import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.entity.animal.nautilus.AbstractNautilus;
 
 public class NautilusHud extends RideableHud {
 
     @Override
-    public void render(GuiGraphics graphics, DeltaTracker tracker) {
+    public void render(GuiGraphicsExtractor graphics, DeltaTracker tracker) {
         if(!EntityTools.isRidingEntity(AbstractNautilus.class)) return;
         super.render(graphics, tracker);
     }

src/main/java/com/lukasabbe/simpletransporthud/huds/RideableHud.java

@@ -3,15 +3,15 @@ package com.lukasabbe.simpletransporthud.huds;
 import com.lukasabbe.simpletransporthud.config.SpeedEnum;
 import com.lukasabbe.simpletransporthud.tools.EntityTools;
 import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.util.Mth;
 
 public abstract class RideableHud implements SimpleHud {
     @Override
-    public void render(GuiGraphics graphics, DeltaTracker tracker) {
+    public void render(GuiGraphicsExtractor graphics, DeltaTracker tracker) {
         if(!isHudActivated()) return;
-        if(client.noRender) return;
+        if(client.options.hideGui) return;
         if(client.player == null) return;
         if(EntityTools.getTime() < getDelay()) return;
         int[] pos = getCornerPos();

src/main/java/com/lukasabbe/simpletransporthud/huds/SimpleHud.java

@@ -7,7 +7,7 @@ import com.lukasabbe.simpletransporthud.config.SpeedEnum;
 import com.lukasabbe.simpletransporthud.tools.ElytraTools;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.resources.Identifier;
 import net.minecraft.util.Mth;
@@ -27,7 +27,7 @@ public interface SimpleHud {
     Identifier off_green_arrow = Identifier.fromNamespaceAndPath(Constants.MOD_ID, "textures/off_green_arrow.png");
     Identifier off_red_arrow = Identifier.fromNamespaceAndPath(Constants.MOD_ID, "textures/off_red_arrow.png");
 
-    void render(GuiGraphics graphics, DeltaTracker tracker);
+    void render(GuiGraphicsExtractor graphics, DeltaTracker tracker);
 
     Identifier getIdentifier();
     HudPosition getHudPosition();
@@ -36,7 +36,7 @@ public interface SimpleHud {
         return Config.HANDLER.instance().HudActivatedList.get(getIdentifier().toShortString());
     }
 
-    default void renderBackPlate(GuiGraphics graphics){
+    default void renderBackPlate(GuiGraphicsExtractor graphics){
         int[] pos = getCornerPos();
         int x = pos[0];
         int y = pos[1];
@@ -80,23 +80,23 @@ public interface SimpleHud {
         };
     }
 
-    default void renderCenteredScaledText(GuiGraphics graphics, String text, int centerX, int y, int color, float scale){
+    default void renderCenteredScaledText(GuiGraphicsExtractor graphics, String text, int centerX, int y, int color, float scale){
         var stack = graphics.pose();
         stack.pushMatrix();
         stack.translate(centerX, y);
         stack.scale(scale, scale);
         stack.translate(-centerX, -y);
-        graphics.drawString(client.font, text, centerX, y, color);
+        graphics.text(client.font, text, centerX, y, color);
         stack.popMatrix();
     }
 
-    default void drawScaledItem(GuiGraphics context, int poxX, int posY, Item item, float scaled){
+    default void drawScaledItem(GuiGraphicsExtractor context, int poxX, int posY, Item item, float scaled){
         var stack = context.pose();
         stack.pushMatrix();
         stack.translate(poxX,posY);
         stack.scale(scaled,scaled);
         stack.translate(-poxX,-posY);
-        context.renderFakeItem(item.getDefaultInstance(), poxX, posY);
+        context.fakeItem(item.getDefaultInstance(), poxX, posY);
         stack.popMatrix();
     }
 
@@ -112,7 +112,7 @@ public interface SimpleHud {
         return new int[]{x, y};
     }
 
-    default void drawLine(GuiGraphics graphics, float posX, float posY, float endPosX, float endPosY, int points, Identifier texture){
+    default void drawLine(GuiGraphicsExtractor graphics, float posX, float posY, float endPosX, float endPosY, int points, Identifier texture){
         for (int i = 0; i <= points; i++){
             float progress = (float) i / points;
             float x = Mth.lerp(progress, posX, endPosX);

src/main/java/com/lukasabbe/simpletransporthud/huds/StriderHud.java

@@ -6,13 +6,13 @@ import com.lukasabbe.simpletransporthud.config.HudPosition;
 import com.lukasabbe.simpletransporthud.config.SpeedEnum;
 import com.lukasabbe.simpletransporthud.tools.EntityTools;
 import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.entity.monster.Strider;
 
 public class StriderHud extends RideableHud{
     @Override
-    public void render(GuiGraphics graphics, DeltaTracker tracker) {
+    public void render(GuiGraphicsExtractor graphics, DeltaTracker tracker) {
         if(!EntityTools.isRidingEntity(Strider.class)) return;
         super.render(graphics, tracker);
     }

src/main/resources/fabric.mod.json

@@ -27,6 +27,6 @@
   "depends": {
     "fabricloader": ">=${loader_version}",
     "fabric-api": "*",
-    "minecraft": "${minecraft_version}"
+    "minecraft": "26.1"
   }
 }