diff --git a/iclibs/Nukkit-MOT-SNAPSHOT.jar b/iclibs/Nukkit-MOT-SNAPSHOT.jar index 6acb308b..c2732da4 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/InnerCoreServer.java b/src/main/java/com/reider745/InnerCoreServer.java index f86d08b6..861cf1f7 100644 --- a/src/main/java/com/reider745/InnerCoreServer.java +++ b/src/main/java/com/reider745/InnerCoreServer.java @@ -42,12 +42,8 @@ import java.io.*; import java.net.URI; import java.net.URISyntaxException; import java.nio.file.*; -import java.util.ArrayList; +import java.util.*; import java.util.concurrent.atomic.AtomicReference; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.util.function.Consumer; import java.util.stream.Stream; import java.util.zip.ZipEntry; @@ -503,7 +499,23 @@ public class InnerCoreServer { } public static int getVersionCode() { - return getPropertyInt("pack-version-code", 152); + List versions = getVersionsCode(); + if(versions.isEmpty()) + return 159; + return versions.get(0); + } + + public static List getVersionsCode() { + final String args = getPropertyString("pack-version-code", "159"); + final String[] versions_s = args.split(","); + final List versions = new ArrayList<>(); + + for (String version : versions_s) + try { + versions.add(Integer.parseInt(version)); + } catch (Exception ignore){} + + return versions; } private static void handleUnsupportedMethod(String message) { diff --git a/src/main/java/com/reider745/entity/EntityMethod.java b/src/main/java/com/reider745/entity/EntityMethod.java index 263a2947..952626a5 100644 --- a/src/main/java/com/reider745/entity/EntityMethod.java +++ b/src/main/java/com/reider745/entity/EntityMethod.java @@ -47,6 +47,7 @@ import java.util.function.Function; public class EntityMethod { public static long getIdForEntity(Entity entity){ + if(entity == null) return -1; return entity.getId(); } diff --git a/src/main/java/com/reider745/event/EventListener.java b/src/main/java/com/reider745/event/EventListener.java index 34c13b3d..4f3d4b2f 100644 --- a/src/main/java/com/reider745/event/EventListener.java +++ b/src/main/java/com/reider745/event/EventListener.java @@ -12,10 +12,7 @@ import cn.nukkit.event.Event; import cn.nukkit.event.EventHandler; import cn.nukkit.event.EventPriority; import cn.nukkit.event.Listener; -import cn.nukkit.event.block.BlockBreakEvent; -import cn.nukkit.event.block.BlockExplosionPrimeEvent; -import cn.nukkit.event.block.BlockGrowEvent; -import cn.nukkit.event.block.BlockPlaceEvent; +import cn.nukkit.event.block.*; import cn.nukkit.event.entity.*; import cn.nukkit.event.entity.EntityDamageEvent.DamageCause; import cn.nukkit.event.inventory.CraftItemEvent; @@ -42,6 +39,7 @@ import com.reider745.world.FakeDimensions; import oshi.hardware.NetworkIF; import java.util.ArrayList; +import java.util.List; import com.reider745.api.CallbackHelper; import com.reider745.api.CustomManager; @@ -320,16 +318,30 @@ public class EventListener implements Listener { convertDamageCauseToEnum(damageEvent != null ? damageEvent.getCause() : DamageCause.CUSTOM))); } + @EventHandler + public void onExplodeBlock(BlockExplodeEvent event){ + List blockList = event.getBlockList(); + for(Block block : blockList) + NativeCallback.onBlockSpawnResources((int) block.x, (int) block.y, (int) block.z, block.getId(), block.getDamage(), 0f, 0, block.level); + } + + @EventHandler + public void onExplodeEntity(EntityExplodeEvent event){ + List blockList = event.getBlockList(); + for(Block block : blockList) + NativeCallback.onBlockSpawnResources((int) block.x, (int) block.y, (int) block.z, block.getDamage(), 0, 0f, 0, block.level); + } + @EventHandler(priority = EventPriority.HIGHEST) - public void onBlockExplosion(BlockExplosionPrimeEvent event) { + public void onBlockExplosion(BlockExplosionPrimeEvent event) {// TODO: deprecated if (event.equals(dealingEvent) || Boolean.TRUE.equals(dealingEvent)) { return; } final Location pos = event.getBlock().getLocation(); - consumeEvent(event, () -> NativeCallback.onExplode((float) pos.x, (float) pos.y, (float) pos.z, - (float) event.getForce(), -1, event.isIncendiary(), event.isBlockBreaking(), Float.MAX_VALUE)); + + } @EventHandler(priority = EventPriority.HIGHEST) diff --git a/src/main/java/com/reider745/hooks/BlocksHooks.java b/src/main/java/com/reider745/hooks/BlocksHooks.java index c62b2afb..35743547 100644 --- a/src/main/java/com/reider745/hooks/BlocksHooks.java +++ b/src/main/java/com/reider745/hooks/BlocksHooks.java @@ -1,13 +1,20 @@ package com.reider745.hooks; import cn.nukkit.block.Block; +import cn.nukkit.entity.Entity; +import cn.nukkit.event.entity.EntityExplodeEvent; +import cn.nukkit.level.Explosion; +import cn.nukkit.level.Position; import com.reider745.api.ReflectHelper; import com.reider745.api.hooks.HookClass; import com.reider745.api.hooks.annotation.Hooks; import com.reider745.api.hooks.annotation.Inject; import com.reider745.block.BlockMethods; +import it.unimi.dsi.fastutil.longs.LongArraySet; import javassist.*; +import java.util.List; + @Hooks(className = "cn.nukkit.block.Block") public class BlocksHooks implements HookClass { private static final int MAX_ID = 16000; diff --git a/src/main/java/com/reider745/hooks/NetworkHooks.java b/src/main/java/com/reider745/hooks/NetworkHooks.java index b2498a2e..35d02a96 100644 --- a/src/main/java/com/reider745/hooks/NetworkHooks.java +++ b/src/main/java/com/reider745/hooks/NetworkHooks.java @@ -132,22 +132,4 @@ public class NetworkHooks implements HookClass { public static void registerPackets(Network network) { network.registerPacket(InnerCoreServer.PROTOCOL, InnerCorePacket.NETWORK_ID, InnerCorePacket.class); } - - @Inject(className = "cn.nukkit.network.RakNetInterface", type = TypeHook.AFTER_NOT_REPLACE) - public static void setName(RakNetInterface raknet, String name) { - Object advertisementObject = ReflectHelper.getField(raknet, "advertisement"); - if (advertisementObject == null) { - Logger.warning("No advertisement in RakNetInterface, version will not be affected."); - return; - } - String advertisement = new String((byte[]) advertisementObject, StandardCharsets.UTF_8); - String[] properties = advertisement.split(";"); - if (properties.length <= 3) { - Logger.warning("Invalid advertisement in RakNetInterface, version will not be affected."); - return; - } - properties[2] = Integer.toString(InnerCoreServer.PROTOCOL); - properties[3] = Utils.getVersionByProtocol(InnerCoreServer.PROTOCOL); - ReflectHelper.setField(raknet, "advertisement", String.join(";", properties).getBytes(StandardCharsets.UTF_8)); - } } diff --git a/src/main/java/com/reider745/world/BlockSourceMethods.java b/src/main/java/com/reider745/world/BlockSourceMethods.java index cd5ac0c5..c4401508 100644 --- a/src/main/java/com/reider745/world/BlockSourceMethods.java +++ b/src/main/java/com/reider745/world/BlockSourceMethods.java @@ -6,7 +6,6 @@ import cn.nukkit.block.Block; import cn.nukkit.blockentity.BlockEntity; import cn.nukkit.entity.Entity; import cn.nukkit.entity.item.EntityItem; -import cn.nukkit.event.block.BlockExplosionPrimeEvent; import cn.nukkit.item.Item; import cn.nukkit.level.Explosion; import cn.nukkit.level.Level; @@ -20,7 +19,6 @@ import cn.nukkit.network.protocol.PlaySoundPacket; import com.reider745.InnerCoreServer; import com.reider745.entity.EntityMethod; -import com.reider745.event.EventListener; import com.reider745.hooks.GlobalBlockPalette; import com.reider745.hooks.ItemUtils; import com.zhekasmirnov.innercore.api.NativeItemInstanceExtra; @@ -187,21 +185,10 @@ public class BlockSourceMethods { public static void explode(Level level, float x, float y, float z, float power, boolean fire) { final Block block = level.getBlock((int) x, (int) y, (int) z); - final BlockExplosionPrimeEvent event = new BlockExplosionPrimeEvent(block, power, fire ? .4 : 0d); - event.setIncendiary(fire); - - Server.getInstance().getPluginManager().callEvent(event); - - if (event.isCancelled()) { - return; - } - final Position position = new Position(x, y, z); position.setLevel(level); - final Explosion explosion = new Explosion(position, event.getForce(), block); - if (event.isBlockBreaking()) { - explosion.explodeA(); - } + final Explosion explosion = new Explosion(position, power, block); + explosion.explodeA(); explosion.explodeB(); } diff --git a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/mod/MultiplayerPackVersionChecker.java b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/mod/MultiplayerPackVersionChecker.java index f1ee27d1..8aaa4f88 100644 --- a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/mod/MultiplayerPackVersionChecker.java +++ b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/mod/MultiplayerPackVersionChecker.java @@ -1,13 +1,17 @@ package com.zhekasmirnov.apparatus.multiplayer.mod; +import com.reider745.InnerCoreServer; import com.zhekasmirnov.apparatus.adapter.innercore.PackInfo; import com.zhekasmirnov.apparatus.multiplayer.Network; import com.zhekasmirnov.apparatus.multiplayer.server.InitializationPacketException; import org.json.JSONException; import org.json.JSONObject; +import java.util.List; + public class MultiplayerPackVersionChecker { static { + List versions = InnerCoreServer.getVersionsCode(); Network.getSingleton().addClientInitializationPacket("system.inner_core_build", () -> { JSONObject packInfo = new JSONObject(); try { @@ -35,7 +39,8 @@ public class MultiplayerPackVersionChecker { " (code=" + PackInfo.getPackVersionCode() + ")\n"; throw new InitializationPacketException(message); }*/ - if (PackInfo.getPackVersionCode() != packVersionCode) { + + if (!versions.contains(packVersionCode)) { String message = "\n\n{{loc: multiplayer_innercore_version_mismatch}}\n" + "client (your) version: " + packName + " " + packVersionName +