target 1.21.4

badasintended · Dec 5, 2024 · 042a315 · 042a315
1 parent 5976b99
commit 042a315
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 27 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,11 +2,11 @@ org.gradle.jvmargs  = -Xmx3G
 org.gradle.parallel = true
 org.gradle.caching  = true
 
-minecraft           = 1.21.3
+minecraft           = 1.21.4
 
 archiveBaseName     = wthit
 group               = mcp.mobius.waila
-majorVersion        = 13
+majorVersion        = 14
 
 # [rei, jei, emi]
 recipeViewer        = none
@@ -16,13 +16,13 @@ rei                 = 13.0.666
 jei                 = 1.20.2-16.0.0.28
 emi                 = 1.0.23+1.20.2
 
-fabricLoader        = 0.16.7
-fabricApi           = 0.106.1+1.21.3
+fabricLoader        = 0.16.9
+fabricApi           = 0.110.5+1.21.4
 modMenu             = 10.0.0-alpha.3
 trEnergy            = 3.0.0
 
 forge               = 53.0.13
-neo                 = 21.3.0-beta
+neo                 = 21.4.5-beta
 
 architectury        = 10.0.7
 clothConfig         = 12.0.107

diff --git a/platform/fabric/gradle.properties b/platform/fabric/gradle.properties
@@ -2,15 +2,15 @@
 cf.endpoint    = minecraft.curseforge.com
 cf.projectId   = 440979
 cf.releaseType = stable
-cf.gameVersion = 1.21.3
+cf.gameVersion = 1.21.4
 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.3
+mr.gameVersion = 1.21.4
 mr.loader      = fabric, quilt
 mr.require     = P7dR8mSH, ftdbN0KK
 mr.optional    = mOgUt4GM, nfn13YXA, fRiHVvU7
diff --git a/platform/neo/gradle.properties b/platform/neo/gradle.properties
@@ -2,15 +2,15 @@
 cf.endpoint    = minecraft.curseforge.com
 cf.projectId   = 455982
 cf.releaseType = beta
-cf.gameVersion = 1.21.3
+cf.gameVersion = 1.21.4
 cf.loader      = NeoForge
 cf.require     = badpackets
 cf.optional    = jei
 
 # Modrinth
 mr.projectId   = 6AQIaxuO
 mr.releaseType = beta
-mr.gameVersion = 1.21.3
+mr.gameVersion = 1.21.4
 mr.loader      = neoforge
 mr.require     = ftdbN0KK
 mr.optional    = 1PfY6b5p
diff --git a/platform/neo/src/main/java/mcp/mobius/waila/neo/NeoApiService.java b/platform/neo/src/main/java/mcp/mobius/waila/neo/NeoApiService.java
@@ -10,7 +10,9 @@ public class NeoApiService extends ApiService {
     @Override
     @SuppressWarnings("DataFlowIssue")
     public IModInfo getModInfo(ItemStack stack) {
-        return ModInfo.get(stack.getItem().getCreatorModId(stack));
+        return super.getModInfo(stack);
+        // TODO use Neo's method
+        // return ModInfo.get(stack.getItem().getCreatorModId(stack));
     }
 
     @Override

diff --git a/platform/textile/src/plugin/java/mcp/mobius/waila/plugin/textile/TextileClientPlugin.java b/platform/textile/src/plugin/java/mcp/mobius/waila/plugin/textile/TextileClientPlugin.java
@@ -56,7 +56,7 @@ public void register(IClientRegistrar registrar) {
         registrar.toolType(ResourceLocation.withDefaultNamespace("shears"), IToolType.builder()
             .lowestTierItem(Items.SHEARS)
             .blockPredicate(it -> /*it.is(BlockTags.SHEARS_MINEABLE) ||*/ it.getBlock() instanceof IShearable || it.getBlock() instanceof DoublePlantBlock)
-            .itemTag(ConventionalItemTags.SHEARS_TOOLS)
+            .itemTag(ConventionalItemTags.SHEAR_TOOLS)
             .build());
     }
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -31,7 +31,7 @@ platform("mojmap")
 
 //platform("bukkit")
 platform("fabric")
-platform("forge")
+//platform("forge")
 platform("neo")
 platform("textile")
 //platform("quilt")
diff --git a/src/main/java/mcp/mobius/waila/access/ClientAccessor.java b/src/main/java/mcp/mobius/waila/access/ClientAccessor.java
@@ -191,7 +191,7 @@ public void set(Level world, Player player, HitResult hit, Entity viewEntity, Ve
     public void setState(BlockState state) {
         this.state = state;
         this.block = state.getBlock();
-        this.stack = block.getCloneItemStack(world, pos, state);
+        this.stack = state.getCloneItemStack(world, pos, true);
         this.blockRegistryName = BuiltInRegistries.BLOCK.getKey(block);
     }
 

diff --git a/src/main/java/mcp/mobius/waila/gui/screen/CreditsScreen.java b/src/main/java/mcp/mobius/waila/gui/screen/CreditsScreen.java
@@ -93,7 +93,7 @@ private ListWidget(Minecraft client, int width, int height, int top, int itemHei
         private void init() {
             var totalHeight = (children().size() - 1) * itemHeight;
             if (totalHeight < height) {
-                setRenderHeader(true, (height - totalHeight) / 2 - getY());
+                headerHeight = (height - totalHeight) / 2 - getY();
             }
         }
 
@@ -103,7 +103,7 @@ public int getRowWidth() {
         }
 
         @Override
-        protected int getScrollbarPosition() {
+        protected int scrollBarX() {
             return minecraft.getWindow().getGuiScaledWidth() - 5;
         }
 

diff --git a/src/main/java/mcp/mobius/waila/gui/widget/ConfigListWidget.java b/src/main/java/mcp/mobius/waila/gui/widget/ConfigListWidget.java
@@ -55,7 +55,7 @@ public int getRowWidth() {
     }
 
     @Override
-    protected int getScrollbarPosition() {
+    protected int scrollBarX() {
         return minecraft.getWindow().getGuiScaledWidth() - 5;
     }
 
@@ -127,7 +127,7 @@ public void init() {
         }
 
         resize(topOffset, owner.height + bottomOffset);
-        setScrollAmount(getScrollAmount());
+        setScrollAmount(scrollAmount());
     }
 
     public void add(Entry entry) {

diff --git a/src/main/java/mcp/mobius/waila/service/ApiService.java b/src/main/java/mcp/mobius/waila/service/ApiService.java
@@ -43,6 +43,7 @@
 import net.minecraft.world.item.TippedArrowItem;
 import net.minecraft.world.item.ToolMaterial;
 import net.minecraft.world.item.alchemy.PotionContents;
+import net.minecraft.world.item.component.CustomData;
 import net.minecraft.world.item.enchantment.ItemEnchantments;
 import net.minecraft.world.level.block.Block;
 import org.joml.Matrix4f;
@@ -70,9 +71,12 @@ public IModInfo getModInfo(ItemStack stack) {
                     var id = BuiltInRegistries.POTION.getKey(potion.value());
                     if (id != null) return IModInfo.get(id);
                 }
-            } else if (item instanceof SpawnEggItem spawnEggItem) {
-                var id = BuiltInRegistries.ENTITY_TYPE.getKey(spawnEggItem.getType(stack));
-                return IModInfo.get(id.getNamespace());
+            } else if (item instanceof SpawnEggItem) {
+                var customData = stack.getOrDefault(DataComponents.ENTITY_DATA, CustomData.EMPTY);
+                if (!customData.isEmpty()) {
+                    var id = customData.parseEntityId();
+                    if (id != null) return IModInfo.get(id);
+                }
             }
         }
 

diff --git a/src/mixin/java/mcp/mobius/waila/mixin/AbstractFurnaceBlockEntityAccess.java b/src/mixin/java/mcp/mobius/waila/mixin/AbstractFurnaceBlockEntityAccess.java
@@ -7,8 +7,8 @@
 @Mixin(AbstractFurnaceBlockEntity.class)
 public interface AbstractFurnaceBlockEntityAccess {
 
-    @Accessor("cookingProgress")
-    int wthit_cookingProgress();
+    @Accessor("cookingTimer")
+    int wthit_cookingTimer();
 
     @Accessor("cookingTotalTime")
     int wthit_cookingTotalTime();

diff --git a/src/mixin/java/mcp/mobius/waila/mixin/ShearableBlocksMixin.java b/src/mixin/java/mcp/mobius/waila/mixin/ShearableBlocksMixin.java
@@ -1,7 +1,6 @@
 package mcp.mobius.waila.mixin;
 
 import mcp.mobius.waila.mixed.IShearable;
-import net.minecraft.world.level.block.CherryLeavesBlock;
 import net.minecraft.world.level.block.DeadBushBlock;
 import net.minecraft.world.level.block.LeavesBlock;
 import net.minecraft.world.level.block.MangroveLeavesBlock;
@@ -13,7 +12,6 @@
 
 
 @Mixin({
-    CherryLeavesBlock.class,
     DeadBushBlock.class,
     LeavesBlock.class,
     MangroveLeavesBlock.class,

diff --git a/src/pluginCore/java/mcp/mobius/waila/plugin/core/provider/BlockProvider.java b/src/pluginCore/java/mcp/mobius/waila/plugin/core/provider/BlockProvider.java
@@ -32,7 +32,7 @@ public enum BlockProvider implements IBlockComponentProvider {
 
     @Override
     public ITooltipComponent getIcon(IBlockAccessor accessor, IPluginConfig config) {
-        return new ItemComponent(accessor.getBlock().getCloneItemStack(accessor.getWorld(), accessor.getPosition(), accessor.getBlockState()));
+        return new ItemComponent(accessor.getBlockState().getCloneItemStack(accessor.getWorld(), accessor.getPosition(), true));
     }
 
     @Override

diff --git a/src/pluginCore/java/mcp/mobius/waila/plugin/core/theme/NinePatchTheme.java b/src/pluginCore/java/mcp/mobius/waila/plugin/core/theme/NinePatchTheme.java
@@ -13,6 +13,7 @@
 import mcp.mobius.waila.api.IThemeAccessor;
 import mcp.mobius.waila.api.IThemeType;
 import mcp.mobius.waila.api.IntFormat;
+import mcp.mobius.waila.api.WailaConstants;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
@@ -43,6 +44,8 @@ public enum Mode {
         TILE, STRETCH
     }
 
+    private static final ResourceLocation PATH_TEXTURE_ID = ResourceLocation.fromNamespaceAndPath(WailaConstants.NAMESPACE, "nine_patch_path");
+
     private String texture;
     private boolean useResourcePack;
     private int textColor;
@@ -70,7 +73,8 @@ public void processProperties(IThemeAccessor accessor) {
         } else {
             try {
                 var image = NativeImage.read(Files.newInputStream(accessor.getPath(texture)));
-                textureId = Minecraft.getInstance().getTextureManager().register("waila_9p", new DynamicTexture(image));
+                textureId = PATH_TEXTURE_ID;
+                Minecraft.getInstance().getTextureManager().register(textureId, new DynamicTexture(image));
             } catch (Exception e) {
                 textureId = TextureManager.INTENTIONAL_MISSING_TEXTURE;
             }

diff --git a/...pluginVanilla/java/mcp/mobius/waila/plugin/vanilla/provider/data/FurnaceDataProvider.java b/...pluginVanilla/java/mcp/mobius/waila/plugin/vanilla/provider/data/FurnaceDataProvider.java
@@ -20,7 +20,7 @@ public void appendData(IDataWriter data, IServerAccessor<AbstractFurnaceBlockEnt
             var access = (AbstractFurnaceBlockEntityAccess) furnace;
 
             if (furnace.getBlockState().getValue(AbstractFurnaceBlock.LIT)) res.add(ProgressData
-                .ratio((float) access.wthit_cookingProgress() / access.wthit_cookingTotalTime())
+                .ratio((float) access.wthit_cookingTimer() / access.wthit_cookingTotalTime())
                 .itemGetter(furnace::getItem)
                 .input(0, 1)
                 .output(2));