target 1.21.2-pre3 (#299)

* pass 1

* pass 2

* cleanup

* 1.21.2-pre3

Author: deirn

build.gradle.kts

@@ -4,7 +4,7 @@ import java.nio.charset.StandardCharsets
 
 plugins {
     java
-    id("fabric-loom") version "1.7.2"
+    id("fabric-loom") version "1.8.9"
     id("maven-publish")
 }
 

gradle.properties

@@ -2,11 +2,11 @@ org.gradle.jvmargs  = -Xmx3G
 org.gradle.parallel = true
 org.gradle.caching  = true
 
-minecraft           = 1.21.1
+minecraft           = 1.21.2-pre3
 
 archiveBaseName     = wthit
 group               = mcp.mobius.waila
-majorVersion        = 12
+majorVersion        = 13
 
 # [rei, jei, emi]
 recipeViewer        = none
@@ -16,8 +16,8 @@ rei                 = 13.0.666
 jei                 = 1.20.2-16.0.0.28
 emi                 = 1.0.23+1.20.2
 
-fabricLoader        = 0.15.11
-fabricApi           = 0.102.0+1.21.1
+fabricLoader        = 0.16.7
+fabricApi           = 0.105.4+1.21.2
 modMenu             = 10.0.0-alpha.3
 trEnergy            = 3.0.0
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase = GRADLE_USER_HOME
 distributionPath = wrapper/dists
 zipStoreBase     = GRADLE_USER_HOME
 zipStorePath     = wrapper/dists
-distributionUrl  = https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl  = https\://services.gradle.org/distributions/gradle-8.10-bin.zip

platform/fabric/gradle.properties

@@ -1,16 +1,16 @@
 # CurseForge
 cf.endpoint    = minecraft.curseforge.com
 cf.projectId   = 440979
-cf.releaseType = stable
-cf.gameVersion = 1.21, 1.21.1
+cf.releaseType = beta
+cf.gameVersion = 1.21.2-Snapshot
 cf.loader      = Fabric, Quilt
 cf.require     = fabric-api, badpackets
 cf.optional    = modmenu, roughly-enough-items, jei, emi
 
 # Modrinth
 mr.projectId   = 6AQIaxuO
-mr.releaseType = stable
-mr.gameVersion = 1.21, 1.21.1
+mr.releaseType = beta
+mr.gameVersion = 1.21.2-pre3
 mr.loader      = fabric, quilt
 mr.require     = P7dR8mSH, ftdbN0KK
 mr.optional    = mOgUt4GM, nfn13YXA, fRiHVvU7

settings.gradle.kts

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

src/api/java/mcp/mobius/waila/api/IToolType.java

@@ -7,7 +7,7 @@
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Tiers;
+import net.minecraft.world.item.ToolMaterial;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
@@ -25,13 +25,13 @@ interface Builder0 {
 
         /**
          * The wooden stack, or any stack of the type that has its {@linkplain ItemStack#getDestroySpeed(BlockState) destroy speed}
-         * the same as or higher than {@linkplain Tiers#WOOD wood}.
+         * the same as or higher than {@linkplain ToolMaterial#WOOD wood}.
          */
         Builder1 lowestTierStack(ItemStack stack);
 
         /**
          * The wooden item, or any item of the type that has its {@linkplain Item#getDestroySpeed(ItemStack, BlockState) destroy speed}
-         * the same as or higher than {@linkplain Tiers#WOOD wood}
+         * the same as or higher than {@linkplain ToolMaterial#WOOD wood}
          */
         Builder1 lowestTierItem(ItemLike item);
 

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

@@ -23,7 +23,7 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Tier;
+import net.minecraft.world.item.ToolMaterial;
 import org.jetbrains.annotations.ApiStatus;
 import org.joml.Matrix4f;
 
@@ -73,7 +73,7 @@ public interface IApiService {
 
     <T> IInstanceRegistry<T> createInstanceRegistry(boolean reversed);
 
-    List<Tier> getTiers();
+    List<ToolMaterial> getTiers();
 
     <D extends IData> IData.Type<D> createDataType(ResourceLocation id);
 

src/api/java/mcp/mobius/waila/api/component/ArmorComponent.java

@@ -4,6 +4,7 @@
 import mcp.mobius.waila.api.__internal__.ApiSide;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 
@@ -50,9 +51,9 @@ public void render(GuiGraphics ctx, int x, int y, DeltaTracker delta) {
             var iy = y + ((i / lineWidth) * 3);
 
             if (i <= filled) {
-                ctx.blitSprite(SPRITE_FULL, ix, iy, 9, 9);
+                ctx.blitSprite(RenderType::guiTextured, SPRITE_FULL, ix, iy, 9, 9);
             } else if (i == half) {
-                ctx.blitSprite(SPRITE_HALF, ix, iy, 9, 9);
+                ctx.blitSprite(RenderType::guiTextured, SPRITE_HALF, ix, iy, 9, 9);
             }
         }
     }

src/api/java/mcp/mobius/waila/api/component/BarComponent.java

@@ -13,7 +13,7 @@
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.renderer.CoreShaders;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 
@@ -91,7 +91,7 @@ static void renderBar(
 
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
-        RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
+        RenderSystem.setShader(CoreShaders.POSITION_TEX_COLOR);
         RenderSystem.setShaderTexture(0, WailaConstants.COMPONENT_TEXTURE);
 
         var a = WailaHelper.getAlpha(tint);
@@ -113,13 +113,14 @@ static void renderBar(
     }
 
     static void renderText(GuiGraphics ctx, Component text, int x, int y) {
-        var font = Minecraft.getInstance().font;
-        var textWidth = font.width(text);
-        var textX = x + Math.max((BarComponent.WIDTH - textWidth) / 2F, 0F);
-        float textY = y + 2;
-
-        font.drawInBatch8xOutline(text.getVisualOrderText(), textX, textY, 0xAAAAAA, 0x292929, ctx.pose().last().pose(), ctx.bufferSource(), 0xf000f0);
-        ctx.bufferSource().endBatch();
+        ctx.drawSpecial(bufferSource -> {
+            var font = Minecraft.getInstance().font;
+            var textWidth = font.width(text);
+            var textX = x + Math.max((BarComponent.WIDTH - textWidth) / 2F, 0F);
+            float textY = y + 2;
+
+            font.drawInBatch8xOutline(text.getVisualOrderText(), textX, textY, 0xAAAAAA, 0x292929, ctx.pose().last().pose(), bufferSource, 0xf000f0);
+        });
     }
 
 }

src/api/java/mcp/mobius/waila/api/component/HealthComponent.java

@@ -4,6 +4,7 @@
 import mcp.mobius.waila.api.__internal__.ApiSide;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 
@@ -56,11 +57,11 @@ public void render(GuiGraphics ctx, int x, int y, DeltaTracker delta) {
             var ix = x + ((i % lineWidth) * 8);
             var iy = y + ((i / lineWidth) * 3);
 
-            ctx.blitSprite(SPRITE_CONTAINER, ix, iy, 9, 9);
+            ctx.blitSprite(RenderType::guiTextured, SPRITE_CONTAINER, ix, iy, 9, 9);
             if (i <= filled) {
-                ctx.blitSprite(absorption ? SPRITE_ABSORBING_FULL : SPRITE_NORMAL_FULL, ix, iy, 9, 9);
+                ctx.blitSprite(RenderType::guiTextured, absorption ? SPRITE_ABSORBING_FULL : SPRITE_NORMAL_FULL, ix, iy, 9, 9);
             } else if (i == half) {
-                ctx.blitSprite(absorption ? SPRITE_ABSORBING_HALF : SPRITE_NORMAL_HALF, ix, iy, 9, 9);
+                ctx.blitSprite(RenderType::guiTextured, absorption ? SPRITE_ABSORBING_HALF : SPRITE_NORMAL_HALF, ix, iy, 9, 9);
             }
         }
     }