Skip to content

Commit 7760963

Browse files
committed
port to 25w10a
1 parent 0af96ab commit 7760963

File tree

5 files changed

+20
-435
lines changed

5 files changed

+20
-435
lines changed

gradle.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ mod_file_name = tweakeroo-fabric
1212
mod_version = 0.23.999-dev
1313

1414
# Required malilib version
15-
malilib_version = b79e24ab59
15+
malilib_version = 2c0b2be1e7
1616

1717
# Minecraft, Fabric Loader and API and mappings versions
18-
minecraft_version_out = 25w09b
19-
minecraft_version = 25w09b
20-
mappings_version = 25w09b+build.6
18+
minecraft_version_out = 25w10a
19+
minecraft_version = 25w10a
20+
mappings_version = 25w10a+build.1
2121

2222
fabric_loader_version = 0.16.10
2323
mod_menu_version = 14.0.0-beta.1

src/main/java/fi/dy/masa/tweakeroo/event/RenderHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ private void renderOverlays(Matrix4f posMatrix, MinecraftClient mc)
221221
hitResult.getBlockPos(),
222222
hitResult.getSide(),
223223
hitResult.getPos(),
224-
color, posMatrix, mc);
224+
color, posMatrix);
225225

226226
fi.dy.masa.malilib.render.RenderUtils.depthTest(true);
227227
fi.dy.masa.malilib.render.RenderUtils.blend(false);

src/main/java/fi/dy/masa/tweakeroo/renderer/InventoryOverlayHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ else if (entity instanceof PiglinEntity)
421421
// Fix for empty horse inv
422422
if (inv != null &&
423423
nbt.contains(NbtKeys.ITEMS) &&
424-
nbt.getOrCreateList(NbtKeys.ITEMS).size() > 1)
424+
nbt.getListOrEmpty(NbtKeys.ITEMS).size() > 1)
425425
{
426426
if (entity instanceof AbstractHorseEntity)
427427
{
@@ -444,7 +444,7 @@ else if (inv != null &&
444444
// Fix for empty Villager/Piglin inv
445445
else if (inv != null && inv.size() == 8 &&
446446
nbt.contains(NbtKeys.INVENTORY) &&
447-
!nbt.getOrCreateList(NbtKeys.INVENTORY).isEmpty())
447+
!nbt.getListOrEmpty(NbtKeys.INVENTORY).isEmpty())
448448
{
449449
inv2 = InventoryUtils.getNbtInventory(nbt, 8, entity.getRegistryManager());
450450
inv = null;

0 commit comments

Comments
 (0)