Merge branch 'dev/1.21.1' into release/1.21.1

Author: SirEndii

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -41,9 +41,10 @@ body:
       multiple: false
       options:
         - Own compiled build.
-        - 1.21.1-0.7.51b (Latest 1.21.1)
+        - 1.21.1-0.7.53b (Latest 1.21.1)
+        - 1.21.1-0.7.52b
+        - 1.21.1-0.7.51b
         - 1.21.1-0.7.50b
-        - 1.21.1-0.7.49a
         - 1.20.4-0.7.43a (Latest 1.20.4)
         - 1.20.1-0.7.41r (Latest 1.20.1)
         - 1.20.1-0.7.40r

CHANGELOG.md

@@ -13,6 +13,17 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [1.21.1-0.7.52b] - 2025-07-06
 
+### Fixed
+- Fixed a crash at initializing when patchouli is not installed
+- Fixed that some Inventory Manager functions can't be wrapped
+
+## [1.21.1-0.7.53b] - 2025-07-09
+
+### Fixed
+- [#762] Fixed that several lua functions would throw a `IllegalStateException`
+
+## [1.21.1-0.7.52b] - 2025-07-06
+
 Due to some internal changes and fixes, the minimum version of neoforge was raised to 21.1.186, minecolonies to 1.1.1020-1.21.1-snapshot and CC:Tweaked to 1.116.0
 
 ### Added

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/InventoryManagerPeripheral.java

@@ -2,8 +2,8 @@
 
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.lua.LuaFunction;
-import dan200.computercraft.api.lua.LuaTable;
 import dan200.computercraft.api.lua.MethodResult;
+import dan200.computercraft.api.lua.ObjectLuaTable;
 import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.addons.computercraft.owner.BlockEntityPeripheralOwner;
 import de.srendi.advancedperipherals.common.blocks.blockentities.InventoryManagerEntity;
@@ -55,8 +55,8 @@ public final String getOwner() throws LuaException {
     //The item is specified the same as with the RS/ME bridge:
     //{name="minecraft:enchanted_book", count=1, nbt="ae70053c97f877de546b0248b9ddf525"}
     @LuaFunction(mainThread = true)
-    public final MethodResult addItemToPlayer(String invDirection, LuaTable<?, ?> item) throws LuaException {
-        Pair<ItemFilter, String> filter = ItemFilter.parse(item);
+    public final MethodResult addItemToPlayer(String invDirection, Map<?, ?> item) throws LuaException {
+        Pair<ItemFilter, String> filter = ItemFilter.parse(new ObjectLuaTable(item));
         if (filter.rightPresent())
             return MethodResult.of(0, filter.getRight());
 
@@ -80,8 +80,8 @@ private MethodResult addItemCommon(String invDirection, ItemFilter filter) throw
     }
 
     @LuaFunction(mainThread = true)
-    public final MethodResult removeItemFromPlayer(String invDirection, LuaTable<?, ?> item) throws LuaException {
-        Pair<ItemFilter, String> filter = ItemFilter.parse(item);
+    public final MethodResult removeItemFromPlayer(String invDirection, Map<?, ?> item) throws LuaException {
+        Pair<ItemFilter, String> filter = ItemFilter.parse(new ObjectLuaTable(item));
         if (filter.rightPresent())
             return MethodResult.of(0, filter.getRight());
 

src/main/java/de/srendi/advancedperipherals/common/events/Events.java

@@ -18,8 +18,6 @@
 import net.neoforged.neoforge.event.CommandEvent;
 import net.neoforged.neoforge.event.ServerChatEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerEvent;
-import vazkii.patchouli.api.PatchouliAPI;
-import vazkii.patchouli.common.base.PatchouliAPIImpl;
 
 import java.util.function.Consumer;
 
@@ -43,7 +41,7 @@ public static void onWorldJoin(PlayerEvent.PlayerLoggedInEvent event) {
         // See https://vazkiimods.github.io/Patchouli/docs/patchouli-basics/giving-new
         if (APConfig.WORLD_CONFIG.givePlayerBookOnJoin.get() && APAddon.PATCHOULI.isLoaded()) {
             if (!hasPlayedBefore(player)) {
-                PatchouliAPI.IPatchouliAPI patchouli = new PatchouliAPIImpl();
+                vazkii.patchouli.api.PatchouliAPI.IPatchouliAPI patchouli = vazkii.patchouli.api.PatchouliAPI.get();
                 ItemStack book = patchouli.getBookStack(AdvancedPeripherals.getRL("manual"));
                 player.addItem(book);
             }