diff --git a/iclibs/Nukkit-MOT-SNAPSHOT.jar b/iclibs/Nukkit-MOT-SNAPSHOT.jar index c0d6d668..49ab9041 100644 Binary files a/iclibs/Nukkit-MOT-SNAPSHOT.jar and b/iclibs/Nukkit-MOT-SNAPSHOT.jar differ diff --git a/src/main/java/com/reider745/api/CallbackHelper.java b/src/main/java/com/reider745/api/CallbackHelper.java index 712da973..93fbc658 100644 --- a/src/main/java/com/reider745/api/CallbackHelper.java +++ b/src/main/java/com/reider745/api/CallbackHelper.java @@ -2,6 +2,7 @@ package com.reider745.api; import cn.nukkit.Server; import cn.nukkit.event.Event; +import cn.nukkit.event.inventory.CraftItemEvent; import cn.nukkit.level.Level; import com.reider745.api.hooks.HookController; import com.zhekasmirnov.horizon.runtime.logger.Logger; diff --git a/src/main/java/com/reider745/event/EventListener.java b/src/main/java/com/reider745/event/EventListener.java index 84a50e2f..9c6531c3 100644 --- a/src/main/java/com/reider745/event/EventListener.java +++ b/src/main/java/com/reider745/event/EventListener.java @@ -533,8 +533,10 @@ public class EventListener implements Listener { if(player.craftingType == Player.CRAFTING_SMALL || player.craftingType == Player.CRAFTING_BIG) { if (!NativeWorkbench.canRemoveRecipe(event.getTransaction().getRecipe().getId())) consumeEvent(event, () -> NativeCallback.onWorkbenchCraft(grid, playerUid, inventorySize)); - else + else { + System.out.println("REMOVE"); event.setCancelled(); + } } } diff --git a/src/main/java/com/reider745/hooks/block/BlockPalette.java b/src/main/java/com/reider745/hooks/block/BlockPalette.java index 0e755d9f..a542421f 100644 --- a/src/main/java/com/reider745/hooks/block/BlockPalette.java +++ b/src/main/java/com/reider745/hooks/block/BlockPalette.java @@ -7,6 +7,7 @@ import cn.nukkit.block.BlockID; import cn.nukkit.blockentity.BlockEntity; import cn.nukkit.blockentity.BlockEntitySpawnable; import cn.nukkit.level.DimensionData; +import cn.nukkit.level.GlobalBlockPalette; import cn.nukkit.level.format.ChunkSection; import cn.nukkit.level.format.generic.BaseChunk; import cn.nukkit.level.format.generic.serializer.NetworkChunkData; diff --git a/src/main/java/com/reider745/hooks/optimization/Palette.java b/src/main/java/com/reider745/hooks/optimization/Palette.java index 30f039db..adbc3665 100644 --- a/src/main/java/com/reider745/hooks/optimization/Palette.java +++ b/src/main/java/com/reider745/hooks/optimization/Palette.java @@ -1,17 +1,11 @@ package com.reider745.hooks.optimization; -import cn.nukkit.level.BlockPalette; import com.reider745.api.hooks.TypeHook; import com.reider745.api.hooks.annotation.Hooks; import com.reider745.api.hooks.annotation.Inject; @Hooks(className = "cn.nukkit.level.GlobalBlockPalette") public class Palette { - @Inject - public static BlockPalette getPaletteByProtocol(int protocol) { - return null; - } - @Inject(type = TypeHook.BEFORE_REPLACE) public static void init() { } diff --git a/src/main/java/com/zhekasmirnov/apparatus/mcpe/NativeWorkbench.java b/src/main/java/com/zhekasmirnov/apparatus/mcpe/NativeWorkbench.java index 0b32f7ed..fa9bd63b 100644 --- a/src/main/java/com/zhekasmirnov/apparatus/mcpe/NativeWorkbench.java +++ b/src/main/java/com/zhekasmirnov/apparatus/mcpe/NativeWorkbench.java @@ -18,6 +18,8 @@ import com.reider745.hooks.item.ItemUtils; import com.zhekasmirnov.apparatus.adapter.innercore.game.item.ItemStack; import com.zhekasmirnov.horizon.runtime.logger.Logger; import com.zhekasmirnov.innercore.api.NativeItemInstanceExtra; +import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import org.mozilla.javascript.StackStyle; import java.lang.reflect.Method; import java.util.*; @@ -32,7 +34,7 @@ public class NativeWorkbench { } } - private static final ArrayList removedRecipes = new ArrayList<>(); + private static final List removedRecipes = new ObjectArrayList<>(); private static boolean isFinalLoad = false; public static boolean canRemoveRecipe(UUID uuid){