Merge remote-tracking branch 'origin/dev/master' into dev/26.1

Author: deirn

CHANGELOG.txt

@@ -1,9 +1,11 @@
 19.x - 26.1-rc-3 - dev/26.1 - java 25
 =====================================
 19.0.0   - Updated to Minecraft 26.1-rc-3
+         - Updated Russian translation (#363)
 
 18.x - 1.21.11 - dev/1.21.11 - java 21
 ======================================
+18.2.2   - Updated Russian translation (#363)
 18.2.1   - Fixed material origin always showing vanilla class
 18.2.0   - [API] Deprecated `getWorld` function in favor of `getLevel`
            - `getLevel` returns the `ServerLevel` instance on `IServerAccessor`
@@ -22,6 +24,7 @@
 
 17.x - 1.21.10 - dev/1.21.10 - java 21
 ======================================
+17.5.2   - Updated Russian translation (#363)
 17.5.1   - Fixed material origin always showing vanilla class
 17.5.0   - [API] Deprecated `getWorld` function in favor of `getLevel`
            - `getLevel` returns the `ServerLevel` instance on `IServerAccessor`
@@ -87,6 +90,7 @@
 
 14.x - 1.21.4 - dev/1.21.4 - java 21
 ====================================
+14.6.2   - Updated Russian translation (#363)
 14.6.1   - Fixed material origin always showing vanilla class
 14.6.0   - [API] Deprecated `getWorld` function in favor of `getLevel`
            - `getLevel` returns the `ServerLevel` instance on `IServerAccessor`
@@ -141,6 +145,7 @@
 
 12.x - 1.21.1 - dev/1.21.1 - java 21
 ====================================
+12.10.2   - Updated Russian translation (#363)
 12.10.1  - Fixed simple tier origin always showing Forge class
 12.10.0  - [API] Deprecated `getWorld` function in favor of `getLevel`
            - `getLevel` returns the `ServerLevel` instance on `IServerAccessor`
@@ -274,6 +279,7 @@
 
 10.x - 1.20.4 - dev/1.20.4 - java 17
 ====================================
+10.11.1  - Updated Russian translation (#363)
 10.11.0  - [API] Deprecated `getWorld` function in favor of `getLevel`
            - `getLevel` returns the `ServerLevel` instance on `IServerAccessor`
          - Added French translation (#357)
@@ -447,6 +453,7 @@
 
 8.x - 1.20.1 - dev/1.20.1 - java 17
 ===================================
+8.21.1   - Updated Russian translation (#363)
 8.21.0   - [API] Deprecated `getWorld` function in favor of `getLevel`
            - `getLevel` returns the `ServerLevel` instance on `IServerAccessor`
          - Added French translation (#357)
@@ -722,6 +729,7 @@
 
 5.x - 1.19.2 - dev/1.19.2 - java 17
 ===================================
+5.36.1   - Updated Russian translation (#363)
 5.36.0   - [API] Deprecated `getWorld` function in favor of `getLevel`
            - `getLevel` returns the `ServerLevel` instance on `IServerAccessor`
          - Added French translation (#357)

gradle.properties

@@ -11,7 +11,7 @@ majorVersion        = 19
 # [rei, jei, emi]
 recipeViewer        = none
 
-badpackets          = 0.12.0
+badpackets          = 0.12.1
 rei                 = 13.0.666
 jei                 = 1.20.2-16.0.0.28
 emi                 = 1.0.23+1.20.2
@@ -22,7 +22,7 @@ modMenu             = 18.0.0-alpha.6
 trEnergy            = 5.0.0
 
 forge               = 61.0.2
-neo                 = 21.11.0-beta
+neo                 = 26.1.0.1-beta
 
 architectury        = 10.0.7
 clothConfig         = 12.0.107

platform/neo/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("net.neoforged.moddev") version "2.0.110"
+    id("net.neoforged.moddev") version "2.0.141"
 }
 
 setupPlatform(setRuntimeClasspath = false)

platform/neo/src/main/java/mcp/mobius/waila/neo/NeoClientApiService.java

@@ -1,13 +1,14 @@
 package mcp.mobius.waila.neo;
 
 import mcp.mobius.waila.service.ClientApiService;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
+import org.jspecify.annotations.Nullable;
 
 public class NeoClientApiService extends ClientApiService {
 
     @Override
-    public ScreenRectangle peekScissorStack(GuiGraphics ctx) {
+    public @Nullable ScreenRectangle peekScissorStack(GuiGraphicsExtractor ctx) {
         return ctx.peekScissorStack();
     }
 

platform/neo/src/main/java/mcp/mobius/waila/neo/NeoServerCommand.java

@@ -22,7 +22,7 @@ public class NeoServerCommand extends ServerCommand {
                 var offHandStack = player.getOffhandItem();
                 var item = !offHandStack.isEmpty()
                     ? offHandStack.getItem()
-                    : BuiltInRegistries.ITEM.getRandom(world.random).orElseThrow().value();
+                    : BuiltInRegistries.ITEM.getRandom(world.getRandom()).orElseThrow().value();
 
                 if (handler.insert(ItemResource.of(item), item.getDefaultMaxStackSize(), tx) == 0L) break;
             }

platform/neo/src/plugin/java/mcp/mobius/waila/plugin/neo/fluid/NeoFluidDescriptor.java

@@ -17,12 +17,12 @@ public enum NeoFluidDescriptor implements FluidDescriptor<Fluid> {
     public void describeFluid(FluidDescriptionContext<Fluid> ctx, FluidDescription desc) {
         var stack = new FluidStack(ctx.fluid().builtInRegistryHolder(), 1, ctx.data());
         var type = ctx.fluid().getFluidType();
-        var extensions = IClientFluidTypeExtensions.of(type);
-        var atlas = Minecraft.getInstance().getAtlasManager().getAtlasOrThrow(AtlasIds.BLOCKS);
+        var model = Minecraft.getInstance().getModelManager().getFluidStateModelSet().get(ctx.fluid().defaultFluidState());
+        var tintSource = model.fluidTintSource();
 
         desc.name(type.getDescription(stack))
-            .sprite(atlas.getSprite(extensions.getStillTexture(stack)))
-            .tint(extensions.getTintColor(stack));
+            .sprite(model.stillMaterial().sprite())
+            .tint(tintSource == null ? 0xFFFFFFFF : tintSource.colorAsStack(stack));
     }
 
 }

platform/textile/src/plugin/java/mcp/mobius/waila/plugin/textile/TextileClientPlugin.java

@@ -19,8 +19,7 @@ public abstract class TextileClientPlugin implements IWailaClientPlugin {
 
     @Override
     public void register(IClientRegistrar registrar) {
-        // TODO(26.1)
-        // FluidData.describeFluid(Fluid.class, TextileFluidDescriptor.INSTANCE);
+        FluidData.describeFluid(Fluid.class, TextileFluidDescriptor.INSTANCE);
         FluidData.describeCauldron(Block.class, TextileFluidDescriptor.INSTANCE);
 
         registrar.toolType(Identifier.withDefaultNamespace("pickaxe"), IToolType.builder()

platform/textile/src/plugin/java/mcp/mobius/waila/plugin/textile/fluid/TextileFluidDescriptor.java

@@ -6,11 +6,11 @@
 import mcp.mobius.waila.api.data.FluidData.FluidDescriptionContext;
 import mcp.mobius.waila.api.data.FluidData.FluidDescriptor;
 import mcp.mobius.waila.api.fabric.FabricFluidData;
-import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderingRegistry;
 import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRendering;
 import net.fabricmc.fabric.api.transfer.v1.fluid.CauldronFluidContent;
 import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
 import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariantAttributes;
+import net.minecraft.client.Minecraft;
 import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Fluid;
@@ -23,15 +23,11 @@ public enum TextileFluidDescriptor implements FluidDescriptor<Fluid>, CauldronDe
 
     @Override
     public void describeFluid(FluidDescriptionContext<Fluid> ctx, FluidDescription desc) {
-        // TODO(26.1)
-        // var variant = FluidVariant.of(ctx.fluid(), ctx.data());
-        // desc.name(FluidVariantAttributes.getName(variant));
-
-        // var sprite = FluidVariantRendering.getSprite(variant);
-        // if (sprite != null) {
-        //     desc.sprite(sprite)
-        //         .tint(FluidVariantRendering.getColor(variant));
-        // }
+        var variant = FluidVariant.of(ctx.fluid(), ctx.data());
+        var model = Minecraft.getInstance().getModelManager().getFluidStateModelSet().get(ctx.fluid().defaultFluidState());
+        desc.name(FluidVariantAttributes.getName(variant))
+            .sprite(model.stillMaterial().sprite())
+            .tint(FluidVariantRendering.getColor(variant));
     }
 
     @Override

settings.gradle.kts

@@ -32,6 +32,6 @@ platform("mojmap")
 //platform("bukkit")
 platform("fabric")
 //platform("forge")
-//platform("neo")
+platform("neo")
 platform("textile")
 //platform("quilt")

src/api/java/mcp/mobius/waila/api/__internal__/IClientApiService.java

@@ -8,8 +8,8 @@
 import net.minecraft.client.gui.navigation.ScreenRectangle;
 import net.minecraft.client.renderer.state.gui.GuiRenderState;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix3x2f;
+import org.jspecify.annotations.Nullable;
 
 /** @hidden */
 @ApiStatus.Internal