mirror/Wurst7
0
0
Fork 0
mirror of https://github.com/Wurst-Imperium/Wurst7.git synced 2024-09-20 01:12:13 +02:00
Code

Update to 1.16.2-pre1

Browse Source
This commit is contained in:
Alexander01998 2020-07-29 19:09:48 +02:00
parent 0ebb36e34f
commit e67c87fb0b
14 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gradle.properties
View File

@ -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

2
src/main/java/net/wurstclient/WurstClient.java
View File

@ -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;

18
src/main/java/net/wurstclient/ai/PathFinder.java
View File

@ -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;

2
src/main/java/net/wurstclient/ai/WalkPathProcessor.java
View File

@ -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

2
src/main/java/net/wurstclient/hacks/BaseFinderHack.java
View File

@ -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);

4
src/main/java/net/wurstclient/hacks/CaveFinderHack.java
View File

@ -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));

6
src/main/java/net/wurstclient/hacks/ExcavatorHack.java
View File

@ -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)

2
src/main/java/net/wurstclient/hacks/InstantBunkerHack.java
View File

@ -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)

2
src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java
View File

@ -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;

4
src/main/java/net/wurstclient/hacks/SearchHack.java
View File

@ -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));

4
src/main/java/net/wurstclient/hacks/TunnellerHack.java
View File

@ -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);

2
src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java
View File

@ -104,7 +104,7 @@ public class PlayerSkinProviderMixin
});
});
};
Util.getServerWorkerExecutor().execute(runnable);
Util.getMainWorkerExecutor().execute(runnable);
ci.cancel();
}

2
src/main/java/net/wurstclient/util/AutoBuildTemplate.java
View File

@ -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);
}

2
src/main/resources/fabric.mod.json
View File

@ -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": "*"