Merge remote-tracking branch 'origin/1.14.4-forge' into 1.15.2-forge

Goldenfield192 · Goldenfield192 · commit b27808d28466 · 2026-02-07T09:36:49.000+08:00
diff --git a/src/main/java/cam72cam/mod/event/CommonEvents.java b/src/main/java/cam72cam/mod/event/CommonEvents.java
@@ -110,6 +110,7 @@ public static void onEntityTransfer(EntityEvent.EnteringChunk event) {
                 ModdedEntity modded = (ModdedEntity) event.getEntity();
                 cam72cam.mod.world.World.get(modded.world).tracker
                         .move(modded,
+                              //Don't calculate Y in 1.16- as no corresponding event posted
                               ChunkPos.asLong(event.getOldChunkX(), 0, event.getOldChunkZ()),
                               ChunkPos.asLong(event.getNewChunkX(), 0, event.getNewChunkZ()));
             }
diff --git a/src/main/java/cam72cam/mod/gui/screen/IScreen.java b/src/main/java/cam72cam/mod/gui/screen/IScreen.java
@@ -4,14 +4,19 @@
 import cam72cam.mod.input.Keyboard;
 import cam72cam.mod.render.opengl.RenderState;
 
+import javax.annotation.Nullable;
+
 public interface IScreen {
     /** Called when screen is initially constructed */
     void init(IScreenBuilder screen);
 
     @Deprecated
     default void onEnterKey(IScreenBuilder builder) { }
-    /** Called when any key is pressed outside textfield */
-    default void onKeyType(IScreenBuilder builder, Keyboard.KeyCode keyCode){
+    /**
+     * Called when any key is pressed outside textfield
+     * @param keyCode The typed key's code, or null if not recognizable
+     * */
+    default void onKeyType(IScreenBuilder builder, @Nullable Keyboard.KeyCode keyCode){
         if (keyCode == Keyboard.KeyCode.NUMPADENTER || keyCode == Keyboard.KeyCode.RETURN) {
             onEnterKey(builder);
         }
diff --git a/src/main/java/cam72cam/mod/input/Keyboard.java b/src/main/java/cam72cam/mod/input/Keyboard.java
@@ -9,7 +9,11 @@
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import org.lwjgl.glfw.GLFW;
 
+import javax.annotation.Nullable;
+
 public class Keyboard {
+    private static final Int2ObjectArrayMap<KeyCode> keycodes = new Int2ObjectArrayMap<>();
+
     public enum KeyCode {
         ESCAPE(GLFW.GLFW_KEY_ESCAPE),
         NUM1(GLFW.GLFW_KEY_1),
@@ -127,15 +131,13 @@ public enum KeyCode {
             keycodes.put(code, this);
         }
 
-        public static KeyCode of(int code) {
+        public static @Nullable KeyCode of(int code) {
             return keycodes.get(code);
         }
     }
 
-    private static final Int2ObjectArrayMap<KeyCode> keycodes = new Int2ObjectArrayMap<>();
-
-    @OnlyIn(Dist.CLIENT)
     /** Registers a keybind */
+    @OnlyIn(Dist.CLIENT)
     public static void registerKey(String name, KeyCode keyCode, String category, Runnable handler) {
         if (Minecraft.getInstance() == null) {
             System.out.println("Shake hands with danger!");
diff --git a/src/main/java/cam72cam/mod/mixin/feat/large_entity_collision/MixinVanillaWorld.java b/src/main/java/cam72cam/mod/mixin/feat/large_entity_collision/MixinVanillaWorld.java
@@ -32,8 +32,9 @@ public void injectEntitySearch0(Entity entityIn, AxisAlignedBB aabb, java.util.f
                                     CallbackInfoReturnable<List<Entity>> cir) {
         List<Entity> result = cir.getReturnValue();
         cam72cam.mod.world.World world = cam72cam.mod.world.World.get((World) (Object) this);
+        //We don't handle Y coordinate in 1.16-
         Set<Long> collection = world.tracker.queryPotentialPackedChunkPos(
-                ChunkPos.asLong(new Vec3d((aabb.minX + aabb.maxX) / 2, (aabb.minY + aabb.maxY) / 2, (aabb.minZ + aabb.maxZ) / 2)));
+                ChunkPos.asLongExcludeY(new Vec3d((aabb.minX + aabb.maxX) / 2, (aabb.minY + aabb.maxY) / 2, (aabb.minZ + aabb.maxZ) / 2)));
         if (!collection.isEmpty()) {
             for (long packed : collection) {
                 int x = ChunkPos.x(packed);
@@ -63,8 +64,9 @@ public void injectEntitySearch1(Class<? extends Entity> clazz, AxisAlignedBB aab
 
         List<Entity> result = cir.getReturnValue();
         cam72cam.mod.world.World world = cam72cam.mod.world.World.get((World) (Object) this);
+        //We don't handle Y coordinate in 1.16-
         Set<Long> collection = world.tracker.queryPotentialPackedChunkPos(
-                ChunkPos.asLong(new Vec3d((aabb.minX + aabb.maxX) / 2, (aabb.minY + aabb.maxY) / 2, (aabb.minZ + aabb.maxZ) / 2)));
+                ChunkPos.asLongExcludeY(new Vec3d((aabb.minX + aabb.maxX) / 2, (aabb.minY + aabb.maxY) / 2, (aabb.minZ + aabb.maxZ) / 2)));
         if (!collection.isEmpty()) {
             for (long packed : collection) {
                 int x = ChunkPos.x(packed);
diff --git a/src/main/java/cam72cam/mod/world/ChunkPos.java b/src/main/java/cam72cam/mod/world/ChunkPos.java
@@ -39,10 +39,19 @@ public static long asLong(int x, int y, int z) {
         return i;
     }
 
+    //For 1.16- It turned out processing Y will take much more unnecessary effort...
+    public static long asLongExcludeY(BlockPos pos) {
+        return asLong(new BlockPos(pos.getX(), 0, pos.getZ()));
+    }
+
     public static long asLong(BlockPos pos) {
         return asLong(MathHelper.floor(pos.getX()/16d), MathHelper.floor(pos.getY()/16d), MathHelper.floor(pos.getZ()/16d));
     }
 
+    public static long asLongExcludeY(Vec3d pos) {
+        return asLong(new Vec3d(pos.x, 0, pos.z));
+    }
+
     public static long asLong(Vec3d pos) {
         return asLong(MathHelper.floor(pos.x/16d), MathHelper.floor(pos.y/16d), MathHelper.floor(pos.z/16d));
     }
diff --git a/src/main/java/cam72cam/mod/world/WorldEntityTracker.java b/src/main/java/cam72cam/mod/world/WorldEntityTracker.java
@@ -5,7 +5,6 @@
 import it.unimi.dsi.fastutil.longs.LongArraySet;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
 import it.unimi.dsi.fastutil.objects.ObjectArraySet;
-import net.minecraft.util.math.BlockPos;
 
 import java.util.Collection;
 import java.util.Map;
@@ -33,7 +32,7 @@ public class WorldEntityTracker {
     public WorldEntityTracker() {}
 
     public void join(ModdedEntity entity) {
-        long chunk = ChunkPos.asLong(entity.getPosition());
+        long chunk = ChunkPos.asLongExcludeY(entity.getPosition());
         int x = ChunkPos.x(chunk);
         int y = ChunkPos.y(chunk);
         int z = ChunkPos.z(chunk);
@@ -47,9 +46,11 @@ public void join(ModdedEntity entity) {
 
                 for (int i = x - HORIZONTAL_SEARCH_RADIUS_CHUNKS; i <= x + HORIZONTAL_SEARCH_RADIUS_CHUNKS; i++) {
                     for (int j = z - HORIZONTAL_SEARCH_RADIUS_CHUNKS; j <= z + HORIZONTAL_SEARCH_RADIUS_CHUNKS; j++) {
-                        for (int k = y - VERTICAL_SEARCH_RADIUS_CHUNKS; k <= y + VERTICAL_SEARCH_RADIUS_CHUNKS; k++) {
+//                        for (int k = y - VERTICAL_SEARCH_RADIUS_CHUNKS; k <= y + VERTICAL_SEARCH_RADIUS_CHUNKS; k++) {
+                        //Handle Y below 1.17 is likely to cause more bug
+                        int k = 0;
                             scanningRange.put(chunk, ChunkPos.asLong(i, k, j));
-                        }
+//                        }
                     }
                 }
             }
@@ -60,20 +61,19 @@ public void join(ModdedEntity entity) {
     }
 
     public void leave(ModdedEntity entity) {
-        BlockPos pos = entity.getPosition();
-        long sec = ChunkPos.asLong(pos);
+        long chunk = ChunkPos.asLongExcludeY(entity.getPosition());
 
         lock.writeLock().lock();
         try {
-            if (!umcEntities.containsKey(sec)) {
+            if (!umcEntities.containsKey(chunk)) {
                 return;
             }
-            Collection<ModdedEntity> moddedEntities = umcEntities.get(sec);
+            Collection<ModdedEntity> moddedEntities = umcEntities.get(chunk);
             moddedEntities.remove(entity);
 
             if (moddedEntities.isEmpty()) {
-                umcEntities.remove(sec);
-                scanningRange.removeKey(sec);
+                umcEntities.remove(chunk);
+                scanningRange.removeKey(chunk);
             }
         } finally {
             lock.writeLock().unlock();
@@ -83,6 +83,12 @@ public void leave(ModdedEntity entity) {
     public void move(ModdedEntity entity, long oldSection, long newSection) {
         lock.writeLock().lock();
         try {
+            if (!umcEntities.containsKey(oldSection)) {
+                //Newly added, no need to process here
+                //Let join handle it
+                return;
+            }
+
             // remove from old section
             Set<ModdedEntity> moddedEntities = umcEntities.get(oldSection);
             if (moddedEntities != null) {
@@ -93,7 +99,7 @@ public void move(ModdedEntity entity, long oldSection, long newSection) {
                 }
             }
 
-            long chunk = ChunkPos.asLong(entity.getPosition());
+            long chunk = ChunkPos.asLongExcludeY(entity.getPosition());
             int x = ChunkPos.x(chunk);
             int y = ChunkPos.y(chunk);
             int z = ChunkPos.z(chunk);
@@ -105,9 +111,10 @@ public void move(ModdedEntity entity, long oldSection, long newSection) {
 
                 for (int i = x - HORIZONTAL_SEARCH_RADIUS_CHUNKS; i <= x + HORIZONTAL_SEARCH_RADIUS_CHUNKS; i++) {
                     for (int j = z - HORIZONTAL_SEARCH_RADIUS_CHUNKS; j <= z + HORIZONTAL_SEARCH_RADIUS_CHUNKS; j++) {
-                        for (int k = y - VERTICAL_SEARCH_RADIUS_CHUNKS; k <= y + VERTICAL_SEARCH_RADIUS_CHUNKS; k++) {
+//                        for (int k = y - VERTICAL_SEARCH_RADIUS_CHUNKS; k <= y + VERTICAL_SEARCH_RADIUS_CHUNKS; k++) {
+                            int k = 0;
                             scanningRange.put(newSection, ChunkPos.asLong(i, k, j));
-                        }
+//                        }
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ public static void onEntityTransfer(EntityEvent.EnteringChunk event) {`
`110`	`110`	`ModdedEntity modded = (ModdedEntity) event.getEntity();`
`111`	`111`	`cam72cam.mod.world.World.get(modded.world).tracker`
`112`	`112`	`.move(modded,`
	`113`	`+ //Don't calculate Y in 1.16- as no corresponding event posted`
`113`	`114`	`ChunkPos.asLong(event.getOldChunkX(), 0, event.getOldChunkZ()),`
`114`	`115`	`ChunkPos.asLong(event.getNewChunkX(), 0, event.getNewChunkZ()));`
`115`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,19 @@ public static long asLong(int x, int y, int z) {`
`39`	`39`	`return i;`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ //For 1.16- It turned out processing Y will take much more unnecessary effort...`
	`43`	`+ public static long asLongExcludeY(BlockPos pos) {`
	`44`	`+ return asLong(new BlockPos(pos.getX(), 0, pos.getZ()));`
	`45`	`+ }`
	`46`	`+`
`42`	`47`	`public static long asLong(BlockPos pos) {`
`43`	`48`	`return asLong(MathHelper.floor(pos.getX()/16d), MathHelper.floor(pos.getY()/16d), MathHelper.floor(pos.getZ()/16d));`
`44`	`49`	`}`
`45`	`50`
	`51`	`+ public static long asLongExcludeY(Vec3d pos) {`
	`52`	`+ return asLong(new Vec3d(pos.x, 0, pos.z));`
	`53`	`+ }`
	`54`	`+`
`46`	`55`	`public static long asLong(Vec3d pos) {`
`47`	`56`	`return asLong(MathHelper.floor(pos.x/16d), MathHelper.floor(pos.y/16d), MathHelper.floor(pos.z/16d));`
`48`	`57`	`}`