26.1.2 port

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version "${loom_version}"
+	id 'net.fabricmc.fabric-loom' version "${loom_version}"
 	id 'maven-publish'
 	id 'me.fallenbreath.yamlang' version '1.4.1'
 }
@@ -40,23 +40,22 @@ repositories {
 }
 
 loom {
-	accessWidenerPath = file("src/main/resources/wakes.accesswidener")
+	accessWidenerPath = file("src/main/resources/wakes.classtweaker")
 }
 
 dependencies {
 
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings loom.officialMojangMappings()
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-	modImplementation include ("maven.modrinth:midnightlib:${project.midnightlib_version}")
+	implementation include ("maven.modrinth:midnightlib:${project.midnightlib_version}")
 
-	modCompileOnly "maven.modrinth:iris:${project.iris_version}"
+	compileOnly "maven.modrinth:iris:${project.iris_version}"
 
-	modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
+	implementation "com.terraformersmc:modmenu:${project.modmenu_version}"
 
 	testImplementation "org.junit.jupiter:junit-jupiter:5.10.0-M1"
 
@@ -75,7 +74,7 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 17
+	it.options.release = 25
 }
 
 java {

gradle.properties

@@ -4,19 +4,19 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.11
-loader_version=0.18.2
-loom_version=1.14-SNAPSHOT
+minecraft_version=26.1.2
+loader_version=0.19.2
+loom_version=1.16-SNAPSHOT
 
 # Fabric API
-fabric_version=0.139.5+1.21.11
+fabric_version=0.148.0+26.1.2
 
 # Mod Properties
-mod_version=0.5.1+1.21.11
+mod_version=0.5.1+26.1.2
 maven_group=com.goby56.wakes
 archives_base_name=wakes
 
 # Dependencies
-midnightlib_version=1.9.2+1.21.11-fabric
-iris_version=1.10.2+1.21.11-fabric
-modmenu_version=17.0.0-alpha.1
+midnightlib_version=1.9.3+26.1-fabric
+iris_version=1.10.9+26.1-fabric
+modmenu_version=18.0.0-alpha.8

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/goby56/wakes/WakesClient.java

@@ -13,8 +13,8 @@
 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.fabricmc.fabric.api.client.rendering.v1.world.WorldRenderEvents;
-import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents;
+import net.fabricmc.fabric.api.client.rendering.v1.level.LevelRenderEvents;
+import net.fabricmc.fabric.api.entity.event.v1.ServerEntityLevelChangeEvents;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.metadata.ModMetadata;
 import net.irisshaders.iris.api.v0.IrisApi;
@@ -51,13 +51,13 @@ public void onInitializeClient() {
 
 		// Wake handler handling
 		ClientTickEvents.START_CLIENT_TICK.register(new WakeClientTicker());
-		ClientTickEvents.END_WORLD_TICK.register(new WakeWorldTicker());
-		ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.register(new WakeWorldTicker());
+		ClientTickEvents.END_LEVEL_TICK.register(new WakeWorldTicker());
+		ServerEntityLevelChangeEvents.AFTER_PLAYER_CHANGE_LEVEL.register(new WakeWorldTicker());
 
 		// Rendering events
 		wakeRenderer = new WakeRenderer();
-		WorldRenderEvents.END_MAIN.register(wakeRenderer);
-		WorldRenderEvents.END_MAIN.register(new SplashPlaneRenderer());
+		LevelRenderEvents.END_MAIN.register(wakeRenderer);
+		LevelRenderEvents.END_MAIN.register(new SplashPlaneRenderer());
 
 		SplashPlaneRenderer.initSplashPlane();
         DebugScreenEntries.register(

src/main/java/com/goby56/wakes/config/gui/ColorIntervalSlider.java

@@ -6,8 +6,10 @@
 import com.goby56.wakes.simulation.WakeHandler;
 import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.client.renderer.RenderPipelines;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractSliderButton;
+import net.minecraft.resources.Identifier;
+import net.minecraft.util.ARGB;
 import net.minecraft.network.chat.Component;
 
 import java.util.ArrayList;
@@ -46,12 +48,13 @@ private void unfocusHandles() {
         }
     }
 
+    private static final Identifier SLIDER_SPRITE = Identifier.withDefaultNamespace("widget/slider");
+    private static final Identifier SLIDER_HIGHLIGHTED_SPRITE = Identifier.withDefaultNamespace("widget/slider_highlighted");
+
     @Override
-    public void renderWidget(GuiGraphics context, int mouseX, int mouseY, float delta) {
-        //RenderSystem.enableBlend();
-        //RenderSystem.defaultBlendFunc();
-        //RenderSystem.enableDepthTest();
-        context.blitSprite(RenderPipelines.GUI_TEXTURED, this.getSprite(), this.getX(), this.getY(), this.getWidth(), this.getHeight());
+    public void extractWidgetRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
+        Identifier sliderSprite = this.isActive() && this.isFocused() ? SLIDER_HIGHLIGHTED_SPRITE : SLIDER_SPRITE;
+        context.blitSprite(RenderPipelines.GUI_TEXTURED, sliderSprite, this.getX(), this.getY(), this.getWidth(), this.getHeight(), ARGB.white(this.alpha));
 
         this.isHovered = context.containsPointInScissor(mouseX, mouseY) && mouseX >= this.getX() && mouseY >= this.getY() && mouseX < this.getX() + this.width && mouseY < this.getY() + this.height;
         int n = handles.size();
@@ -74,7 +77,7 @@ public void renderWidget(GuiGraphics context, int mouseX, int mouseY, float delt
         boolean correctY = mouseY >= getY() && mouseY < getY() + height;
         for (SliderHandle handle : handles) {
             boolean isHovered = handle.inProximity(hoveredVal, width, 8) && correctY;
-            context.blitSprite(RenderPipelines.GUI_TEXTURED, handle.getHandleTexture(isHovered), this.getX() + (int)(handle.value * (double)(this.width - 4)), this.getY(), 8, this.getHeight());
+            context.blitSprite(RenderPipelines.GUI_TEXTURED, handle.getHandleTexture(isHovered), this.getX() + (int)(handle.value * (double)(this.width - 4)), this.getY(), 8, this.getHeight(), ARGB.white(this.alpha));
         }
     }
 

src/main/java/com/goby56/wakes/config/gui/ColorPicker.java

@@ -9,13 +9,14 @@
 import net.minecraft.client.input.KeyEvent;
 import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.client.renderer.RenderPipelines;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
+import net.minecraft.resources.Identifier;
+import net.minecraft.util.ARGB;
 import net.minecraft.client.gui.components.AbstractSliderButton;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
-import net.minecraft.util.Mth;
 import org.joml.Matrix3x2f;
 import org.joml.Vector2f;
 
@@ -164,26 +165,25 @@ public void updateColor() {
     }
 
     @Override
-    protected void renderWidget(GuiGraphics context, int mouseX, int mouseY, float delta) {
+    protected void extractWidgetRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
         if (!active) return;
         context.blit(RenderPipelines.GUI_TEXTURED, PICKER_BG_TEXTURE, colorPickerBounds.x, colorPickerBounds.y, 0, 0, colorPickerBounds.width, colorPickerBounds.height, colorPickerBounds.width, colorPickerBounds.height);
         context.blit(RenderPipelines.GUI_TEXTURED, FRAME_TEXTURE, colorPickerBounds.x, colorPickerBounds.y, 0, 0, colorPickerBounds.width, colorPickerBounds.height, colorPickerBounds.width, colorPickerBounds.height);
 
         drawPickerBox(context);
-        // Draw picker knob
         int d = pickerKnobDim;
         context.blit(RenderPipelines.GUI_TEXTURED, PICKER_KNOB_TEXTURE, (int) pickerPos.x - 3, (int) pickerPos.y - 3, 0, 0, d, d, d, d);
     }
 
-    private void drawPickerBox(GuiGraphics context) {
+    private void drawPickerBox(GuiGraphicsExtractor context) {
         int y = colorPickerBounds.y + 3;
         int x = colorPickerBounds.x + 3;
         int w = colorPickerBounds.width - 6;
         int h = colorPickerBounds.height - 6;
 
         int hue = (int) (((ColorPickerSlider) this.widgets.get("hueSlider").getWidget()).getValue() * 255);
 
-        context.guiRenderState.submitGuiElement(new HsvQuadGuiElementRenderState(
+        context.guiRenderState.addGuiElement(new HsvQuadGuiElementRenderState(
                 new Matrix3x2f(context.pose()),
                 x, y, w, h,
                 0x7F0000FF | hue << 16,
@@ -239,7 +239,6 @@ public HexInputField(AABB bounds, ColorPicker colorPicker, Font textRenderer) {
             this.setMaxLength(9); // #AARRGGBB
             this.bounds = bounds;
             this.colorPicker = colorPicker;
-            this.setFilter(HexInputField::validHex);
             this.hexColorRegex = Pattern.compile("#[a-f0-9]{7,9}", Pattern.CASE_INSENSITIVE);
         }
 
@@ -256,16 +255,17 @@ protected void onValueChange(String newText) {
             super.onValueChange(newText);
         }
 
-        private static boolean validHex(String text) {
-            if (text.length() > 9) {
-                return false;
-            }
-            for (char c : text.toLowerCase().toCharArray()) {
-                if (Character.digit(c, 16) == -1 && c != '#') {
-                    return false;
+        @Override
+        public void insertText(String input) {
+            StringBuilder filtered = new StringBuilder();
+            for (char c : input.toCharArray()) {
+                if (Character.digit(Character.toLowerCase(c), 16) != -1 || c == '#') {
+                    filtered.append(c);
                 }
             }
-            return true;
+            if (!filtered.isEmpty()) {
+                super.insertText(filtered.toString());
+            }
         }
 
         public void setActive(boolean active) {
@@ -337,12 +337,18 @@ public float getValue() {
             return (float) this.value;
         }
 
+        private static final Identifier SLIDER_SPRITE = Identifier.withDefaultNamespace("widget/slider");
+        private static final Identifier SLIDER_HIGHLIGHTED_SPRITE = Identifier.withDefaultNamespace("widget/slider_highlighted");
+        private static final Identifier SLIDER_HANDLE_SPRITE = Identifier.withDefaultNamespace("widget/slider_handle");
+        private static final Identifier SLIDER_HANDLE_HIGHLIGHTED_SPRITE = Identifier.withDefaultNamespace("widget/slider_handle_highlighted");
+
         @Override
-        public void renderWidget(GuiGraphics context, int mouseX, int mouseY, float delta) {
-            context.blitSprite(RenderPipelines.GUI_TEXTURED, this.getSprite(), this.getX(), this.getY(), this.getWidth(), this.getHeight());
+        public void extractWidgetRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
+            Identifier sliderSprite = this.isActive() && this.isFocused() ? SLIDER_HIGHLIGHTED_SPRITE : SLIDER_SPRITE;
+            context.blitSprite(RenderPipelines.GUI_TEXTURED, sliderSprite, this.getX(), this.getY(), this.getWidth(), this.getHeight(), ARGB.white(this.alpha));
 
             if (this.type.equals(SliderUpdateType.HUE)) {
-                context.guiRenderState.submitGuiElement(new HsvQuadGuiElementRenderState(
+                context.guiRenderState.addGuiElement(new HsvQuadGuiElementRenderState(
                         new Matrix3x2f(context.pose()),
                         this.getX() + 1, this.getY() + 1, this.getWidth() - 2, this.getHeight() - 2,
                         0x4000FFFF,
@@ -353,9 +359,9 @@ public void renderWidget(GuiGraphics context, int mouseX, int mouseY, float delt
                     )
                 );
             }
-            context.blitSprite(RenderPipelines.GUI_TEXTURED, this.getHandleSprite(), this.getX() + (int)(this.value * (double)(this.width - 8)), this.getY(), 8, this.getHeight());
-            int i = this.active ? 0xFFFFFF : 0xA0A0A0;
-            this.renderScrollingStringOverContents(context.textRenderer(), this.message, i | Mth.ceil(this.alpha * 255.0f) << 24);
+            Identifier handleSprite = !this.isActive() || !this.isHovered && !this.canChangeValue ? SLIDER_HANDLE_SPRITE : SLIDER_HANDLE_HIGHLIGHTED_SPRITE;
+            context.blitSprite(RenderPipelines.GUI_TEXTURED, handleSprite, this.getX() + (int)(this.value * (double)(this.width - 8)), this.getY(), 8, this.getHeight(), ARGB.white(this.alpha));
+            this.extractScrollingStringOverContents(context.textRendererForWidget(this, GuiGraphicsExtractor.HoveredTextEffects.NONE), this.getMessage(), 2);
         }
 
         @Override

src/main/java/com/goby56/wakes/config/gui/ColorPickerScreen.java

@@ -6,7 +6,7 @@
 import com.goby56.wakes.utils.WakesUtils;
 import com.google.common.collect.Lists;
 import eu.midnightdust.lib.config.MidnightConfig;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
@@ -79,16 +79,16 @@ public void onClose() {
     }
 
     @Override
-    public void render(GuiGraphics context, int mouseX, int mouseY, float delta) {
-        super.render(context, mouseX, mouseY, delta);
-        context.drawCenteredString(font, WakesUtils.translatable("gui", "colorIntervalSlider", "title"), width / 2, 10, 0xffffffff);
+    public void extractRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
+        super.extractRenderState(context, mouseX, mouseY, delta);
+        context.centeredText(font, WakesUtils.translatable("gui", "colorIntervalSlider", "title"), width / 2, 10, 0xffffffff);
         if (this.showInfoText) {
-            context.drawWordWrap(font, WakesUtils.translatable("gui", "colorIntervalSlider", "infoText"), width - 325, height - 45, 320, 0xffffffff, true);
+            context.textWithWordWrap(font, WakesUtils.translatable("gui", "colorIntervalSlider", "infoText"), width - 325, height - 45, 320, 0xffffffff);
         }
     }
 
     @Override
-    protected void renderBlurredBackground(GuiGraphics context) {
+    protected void extractBlurredBackground(GuiGraphicsExtractor context) {
 
     }
 

src/main/java/com/goby56/wakes/config/gui/HsvQuadGuiElementRenderState.java

@@ -3,9 +3,9 @@
 import com.goby56.wakes.WakesClient;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
-import net.minecraft.client.gui.render.state.GuiElementRenderState;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.gui.render.TextureSetup;
+import net.minecraft.client.renderer.state.gui.GuiElementRenderState;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix3x2f;
 

src/main/java/com/goby56/wakes/config/gui/TexturedButton.java

@@ -1,7 +1,7 @@
 package com.goby56.wakes.config.gui;
 
 import net.minecraft.client.renderer.RenderPipelines;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
@@ -22,7 +22,7 @@ public static com.goby56.wakes.config.gui.TexturedButton.Builder builder(Button.
     }
 
     @Override
-    protected void renderContents(GuiGraphics context, int mouseX, int mouseY, float delta) {
+    protected void extractContents(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
         int tw = this.textureWidth;
         int th = this.textureHeight;
         int x = this.getX() + this.getWidth() / 2 - this.textureWidth / 2;

src/main/java/com/goby56/wakes/config/gui/WakesConfigScreen.java

@@ -2,7 +2,7 @@
 
 import com.goby56.wakes.utils.WakesUtils;
 import eu.midnightdust.lib.config.MidnightConfig;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
 
@@ -25,9 +25,9 @@ protected void init() {
     }
 
     @Override
-    public void render(GuiGraphics context, int mouseX, int mouseY, float delta) {
-        super.render(context, mouseX, mouseY, delta);
-        context.drawCenteredString(font, this.title, width / 2, 10, 0xffffff);
+    public void extractRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
+        super.extractRenderState(context, mouseX, mouseY, delta);
+        context.centeredText(font, this.title, width / 2, 10, 0xffffff);
     }
 
 }

src/main/java/com/goby56/wakes/event/WakeWorldTicker.java

@@ -5,12 +5,12 @@
 import com.goby56.wakes.simulation.WakeHandler;
 import com.goby56.wakes.debug.WakesDebugInfo;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents;
+import net.fabricmc.fabric.api.entity.event.v1.ServerEntityLevelChangeEvents;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.ServerLevel;
 
-public class WakeWorldTicker implements ClientTickEvents.EndWorldTick, ServerEntityWorldChangeEvents.AfterPlayerChange {
+public class WakeWorldTicker implements ClientTickEvents.EndLevelTick, ServerEntityLevelChangeEvents.AfterPlayerChange {
 
     @Override
     public void onEndTick(ClientLevel world) {
@@ -21,7 +21,7 @@ public void onEndTick(ClientLevel world) {
     }
 
     @Override
-    public void afterChangeWorld(ServerPlayer player, ServerLevel origin, ServerLevel destination) {
+    public void afterChangeLevel(ServerPlayer player, ServerLevel origin, ServerLevel destination) {
         WakeHandler.init(destination);
     }
 }