feat Добавлена поддержка фейковых измерений & расширена капельку загл…

…ушка android api
Reider745 · Mar 25, 2024 · e440516 · e440516
1 parent 9a1ecd8
commit e440516
Show file tree

Hide file tree

Showing 9 changed files with 384 additions and 11 deletions.
diff --git a/src/main/java/com/reider745/InnerCoreServer.java b/src/main/java/com/reider745/InnerCoreServer.java
@@ -19,6 +19,7 @@
 
 import com.reider745.item.ItemMethod;
 import com.reider745.item.NukkitIdConvertor;
+import com.reider745.world.FakeDimensions;
 import com.reider745.world.dimensions.DimensionsMethods;
 import com.zhekasmirnov.apparatus.mcpe.NativeWorkbench;
 import com.zhekasmirnov.apparatus.multiplayer.Network;
@@ -300,6 +301,7 @@ public void afterload() {
             pluginManager.registerEvents(new SnowfallEverywhere(), plugin);
         }
 
+        FakeDimensions.init();
         DimensionsFix.init();
         GlobalBlockPalette.init();
         RuntimeItemsHooks.register();

diff --git a/src/main/java/com/reider745/entity/EntityMethod.java b/src/main/java/com/reider745/entity/EntityMethod.java
@@ -30,6 +30,7 @@
 import com.reider745.event.EventListener;
 import com.reider745.hooks.ItemUtils;
 import com.reider745.world.BlockSourceMethods;
+import com.reider745.world.FakeDimensions;
 import com.zhekasmirnov.apparatus.minecraft.enums.GameEnums;
 import com.zhekasmirnov.horizon.runtime.logger.Logger;
 import com.zhekasmirnov.innercore.api.NativeItemInstanceExtra;
@@ -113,7 +114,7 @@ private static void validateThen(long entityUid, Consumer<Entity> then) {
     }
 
     public static int getEntityDimension(long entityUid) {
-        return validateThen(entityUid, entity -> entity.getLevel().getDimension(), -1);
+        return validateThen(entityUid, entity -> FakeDimensions.getFakeIdForLevel(entity.getLevel()), -1);
     }
 
     public static void getPosition(long entityUid, float[] position) {

diff --git a/src/main/java/com/reider745/entity/PlayerActorMethods.java b/src/main/java/com/reider745/entity/PlayerActorMethods.java
@@ -17,6 +17,7 @@
 import com.reider745.InnerCoreServer;
 import com.reider745.event.EventListener;
 import com.reider745.hooks.ItemUtils;
+import com.reider745.world.FakeDimensions;
 import com.zhekasmirnov.innercore.api.NativeItemInstanceExtra;
 
 import org.jetbrains.annotations.Nullable;
@@ -134,7 +135,7 @@ public static int getDimension(Player player) {
         }
         Level level = player.getLevel();
         if (level != null) {
-            return player.getLevel().getDimension();
+            return FakeDimensions.getFakeIdForLevel(player.getLevel());
         }
         return 0;
     }

diff --git a/src/main/java/com/reider745/event/EventListener.java b/src/main/java/com/reider745/event/EventListener.java
@@ -45,6 +45,7 @@
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.math.Vector3;
 import com.reider745.world.BiomesMethods;
+import com.reider745.world.FakeDimensions;
 import oshi.hardware.NetworkIF;
 
 import java.util.ArrayList;
@@ -153,10 +154,11 @@ public void onChunkPopulate(ChunkPopulateEvent event) {
         final CallbackHelper.ICallbackApply applyPre = () -> NativeCallback.onPreChunkPostProcessed(X, Z);
         final CallbackHelper.ICallbackApply applyPost = () -> NativeCallback.onChunkPostProcessed(X, Z);
 
-        BiomesMethods.onChunkPopulate(fullChunk, X, Z, level.getDimensionData().getDimensionId());
+        final int id = FakeDimensions.getFakeIdForLevel(level);
+        BiomesMethods.onChunkPopulate(fullChunk, X, Z, id);
 
         try {
-            switch (level.getDimension()) {
+            switch (id) {
                 case Level.DIMENSION_OVERWORLD -> {
                     CallbackHelper.applyRegion(CallbackHelper.Type.PRE_GENERATION_CHUNK, level, applyPre);
                     CallbackHelper.applyRegion(CallbackHelper.Type.GENERATION_CHUNK_OVERWORLD, level, applyPost);
@@ -373,8 +375,8 @@ public void onBlockUpdate(BlockGrowEvent event) {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onEntityTeleport(EntityTeleportEvent event) {
-        final int from = event.getFrom().level.getDimension();
-        final int to = event.getFrom().level.getDimension();
+        final int from = FakeDimensions.getFakeIdForLevel(event.getFrom().level);
+        final int to = FakeDimensions.getFakeIdForLevel(event.getFrom().level);
 
         if (CustomDimension.getDimensionById(to) != null || CustomDimension.getDimensionById(from) != null)
             NativeCallback.onCustomDimensionTransfer(event.getEntity().getId(), from, to);