diff --git a/iclibs/Nukkit-MOT-SNAPSHOT.jar b/iclibs/Nukkit-MOT-SNAPSHOT.jar index d603ed3f..ce22c819 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/Main.java b/src/main/java/com/reider745/Main.java index 76bf9f83..e511860f 100644 --- a/src/main/java/com/reider745/Main.java +++ b/src/main/java/com/reider745/Main.java @@ -133,6 +133,10 @@ public class Main { }); add("com.reider745.hooks.ServerHooks"); + //optimization + add("com.reider745.hooks.optimization.Creative"); + add("com.reider745.hooks.optimization.Palette"); + patchLoader.init(); loader.init(Arrays.stream(args).anyMatch("--debug-hooks"::equals)); diff --git a/src/main/java/com/reider745/hooks/network/CraftingDataPacketHooks.java b/src/main/java/com/reider745/hooks/network/CraftingDataPacketHooks.java index 47279a40..21d4fa37 100644 --- a/src/main/java/com/reider745/hooks/network/CraftingDataPacketHooks.java +++ b/src/main/java/com/reider745/hooks/network/CraftingDataPacketHooks.java @@ -1,9 +1,9 @@ package com.reider745.hooks.network; -import cn.nukkit.inventory.Recipe; -import cn.nukkit.inventory.ShapedRecipe; -import cn.nukkit.inventory.ShapelessRecipe; import cn.nukkit.network.protocol.CraftingDataPacket; +import cn.nukkit.recipe.Recipe; +import cn.nukkit.recipe.impl.ShapedRecipe; +import cn.nukkit.recipe.impl.ShapelessRecipe; import com.reider745.api.hooks.annotation.Hooks; import com.reider745.api.hooks.annotation.Inject; import com.reider745.api.hooks.annotation.ShadowGetField; diff --git a/src/main/java/com/reider745/hooks/network/RakNetPlayerSessionHooks.java b/src/main/java/com/reider745/hooks/network/RakNetPlayerSessionHooks.java index dbfc7f97..7e9b1a63 100644 --- a/src/main/java/com/reider745/hooks/network/RakNetPlayerSessionHooks.java +++ b/src/main/java/com/reider745/hooks/network/RakNetPlayerSessionHooks.java @@ -5,10 +5,7 @@ import cn.nukkit.Player; import cn.nukkit.Server; import cn.nukkit.network.CompressionProvider; import cn.nukkit.network.RakNetInterface; -import cn.nukkit.network.protocol.BatchPacket; -import cn.nukkit.network.protocol.DataPacket; -import cn.nukkit.network.protocol.DisconnectPacket; -import cn.nukkit.network.protocol.ProtocolInfo; +import cn.nukkit.network.protocol.*; import cn.nukkit.network.session.NetworkPlayerSession; import cn.nukkit.network.session.RakNetPlayerSession; import cn.nukkit.plugin.InternalPlugin; @@ -22,6 +19,7 @@ import com.reider745.api.hooks.annotation.Hooks; import com.reider745.api.hooks.annotation.Inject; import com.reider745.network.BasePacket; import com.reider745.network.InnerCorePacket; +import com.zhekasmirnov.apparatus.mcpe.NativeNetworking; import com.zhekasmirnov.apparatus.multiplayer.server.ConnectedClient; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; @@ -295,6 +293,9 @@ public class RakNetPlayerSessionHooks extends RakNetPlayerSession { while ((packet = this.inbound.poll()) != null) { try { this.player.handleDataPacket(packet); + if(packet instanceof LoginPacket) { + NativeNetworking.createConnection(this); + } } catch (Throwable e) { log.error(String.valueOf(new FormattedMessage("An error occurred whilst handling {} for {}", new Object[]{packet.getClass().getSimpleName(), this.player.getName()}, e))); diff --git a/src/main/java/com/reider745/hooks/optimization/Creative.java b/src/main/java/com/reider745/hooks/optimization/Creative.java new file mode 100644 index 00000000..def36e7d --- /dev/null +++ b/src/main/java/com/reider745/hooks/optimization/Creative.java @@ -0,0 +1,56 @@ +package com.reider745.hooks.optimization; + +import cn.nukkit.Server; +import cn.nukkit.item.Item; +import cn.nukkit.network.protocol.types.inventory.creative.CreativeItemCategory; +import cn.nukkit.utils.Config; +import cn.nukkit.utils.MainLogger; +import cn.nukkit.utils.Utils; +import com.reider745.api.hooks.TypeHook; +import com.reider745.api.hooks.annotation.Hooks; +import com.reider745.api.hooks.annotation.Inject; + +import java.util.Map; + +@Hooks(className = "cn.nukkit.item.Item") +public class Creative { + private static Item.CreativeItems items = new Item.CreativeItems(); + + @Inject(type = TypeHook.BEFORE_REPLACE) + public static void clearCreativeItems() { + items.clear(); + } + + @Inject + public static Item.CreativeItems getCreativeItemsAndGroups(int protocol) { + return items; + } + + @Inject(type = TypeHook.BEFORE_REPLACE) + public static void addCreativeItem(int protocol, Item item, CreativeItemCategory category, String group) { + if(protocol == 407) { + items.add(item); + } + } + + @Inject(type = TypeHook.BEFORE_REPLACE) + public static void registerCreativeItems(int protocol) { + if(protocol != 407) { + return; + } + + for(Map map : (new Config(2)).loadFromStream(Server.class.getClassLoader().getResourceAsStream("creativeitems" + protocol + ".json")).getMapList("items")) { + try { + Item item = Item.fromJson(map); + if (Utils.hasItemOrBlock(item.getId())) { + Item.addCreativeItem(protocol, item); + } + } catch (Exception e) { + MainLogger.getLogger().logException(e); + } + } + } + + @Inject(type = TypeHook.BEFORE_REPLACE) + public static void registerCreativeItemsNew(int protocol, int blockPaletteProtocol, Item.CreativeItems creativeItems) {} +} diff --git a/src/main/java/com/reider745/hooks/optimization/Palette.java b/src/main/java/com/reider745/hooks/optimization/Palette.java new file mode 100644 index 00000000..30f039db --- /dev/null +++ b/src/main/java/com/reider745/hooks/optimization/Palette.java @@ -0,0 +1,18 @@ +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/NativeNetworking.java b/src/main/java/com/zhekasmirnov/apparatus/mcpe/NativeNetworking.java index 49bdeed5..4119b1a4 100644 --- a/src/main/java/com/zhekasmirnov/apparatus/mcpe/NativeNetworking.java +++ b/src/main/java/com/zhekasmirnov/apparatus/mcpe/NativeNetworking.java @@ -198,18 +198,24 @@ public class NativeNetworking { } } - public static void onServerPacketReceived(RakNetPlayerSessionHooks sender, String name, int formatId, byte[] bytes) throws IOException { + public static NativeChannelImpl createConnection(RakNetPlayerSessionHooks session) { synchronized (serverToClientChannelMap) { - Java8BackComp.computeIfAbsent(serverToClientChannelMap, sender, key -> { + return serverToClientChannelMap.computeIfAbsent(session, key -> { if(InnerCoreServer.isDebugInnerCoreNetwork()) System.out.println("Create new native connection"); - NativeChannelImpl channel = new NativeChannelImpl(sender); + NativeChannelImpl channel = new NativeChannelImpl(session); for (ConnectionListener listener : connectionListeners) { - listener.onNativeChannelConnected(new NativeDataChannel(channel), sender); + listener.onNativeChannelConnected(new NativeDataChannel(channel), session); } return channel; - }).onReceived(new DataPacket(name, formatId, bytes)); + }); + } + } + + public static void onServerPacketReceived(RakNetPlayerSessionHooks sender, String name, int formatId, byte[] bytes) throws IOException { + synchronized (serverToClientChannelMap) { + createConnection(sender).onReceived(new DataPacket(name, formatId, bytes)); } } diff --git a/src/main/java/com/zhekasmirnov/apparatus/mcpe/NativeWorkbench.java b/src/main/java/com/zhekasmirnov/apparatus/mcpe/NativeWorkbench.java index 9fefe020..f353cedd 100644 --- a/src/main/java/com/zhekasmirnov/apparatus/mcpe/NativeWorkbench.java +++ b/src/main/java/com/zhekasmirnov/apparatus/mcpe/NativeWorkbench.java @@ -1,12 +1,19 @@ package com.zhekasmirnov.apparatus.mcpe; import cn.nukkit.Server; -import cn.nukkit.inventory.*; import cn.nukkit.item.Item; import cn.nukkit.item.RuntimeItemMapping; import cn.nukkit.item.RuntimeItems; +import cn.nukkit.recipe.CraftingRecipe; +import cn.nukkit.recipe.Recipe; +import cn.nukkit.recipe.RecipeRegistry; +import cn.nukkit.recipe.descriptor.DefaultDescriptor; +import cn.nukkit.recipe.descriptor.ItemDescriptor; +import cn.nukkit.recipe.impl.ShapedRecipe; +import cn.nukkit.recipe.impl.ShapelessRecipe; import com.reider745.InnerCoreServer; +import com.reider745.api.ReflectHelper; import com.reider745.hooks.item.ItemUtils; import com.zhekasmirnov.apparatus.adapter.innercore.game.item.ItemStack; import com.zhekasmirnov.horizon.runtime.logger.Logger; @@ -17,14 +24,16 @@ import java.util.*; public class NativeWorkbench { interface IApply { - IApply apply(RuntimeItemMapping mapping, CraftingManager craftingManager); + IApply apply(RuntimeItemMapping mapping); default void rebuildPacket() { - if(NativeWorkbench.craftingManager != null) - craftingManager.rebuildPacket(); + if(isFinalLoad) { + RecipeRegistry.buildPackets(); + } } } private static final ArrayList removedRecipes = new ArrayList<>(); + private static boolean isFinalLoad = false; public static boolean canRemoveRecipe(UUID uuid){ return removedRecipes.contains(uuid); @@ -39,21 +48,14 @@ public class NativeWorkbench { this.resultData = resultData; } - private static Collection getRecipes(CraftingManager craftingManager){ - try{ - Method method = craftingManager.getClass().getDeclaredMethod("getRegisterRecipes", int.class); - method.setAccessible(true); - return (Collection) method.invoke(craftingManager, InnerCoreServer.RECIPES_PROTOCOL); - }catch (Exception e){ - Logger.error("ERROR-REMOVE-RECIPE", e); - } - return null; + private static Collection getRecipes(){ + return ReflectHelper.getField(RecipeRegistry.class, "RECIPES"); } @Override - public IApply apply(RuntimeItemMapping mapping, CraftingManager craftingManager) { + public IApply apply(RuntimeItemMapping mapping) { final Item itemInstance = ItemUtils.get(this.resultId, this.resultCount, this.resultData); - final Collection recipes = getRecipes(craftingManager); + final Collection recipes = getRecipes(); boolean removeRecipe = false; for(Recipe recipe : recipes){ @@ -70,7 +72,7 @@ public class NativeWorkbench { } } - private static class RecipeRegistry implements IApply { + private static class RecipeRegistryEntry implements IApply { public int resultId; public int resultCount; public int resultData; @@ -80,8 +82,8 @@ public class NativeWorkbench { public int[] ingredients_; public boolean shapeless = false; - public RecipeRegistry(int resultId, int resultCount, int resultData, NativeItemInstanceExtra resultExtra, String[] pattern, - HashMap ingredients) { + public RecipeRegistryEntry(int resultId, int resultCount, int resultData, NativeItemInstanceExtra resultExtra, String[] pattern, + HashMap ingredients) { this.resultId = resultId; this.resultCount = resultCount; this.resultData = resultData; @@ -90,7 +92,7 @@ public class NativeWorkbench { this.ingredients = ingredients; } - public RecipeRegistry(int resultId, int resultCount, int resultData, NativeItemInstanceExtra resultExtra, int[] ingredients) { + public RecipeRegistryEntry(int resultId, int resultCount, int resultData, NativeItemInstanceExtra resultExtra, int[] ingredients) { this.resultId = resultId; this.resultCount = resultCount; this.resultData = resultData; @@ -100,7 +102,7 @@ public class NativeWorkbench { } @Override - public IApply apply(RuntimeItemMapping mapping, CraftingManager craftingManager) { + public IApply apply(RuntimeItemMapping mapping) { Item result = ItemUtils.get(this.resultId, this.resultCount, this.resultData, this.resultExtra); try { mapping.toRuntime(result.getId(), result.getDamage()); @@ -113,7 +115,7 @@ public class NativeWorkbench { boolean accepted = true; Item item; if (!this.shapeless) { - final Map ingredients = new HashMap<>(); + final Map ingredients = new HashMap<>(); for (Map.Entry ingredient : this.ingredients.entrySet()) { ItemStack stack = ingredient.getValue(); item = ItemUtils.get(stack.id, stack.data); @@ -125,7 +127,7 @@ public class NativeWorkbench { + stack.data + " (recipe: id=" + this.resultId + ", meta=" + this.resultData + ")"); continue; } - ingredients.put(ingredient.getKey(), item); + ingredients.put(ingredient.getKey(), new DefaultDescriptor(item)); } for (String s : this.pattern) { @@ -137,11 +139,10 @@ public class NativeWorkbench { } if (accepted) { - craftingManager.registerRecipe(InnerCoreServer.RECIPES_PROTOCOL, - new ShapedRecipe(result, this.pattern, ingredients, new ArrayList<>())); + RecipeRegistry.registerShapedRecipe(new ShapedRecipe(result, this.pattern, ingredients, new ArrayList<>())); } } else { - final Collection ingredients = new ArrayList<>(); + final Collection ingredients = new ArrayList<>(); for (int id, data, i = 0; i < this.ingredients_.length; i += 3) { id = this.ingredients_[i + 1]; data = this.ingredients_[i + 2]; @@ -154,10 +155,10 @@ public class NativeWorkbench { + " (recipe: id=" + this.resultId + ", meta=" + this.resultData + ")"); continue; } - ingredients.add(item); + ingredients.add(new DefaultDescriptor(item)); } if (accepted) { - craftingManager.registerRecipe(InnerCoreServer.RECIPES_PROTOCOL, new ShapelessRecipe(result, ingredients)); + RecipeRegistry.registerShapelessRecipe(new ShapelessRecipe(result, ingredients)); } } @@ -167,7 +168,6 @@ public class NativeWorkbench { private static final ArrayList recipes = new ArrayList<>(); private static RuntimeItemMapping runtimeItemMapping = null; - private static CraftingManager craftingManager = null; private static void addShapedRecipe(int resultId, int resultCount, int resultData, NativeItemInstanceExtra resultExtra, String[] pattern, int[] ingredients) { @@ -175,12 +175,10 @@ public class NativeWorkbench { for (int i = 0; i < ingredients.length; i += 3) ingredients_.put((char) ingredients[i], new ItemStack(ingredients[i + 1], 1, ingredients[i + 2])); - final RecipeRegistry recipe = new RecipeRegistry(resultId, resultCount, resultData, resultExtra, pattern, ingredients_); - if(craftingManager != null) - recipe.apply(runtimeItemMapping, craftingManager) + final RecipeRegistryEntry recipe = new RecipeRegistryEntry(resultId, resultCount, resultData, resultExtra, pattern, ingredients_); + + recipe.apply(runtimeItemMapping) .rebuildPacket(); - else - recipes.add(recipe); } public static void addShapedRecipe(ItemStack result, String[] pattern, int[] ingredients) { @@ -194,12 +192,9 @@ public class NativeWorkbench { return; } - final RecipeRegistry recipe = new RecipeRegistry(resultId, resultCount, resultData, resultExtra, ingredients); - if(craftingManager != null) - recipe.apply(runtimeItemMapping, craftingManager) - .rebuildPacket(); - else - recipes.add(recipe); + final RecipeRegistryEntry recipe = new RecipeRegistryEntry(resultId, resultCount, resultData, resultExtra, ingredients); + recipes.add(recipe); + recipe.rebuildPacket(); } public static void addShapelessRecipe(ItemStack result, int[] ingredients) { @@ -209,21 +204,17 @@ public class NativeWorkbench { public static void removeRecipeByResult(int resultId, int resultCount, int resultData) { final RecipeRemove recipe = new RecipeRemove(resultId, resultCount, resultData); - if(craftingManager != null) - recipe.apply(runtimeItemMapping, craftingManager) - .rebuildPacket(); - else - recipes.add(recipe); + recipes.add(recipe); + recipe.rebuildPacket(); } public static void init() { runtimeItemMapping = RuntimeItems.getMapping(InnerCoreServer.PROTOCOL); - final CraftingManager craftingManager = Server.getInstance().getCraftingManager(); for (IApply recipe : recipes) - recipe.apply(runtimeItemMapping, craftingManager); + recipe.apply(runtimeItemMapping); recipes.clear(); - craftingManager.rebuildPacket(); - NativeWorkbench.craftingManager = craftingManager; + isFinalLoad = true; + RecipeRegistry.buildPackets(); } } diff --git a/src/main/java/com/zhekasmirnov/innercore/api/NativeFurnaceRegistry.java b/src/main/java/com/zhekasmirnov/innercore/api/NativeFurnaceRegistry.java index 94433167..02a1eae5 100644 --- a/src/main/java/com/zhekasmirnov/innercore/api/NativeFurnaceRegistry.java +++ b/src/main/java/com/zhekasmirnov/innercore/api/NativeFurnaceRegistry.java @@ -1,8 +1,6 @@ package com.zhekasmirnov.innercore.api; import cn.nukkit.Server; -import cn.nukkit.inventory.CraftingManager; -import cn.nukkit.inventory.FurnaceRecipe; import cn.nukkit.item.Item; import cn.nukkit.item.RuntimeItemMapping; import cn.nukkit.item.RuntimeItems; @@ -16,7 +14,10 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; +import cn.nukkit.recipe.RecipeRegistry; +import cn.nukkit.recipe.impl.FurnaceRecipe; import com.reider745.InnerCoreServer; +import com.reider745.api.ReflectHelper; import com.reider745.hooks.item.ItemUtils; import com.zhekasmirnov.horizon.runtime.logger.Logger; @@ -103,7 +104,6 @@ public class NativeFurnaceRegistry { public static void init() { RuntimeItemMapping mapping = RuntimeItems.getMapping(InnerCoreServer.PROTOCOL); - CraftingManager manager = Server.getInstance().getCraftingManager(); int outputId, outputData, inputId, inputData; for (Map recipe : recipes) { inputId = recipe.get("inputId"); @@ -129,22 +129,23 @@ public class NativeFurnaceRegistry { + " (recipe: id=" + inputId + ", meta=" + inputData + ")"); continue; } - manager.registerFurnaceRecipe(ProtocolInfo.CURRENT_PROTOCOL, new FurnaceRecipe(output, input)); + RecipeRegistry.registerFurnaceRecipe(new FurnaceRecipe(output, input), 0); } case 1 -> { AtomicReference key = new AtomicReference<>(); - manager.getFurnaceRecipes(ProtocolInfo.CURRENT_PROTOCOL).forEach((k, v) -> { + Map recipes = ReflectHelper.getField(RecipeRegistry.class, "FURNACE"); + recipes.forEach((k, v) -> { Item item = v.getInput(); if (item.getId() == input.getId() || (input.getDamage() == -1 || input.getDamage() == item.getDamage())) key.set(k); }); - manager.getFurnaceRecipes(ProtocolInfo.CURRENT_PROTOCOL).remove(key.get()); + recipes.remove(key.get()); } } } recipes.clear(); - manager.rebuildPacket(); + RecipeRegistry.buildPackets(); } }