chore(bouquet): update to 26.2-snapshot-3

fixes wailua to support this version

Author: hugeblank

bouquet/examples/wailua/reloadable.lua

@@ -8,34 +8,30 @@ if allium.environment() ~= "client" then return end
 local events = require("bouquet").events
 local Component = require("net.minecraft.network.chat.Component")
 local BuiltInRegistries = require("net.minecraft.core.registries.BuiltInRegistries")
+local Type = require("net.minecraft.world.phys.HitResult.Type")
 
-local renderComponent -- The text to be shared between the render event and tick event
-
-events.client.guiRenderTail:register(script, function(client, context, deltaTracker, gui)
-    if renderComponent then -- If there's text, then draw it at the top center
-        context:centeredText(gui:getFont(), renderComponent, context:guiWidth()/2, 5, 0xffffffff)
-        -- The position 5 was arbitrarily chosen, and was the first value I picked just to test. It worked perfectly.
-        -- Exercise for the reader - Create a background frame behind the text, so it can be viewed on white backgrounds.
-        -- Note that while text rendering uses RGB, background rendering uses ARGB.
-    end
-end)
-
-events.common.playerTick:register(script, function(player)
-    local level = player:level()
-    if level:isClientSide() then
+events.client.guiRenderTail:register(script, function(gui, minecraft, graphics, deltaTracker, shouldRenderLevel, resourcesLoaded)
+    if minecraft.hitResult and minecraft.hitResult:getType() == Type.BLOCK then
         -- Finally, use the block to get the identifier of the block
         local identifier = BuiltInRegistries.BLOCK:getKey(
-        -- Use the position to get the state, then the block attributed to that state
-                level:getBlockState(
+            -- Use the position to get the state, then the block attributed to that state
+            minecraft.level:getBlockState(
                 -- Get the block position the player is looking at <- START HERE read UP ^
-                        player:pick(5, 0, false):getBlockPos()
-                ):getBlock()
+                minecraft.hitResult:getBlockPos()
+            ):getBlock()
         )
         local namespace, path = identifier:getNamespace(),  identifier:getPath()
-        if namespace == "minecraft" and path == "air" then -- If we're just looking at air, don't create a text object.
-            renderComponent = nil
-        else -- Otherwise, pull the name of the block from the language.
-            renderComponent = Component.translatable("block."..namespace.."."..path)
+        if not (namespace == "minecraft" and path == "air") then -- If we're just looking at air, don't write text.
+            graphics:centeredText(
+                minecraft.font,
+                Component.translatable("block."..namespace.."."..path),
+                graphics:guiWidth()/2,
+                5,
+                0xffffffff
+            )
+            -- The position 5 was arbitrarily chosen, and was the first value I picked just to test. It worked perfectly.
+            -- Exercise for the reader - Create a background frame behind the text, so it can be viewed on white backgrounds.
+            -- Note that while text rendering uses RGB, background rendering uses ARGB.
         end
     end
 end)

bouquet/src/client/java/dev/moongarden/bouquet/api/event/ClientEventHandlers.java

@@ -12,6 +12,6 @@
 public class ClientEventHandlers {
 
     public interface GuiRender {
-        void onGuiRender(Minecraft client, GuiGraphicsExtractor context, DeltaTracker deltaTracker, Gui hud);
+        void onGuiRender(Gui hud, Minecraft client, GuiGraphicsExtractor context, DeltaTracker deltaTracker, boolean shouldRenderLevel, boolean resourcesLoaded);
     }
 }

bouquet/src/client/java/dev/moongarden/bouquet/mixin/client/gui/hud/GuiMixin.java

@@ -1,5 +1,8 @@
 package dev.moongarden.bouquet.mixin.client.gui.hud;
 
+import com.llamalad7.mixinextras.expression.Definition;
+import com.llamalad7.mixinextras.expression.Expression;
+import com.llamalad7.mixinextras.sugar.Local;
 import dev.moongarden.bouquet.api.event.ClientEvents;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
@@ -8,7 +11,6 @@
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-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,16 +21,15 @@ public class GuiMixin {
     @Final
     private Minecraft minecraft;
 
-    @Unique
-    private final Gui thiz = (Gui) (Object) this;
-
-    @Inject(at = @At("HEAD"), method = "extractRenderState")
-    private void renderHead(GuiGraphicsExtractor context, DeltaTracker deltaTracker, CallbackInfo ci) {
-        ClientEvents.GUI_RENDER_HEAD.invoker().onGuiRender(minecraft, context, deltaTracker, thiz);
+    @Definition(id = "GuiGraphicsExtractor", type = GuiGraphicsExtractor.class)
+    @Expression("? = new GuiGraphicsExtractor(?,?,?,?)")
+    @Inject(at = @At(value = "MIXINEXTRAS:EXPRESSION", shift = At.Shift.AFTER), method = "extractRenderState")
+    private void renderHead(DeltaTracker deltaTracker, boolean shouldRenderLevel, boolean resourcesLoaded, CallbackInfo ci, @Local(name = "graphics") GuiGraphicsExtractor graphics) {
+        ClientEvents.GUI_RENDER_HEAD.invoker().onGuiRender((Gui) (Object) this, minecraft, graphics, deltaTracker, shouldRenderLevel, resourcesLoaded);
     }
 
     @Inject(at = @At("TAIL"), method = "extractRenderState")
-    private void renderTail(GuiGraphicsExtractor context, DeltaTracker deltaTracker, CallbackInfo ci) {
-        ClientEvents.GUI_RENDER_TAIL.invoker().onGuiRender(minecraft, context, deltaTracker, thiz);
+    private void renderTail(DeltaTracker deltaTracker, boolean shouldRenderLevel, boolean resourcesLoaded, CallbackInfo ci, @Local(name = "graphics") GuiGraphicsExtractor graphics) {
+        ClientEvents.GUI_RENDER_TAIL.invoker().onGuiRender((Gui) (Object) this, minecraft, graphics, deltaTracker, shouldRenderLevel, resourcesLoaded);
     }
 }

bouquet/src/client/resources/bouquet.client.mixins.json

@@ -8,5 +8,8 @@
 	],
 	"injectors": {
 		"defaultRequire": 1
-	}
+	},
+  "mixinextras": {
+    "minVersion": "0.5.0"
+  }
 }

bouquet/src/main/resources/bouquet.mixins.json

@@ -24,5 +24,8 @@
   ],
   "injectors": {
     "defaultRequire": 1
+  },
+  "mixinextras": {
+    "minVersion": "0.5.0"
   }
 }

bouquet/src/main/resources/fabric.mod.json

@@ -34,7 +34,7 @@
       }
 	],
 	"depends": {
-      "minecraft": "~26.1",
+      "minecraft": "~26.2-",
       "fabricloader": ">=0.18.3",
       "java": ">=25"
 	},

gradle.properties

@@ -17,9 +17,9 @@ bouquetBaseName=bouquet
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraftVersion=26.1
+minecraftVersion=26.2-snapshot-3
 loaderVersion=0.18.4
-loomVersion=1.15-SNAPSHOT
+loomVersion=1.16-SNAPSHOT
 
 # Common Dependencies
 cobalt=0.9.7
@@ -29,4 +29,4 @@ enhancedReflections=0.1.6
 combine=2.3.0-rc.2
 
 # Bouquet Example Script Dependencies
-fabricApi=0.143.15+26.1
+fabricApi=0.146.1+26.2

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.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME