From e67c87fb0bc286da550ab47776fa582c4201ebcd Mon Sep 17 00:00:00 2001
From: Alexander01998 <contact.wurstimperium@gmail.com>
Date: Wed, 29 Jul 2020 19:09:48 +0200
Subject: [PATCH] Update to 1.16.2-pre1

---
 gradle.properties                              |  8 ++++----
 src/main/java/net/wurstclient/WurstClient.java |  2 +-
 .../java/net/wurstclient/ai/PathFinder.java    | 18 +++++++++---------
 .../net/wurstclient/ai/WalkPathProcessor.java  |  2 +-
 .../net/wurstclient/hacks/BaseFinderHack.java  |  2 +-
 .../net/wurstclient/hacks/CaveFinderHack.java  |  4 ++--
 .../net/wurstclient/hacks/ExcavatorHack.java   |  6 +++---
 .../wurstclient/hacks/InstantBunkerHack.java   |  2 +-
 .../net/wurstclient/hacks/MobSpawnEspHack.java |  2 +-
 .../java/net/wurstclient/hacks/SearchHack.java |  4 ++--
 .../net/wurstclient/hacks/TunnellerHack.java   |  4 ++--
 .../mixin/PlayerSkinProviderMixin.java         |  2 +-
 .../wurstclient/util/AutoBuildTemplate.java    |  2 +-
 src/main/resources/fabric.mod.json             |  2 +-
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 9803a49c..54920742 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html and
 # https://www.curseforge.com/minecraft/mc-mods/fabric-api
-minecraft_version=20w30a
-yarn_mappings=20w30a+build.1
+minecraft_version=1.16.2-pre1
+yarn_mappings=1.16.2-pre1+build.1
 loader_version=0.9.0+build.204
 
 #Fabric api
-fabric_version=0.15.2+build.382-1.16
+fabric_version=0.16.1+build.387-1.16
 
 # Mod Properties
-mod_version = v7.4-MC20w30a
+mod_version = v7.4-MC1.16.2-pre1
 maven_group = net.wurstclient
 archives_base_name = Wurst-Client
 
diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java
index f1c69849..1a668376 100644
--- a/src/main/java/net/wurstclient/WurstClient.java
+++ b/src/main/java/net/wurstclient/WurstClient.java
@@ -57,7 +57,7 @@ public enum WurstClient
 	public static final IMinecraftClient IMC = (IMinecraftClient)MC;
 	
 	public static final String VERSION = "7.4";
-	public static final String MC_VERSION = "20w30a";
+	public static final String MC_VERSION = "1.16.2-pre1";
 	
 	private WurstAnalytics analytics;
 	private EventManager eventManager;
diff --git a/src/main/java/net/wurstclient/ai/PathFinder.java b/src/main/java/net/wurstclient/ai/PathFinder.java
index c6ba3b20..3e630a97 100644
--- a/src/main/java/net/wurstclient/ai/PathFinder.java
+++ b/src/main/java/net/wurstclient/ai/PathFinder.java
@@ -139,7 +139,7 @@ public class PathFinder
 		BlockPos southWest = south.west();
 		BlockPos northWest = north.west();
 		
-		BlockPos up = pos.method_30931();
+		BlockPos up = pos.up();
 		BlockPos down = pos.down();
 		
 		// flying
@@ -187,12 +187,12 @@ public class PathFinder
 		}
 		
 		// up
-		if(pos.getY() < 256 && canGoThrough(up.method_30931())
+		if(pos.getY() < 256 && canGoThrough(up.up())
 			&& (flying || onGround || canClimbUpAt(pos))
 			&& (flying || canClimbUpAt(pos) || goal.equals(up)
 				|| canSafelyStandOn(north) || canSafelyStandOn(east)
 				|| canSafelyStandOn(south) || canSafelyStandOn(west))
-			&& (divingAllowed || BlockUtils.getState(up.method_30931())
+			&& (divingAllowed || BlockUtils.getState(up.up())
 				.getMaterial() != Material.WATER))
 			neighbors.add(new PathPos(up, onGround));
 		
@@ -230,9 +230,9 @@ public class PathFinder
 	
 	protected boolean isPassable(BlockPos pos)
 	{
-		return canGoThrough(pos) && canGoThrough(pos.method_30931())
+		return canGoThrough(pos) && canGoThrough(pos.up())
 			&& canGoAbove(pos.down()) && (divingAllowed || BlockUtils
-				.getState(pos.method_30931()).getMaterial() != Material.WATER);
+				.getState(pos.up()).getMaterial() != Material.WATER);
 	}
 	
 	protected boolean canBeSolid(BlockPos pos)
@@ -326,7 +326,7 @@ public class PathFinder
 				
 			// check if point is not part of this fall, meaning that the fall is
 			// too short to cause any damage
-			if(!pos.method_30930(i).equals(prevPos))
+			if(!pos.up(i).equals(prevPos))
 				return true;
 			
 			// check if block resets fall damage
@@ -359,7 +359,7 @@ public class PathFinder
 			return false;
 		
 		// check if any adjacent block is solid
-		BlockPos up = pos.method_30931();
+		BlockPos up = pos.up();
 		if(!canBeSolid(pos.north()) && !canBeSolid(pos.east())
 			&& !canBeSolid(pos.south()) && !canBeSolid(pos.west())
 			&& !canBeSolid(up.north()) && !canBeSolid(up.east())
@@ -380,8 +380,8 @@ public class PathFinder
 			return true;
 		
 		// check head
-		Block blockHead = BlockUtils.getBlock(pos.method_30931());
-		if(BlockUtils.getState(pos.method_30931()).getMaterial().isLiquid()
+		Block blockHead = BlockUtils.getBlock(pos.up());
+		if(BlockUtils.getState(pos.up()).getMaterial().isLiquid()
 			|| blockHead instanceof CobwebBlock)
 			return true;
 		
diff --git a/src/main/java/net/wurstclient/ai/WalkPathProcessor.java b/src/main/java/net/wurstclient/ai/WalkPathProcessor.java
index 0438ffc7..a0aa3f01 100644
--- a/src/main/java/net/wurstclient/ai/WalkPathProcessor.java
+++ b/src/main/java/net/wurstclient/ai/WalkPathProcessor.java
@@ -117,7 +117,7 @@ public class WalkPathProcessor extends PathProcessor
 				{
 					// directional jump
 					if(index < path.size() - 1
-						&& !nextPos.method_30931().equals(path.get(index + 1)))
+						&& !nextPos.up().equals(path.get(index + 1)))
 						index++;
 					
 					// jump up
diff --git a/src/main/java/net/wurstclient/hacks/BaseFinderHack.java b/src/main/java/net/wurstclient/hacks/BaseFinderHack.java
index 55250620..a9e788c0 100644
--- a/src/main/java/net/wurstclient/hacks/BaseFinderHack.java
+++ b/src/main/java/net/wurstclient/hacks/BaseFinderHack.java
@@ -218,7 +218,7 @@ public final class BaseFinderHack extends Hack
 				addVertex(pos, 0, 0, 1);
 			}
 			
-			if(!matchingBlocks.contains(pos.method_30931()))
+			if(!matchingBlocks.contains(pos.up()))
 			{
 				addVertex(pos, 0, 1, 0);
 				addVertex(pos, 0, 1, 1);
diff --git a/src/main/java/net/wurstclient/hacks/CaveFinderHack.java b/src/main/java/net/wurstclient/hacks/CaveFinderHack.java
index 26b1b945..a211b7d7 100644
--- a/src/main/java/net/wurstclient/hacks/CaveFinderHack.java
+++ b/src/main/java/net/wurstclient/hacks/CaveFinderHack.java
@@ -142,7 +142,7 @@ public final class CaveFinderHack extends Hack
 				(ChunkDeltaUpdateS2CPacket)packet;
 			
 			ArrayList<BlockPos> changedBlocks = new ArrayList<>();
-			change.method_30621((pos, state) -> changedBlocks.add(pos));
+			change.visitUpdates((pos, state) -> changedBlocks.add(pos));
 			if(changedBlocks.isEmpty())
 				return;
 			
@@ -427,7 +427,7 @@ public final class CaveFinderHack extends Hack
 			vertices.add(getVertex(pos, 0, 0, 1));
 		}
 		
-		if(!matchingBlocks.contains(pos.method_30931()))
+		if(!matchingBlocks.contains(pos.up()))
 		{
 			vertices.add(getVertex(pos, 0, 1, 0));
 			vertices.add(getVertex(pos, 0, 1, 1));
diff --git a/src/main/java/net/wurstclient/hacks/ExcavatorHack.java b/src/main/java/net/wurstclient/hacks/ExcavatorHack.java
index c6f3cabb..08bd5e99 100644
--- a/src/main/java/net/wurstclient/hacks/ExcavatorHack.java
+++ b/src/main/java/net/wurstclient/hacks/ExcavatorHack.java
@@ -671,9 +671,9 @@ public final class ExcavatorHack extends Hack
 			BlockPos goal = getGoal();
 			
 			return done = goal.down(2).equals(current)
-				|| goal.method_30931().equals(current)
-				|| goal.north().equals(current) || goal.south().equals(current)
-				|| goal.west().equals(current) || goal.east().equals(current)
+				|| goal.up().equals(current) || goal.north().equals(current)
+				|| goal.south().equals(current) || goal.west().equals(current)
+				|| goal.east().equals(current)
 				|| goal.down().north().equals(current)
 				|| goal.down().south().equals(current)
 				|| goal.down().west().equals(current)
diff --git a/src/main/java/net/wurstclient/hacks/InstantBunkerHack.java b/src/main/java/net/wurstclient/hacks/InstantBunkerHack.java
index c560a02b..337827bb 100644
--- a/src/main/java/net/wurstclient/hacks/InstantBunkerHack.java
+++ b/src/main/java/net/wurstclient/hacks/InstantBunkerHack.java
@@ -88,7 +88,7 @@ public final class InstantBunkerHack extends Hack
 		// set positions
 		positions.clear();
 		for(int[] pos : template)
-			positions.add(startPos.method_30930(pos[1]).offset(facing, pos[2])
+			positions.add(startPos.up(pos[1]).offset(facing, pos[2])
 				.offset(facing2, pos[0]));
 		
 		if(!"".isEmpty())// mode.getSelected() == 1)
diff --git a/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java b/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java
index 23d142c5..ff701f0e 100644
--- a/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java
+++ b/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java
@@ -192,7 +192,7 @@ public final class MobSpawnEspHack extends Hack
 				(ChunkDeltaUpdateS2CPacket)packet;
 			
 			ArrayList<BlockPos> changedBlocks = new ArrayList<>();
-			change.method_30621((pos, state) -> changedBlocks.add(pos));
+			change.visitUpdates((pos, state) -> changedBlocks.add(pos));
 			if(changedBlocks.isEmpty())
 				return;
 			
diff --git a/src/main/java/net/wurstclient/hacks/SearchHack.java b/src/main/java/net/wurstclient/hacks/SearchHack.java
index 83b07c76..4a31b1af 100644
--- a/src/main/java/net/wurstclient/hacks/SearchHack.java
+++ b/src/main/java/net/wurstclient/hacks/SearchHack.java
@@ -152,7 +152,7 @@ public final class SearchHack extends Hack
 				(ChunkDeltaUpdateS2CPacket)packet;
 			
 			ArrayList<BlockPos> changedBlocks = new ArrayList<>();
-			change.method_30621((pos, state) -> changedBlocks.add(pos));
+			change.visitUpdates((pos, state) -> changedBlocks.add(pos));
 			if(changedBlocks.isEmpty())
 				return;
 			
@@ -449,7 +449,7 @@ public final class SearchHack extends Hack
 			vertices.add(getVertex(pos, 0, 0, 1));
 		}
 		
-		if(!matchingBlocks.contains(pos.method_30931()))
+		if(!matchingBlocks.contains(pos.up()))
 		{
 			vertices.add(getVertex(pos, 0, 1, 0));
 			vertices.add(getVertex(pos, 0, 1, 1));
diff --git a/src/main/java/net/wurstclient/hacks/TunnellerHack.java b/src/main/java/net/wurstclient/hacks/TunnellerHack.java
index 8a593495..0a6faa25 100644
--- a/src/main/java/net/wurstclient/hacks/TunnellerHack.java
+++ b/src/main/java/net/wurstclient/hacks/TunnellerHack.java
@@ -253,7 +253,7 @@ public final class TunnellerHack extends Hack
 	private BlockPos offset(BlockPos pos, Vec3i vec)
 	{
 		return pos.offset(direction.rotateYCounterclockwise(), vec.getX())
-			.method_30930(vec.getY());
+			.up(vec.getY());
 	}
 	
 	private int getDistance(BlockPos pos1, BlockPos pos2)
@@ -519,7 +519,7 @@ public final class TunnellerHack extends Hack
 				// check ceiling blocks
 				if(pos.getY() == maxY)
 				{
-					BlockPos pos4 = pos.method_30931();
+					BlockPos pos4 = pos.up();
 					
 					if(!BlockUtils.getState(pos4).getFluidState().isEmpty())
 						liquids.add(pos4);
diff --git a/src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java b/src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java
index 16b5cf9e..6cd3a135 100644
--- a/src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java
+++ b/src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java
@@ -104,7 +104,7 @@ public class PlayerSkinProviderMixin
 				});
 			});
 		};
-		Util.getServerWorkerExecutor().execute(runnable);
+		Util.getMainWorkerExecutor().execute(runnable);
 		
 		ci.cancel();
 	}
diff --git a/src/main/java/net/wurstclient/util/AutoBuildTemplate.java b/src/main/java/net/wurstclient/util/AutoBuildTemplate.java
index 5d1981f9..405b2137 100644
--- a/src/main/java/net/wurstclient/util/AutoBuildTemplate.java
+++ b/src/main/java/net/wurstclient/util/AutoBuildTemplate.java
@@ -64,7 +64,7 @@ public final class AutoBuildTemplate
 		{
 			BlockPos pos = startPos;
 			pos = pos.offset(left, block[0]);
-			pos = pos.method_30930(block[1]);
+			pos = pos.up(block[1]);
 			pos = pos.offset(front, block[2]);
 			positions.add(pos);
 		}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 4f55ac70..265ed7b9 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -29,7 +29,7 @@
   "depends": {
     "fabricloader": ">=0.8.8",
     "fabric": ">=0.12.1",
-    "minecraft": ">=1.16.2-alpha.20.30.a"
+    "minecraft": ">=1.16.2-beta.1"
   },
   "suggests": {
     "flamingo": "*"