change: Update to Minecraft 1.16.3

DrexHD · Sep 10, 2020 · 9463c53 · 9463c53
1 parent bb261b0
commit 9463c53
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.16.2
-yarn_mappings=1.16.2+build.14
-loader_version=0.9.1+build.205
+minecraft_version=1.16.3
+yarn_mappings=1.16.3+build.1
+loader_version=0.9.3+build.207
 
 # Mod Properties
 mod_version=0.5.4

diff --git a/...ain/java/me/jellysquid/mods/lithium/common/world/interests/PointOfInterestTypeHelper.java b/...ain/java/me/jellysquid/mods/lithium/common/world/interests/PointOfInterestTypeHelper.java
@@ -17,7 +17,7 @@ public static void init(Set<BlockState> types) {
     }
 
     public static boolean shouldScan(ChunkSection section) {
-        return section.method_19523(TYPES::contains);
+        return section.hasAny(TYPES::contains);
     }
 
 }
diff --git a/src/main/java/me/jellysquid/mods/lithium/mixin/entity/collisions/CollisionViewMixin.java b/src/main/java/me/jellysquid/mods/lithium/mixin/entity/collisions/CollisionViewMixin.java
@@ -32,7 +32,7 @@ default Stream<VoxelShape> getBlockCollisions(final Entity entity, Box box) {
      * @author JellySquid
      */
     @Overwrite
-    default boolean doesNotCollide(Entity entity, Box box, Predicate<Entity> predicate) {
+    default boolean isSpaceEmpty(Entity entity, Box box, Predicate<Entity> predicate) {
         boolean ret = !LithiumEntityCollisions.doesBoxCollideWithBlocks((CollisionView) this, entity, box, BlockCollisionPredicate.ANY);
 
         // If no blocks were collided with, try to check for entity collisions if we can read entities

diff --git a/...main/java/me/jellysquid/mods/lithium/mixin/entity/fast_suffocation_check/MixinEntity.java b/...main/java/me/jellysquid/mods/lithium/mixin/entity/fast_suffocation_check/MixinEntity.java
@@ -21,7 +21,7 @@ public abstract class MixinEntity {
      * @author JellySquid
      * @reason Use optimized block volume iteration, avoid streams
      */
-    @Redirect(method = "isInsideWall", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;method_30030(Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/Box;Ljava/util/function/BiPredicate;)Ljava/util/stream/Stream;"))
+    @Redirect(method = "isInsideWall", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getBlockCollisions(Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/Box;Ljava/util/function/BiPredicate;)Ljava/util/stream/Stream;"))
     public Stream<VoxelShape> isInsideWall(World world, Entity entity, Box box, BiPredicate<BlockState, BlockPos> biPredicate) {
         final ChunkAwareBlockCollisionSweeper sweeper = new ChunkAwareBlockCollisionSweeper(world, (Entity) (Object) this, box,
                 BlockCollisionPredicate.SUFFOCATES);

diff --git a/...ain/java/me/jellysquid/mods/lithium/mixin/world/chunk_access/ServerChunkManagerMixin.java b/...ain/java/me/jellysquid/mods/lithium/mixin/world/chunk_access/ServerChunkManagerMixin.java
@@ -215,7 +215,7 @@ private Chunk getChunkBlocking(int x, int z, ChunkStatus status, boolean create)
     private void createChunkLoadTicket(int x, int z, int level) {
         ChunkPos chunkPos = new ChunkPos(x, z);
 
-        this.ticketManager.addTicketWithLevel(ChunkTicketType.field_14032, chunkPos, level, chunkPos);
+        this.ticketManager.addTicketWithLevel(ChunkTicketType.UNKNOWN, chunkPos, level, chunkPos);
     }
 
     /**

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -25,7 +25,7 @@
     "accessWidener": "lithium.accesswidener",
     "depends": {
         "fabricloader": ">=0.9.0",
-        "minecraft": "1.16.2"
+        "minecraft": "1.16.3"
     },
     "breaks": {
         "optifabric": "*"