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 21w14a

Browse Source
This commit is contained in:
Alexander01998 2021-04-07 21:00:20 +02:00
parent 061ad56160
commit b32e775916
15 changed files with 64 additions and 67 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=21w13a
yarn_mappings=21w13a+build.9
minecraft_version=21w14a
yarn_mappings=21w14a+build.2
loader_version=0.11.3
#Fabric api
fabric_version=0.32.6+1.17
fabric_version=0.32.7+1.17
# Mod Properties
mod_version = v7.14-MC21w13a
mod_version = v7.14-MC21w14a
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.14";
public static final String MC_VERSION = "21w13a";
public static final String MC_VERSION = "21w14a";
private WurstAnalytics analytics;
private EventManager eventManager;

4
src/main/java/net/wurstclient/ai/FlyPathProcessor.java
View File

@ -87,9 +87,9 @@ public class FlyPathProcessor extends PathProcessor
}
// skip mid-air nodes
Vec3i offset = nextPos.method_35852(pos);
Vec3i offset = nextPos.subtract(pos);
while(index < path.size() - 1
&& path.get(index).method_35853(offset).equals(path.get(index + 1)))
&& path.get(index).add(offset).equals(path.get(index + 1)))
index++;
if(creativeFlying)

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

@ -132,15 +132,15 @@ public class PathFinder
return neighbors;
// get all neighbors
BlockPos north = pos.method_35861();
BlockPos east = pos.method_35855();
BlockPos south = pos.method_35859();
BlockPos west = pos.method_35857();
BlockPos north = pos.north();
BlockPos east = pos.east();
BlockPos south = pos.south();
BlockPos west = pos.west();
BlockPos northEast = north.method_35855();
BlockPos southEast = south.method_35855();
BlockPos southWest = south.method_35857();
BlockPos northWest = north.method_35857();
BlockPos northEast = north.east();
BlockPos southEast = south.east();
BlockPos southWest = south.west();
BlockPos northWest = north.west();
BlockPos up = pos.up();
BlockPos down = pos.down();
@ -220,9 +220,9 @@ public class PathFinder
private boolean checkDiagonalMovement(BlockPos current,
Direction direction1, Direction direction2)
{
BlockPos horizontal1 = current.method_35851(direction1);
BlockPos horizontal2 = current.method_35851(direction2);
BlockPos next = horizontal1.method_35851(direction2);
BlockPos horizontal1 = current.offset(direction1);
BlockPos horizontal2 = current.offset(direction2);
BlockPos next = horizontal1.offset(direction2);
if(isPassable(horizontal1) && isPassable(horizontal2)
&& checkHorizontalMovement(current, next))
@ -364,11 +364,10 @@ public class PathFinder
// check if any adjacent block is solid
BlockPos up = pos.up();
if(!canBeSolid(pos.method_35861()) && !canBeSolid(pos.method_35855())
&& !canBeSolid(pos.method_35859())
&& !canBeSolid(pos.method_35857()) && !canBeSolid(up.method_35861())
&& !canBeSolid(up.method_35855()) && !canBeSolid(up.method_35859())
&& !canBeSolid(up.method_35857()))
if(!canBeSolid(pos.north()) && !canBeSolid(pos.east())
&& !canBeSolid(pos.south()) && !canBeSolid(pos.west())
&& !canBeSolid(up.north()) && !canBeSolid(up.east())
&& !canBeSolid(up.south()) && !canBeSolid(up.west()))
return false;
return true;

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

@ -238,7 +238,7 @@ public final class AutoBuildHack extends Hack
for(Direction side : Direction.values())
{
BlockPos neighbor = pos.method_35851(side);
BlockPos neighbor = pos.offset(side);
// check if neighbor can be right clicked
if(!BlockUtils.canBeClicked(neighbor)
@ -299,7 +299,7 @@ public final class AutoBuildHack extends Hack
if(!BlockUtils.canBeClicked(hitResultPos))
return;
BlockPos startPos = hitResultPos.method_35851(blockHitResult.getSide());
BlockPos startPos = hitResultPos.offset(blockHitResult.getSide());
Direction direction = MC.player.getHorizontalFacing();
remainingBlocks = template.getPositions(startPos, direction);
@ -324,7 +324,7 @@ public final class AutoBuildHack extends Hack
for(Direction side : Direction.values())
{
BlockPos neighbor = pos.method_35851(side);
BlockPos neighbor = pos.offset(side);
// check if neighbor can be right-clicked
if(!BlockUtils.canBeClicked(neighbor))

14
src/main/java/net/wurstclient/hacks/AutoFarmHack.java
View File

@ -310,10 +310,10 @@ public final class AutoFarmHack extends Hack
return BlockUtils.getBlock(pos.down()) instanceof SoulSandBlock;
if(item == Items.COCOA_BEANS)
return BlockUtils.getBlock(pos.method_35861()) == Blocks.JUNGLE_LOG
|| BlockUtils.getBlock(pos.method_35855()) == Blocks.JUNGLE_LOG
|| BlockUtils.getBlock(pos.method_35859()) == Blocks.JUNGLE_LOG
|| BlockUtils.getBlock(pos.method_35857()) == Blocks.JUNGLE_LOG;
return BlockUtils.getBlock(pos.north()) == Blocks.JUNGLE_LOG
|| BlockUtils.getBlock(pos.east()) == Blocks.JUNGLE_LOG
|| BlockUtils.getBlock(pos.south()) == Blocks.JUNGLE_LOG
|| BlockUtils.getBlock(pos.west()) == Blocks.JUNGLE_LOG;
return false;
}
@ -379,7 +379,7 @@ public final class AutoFarmHack extends Hack
for(int i = 0; i < sides.length; i++)
{
// check if neighbor can be right clicked
BlockPos neighbor = pos.method_35851(sides[i]);
BlockPos neighbor = pos.offset(sides[i]);
if(!BlockUtils.canBeClicked(neighbor))
continue;
@ -399,7 +399,7 @@ public final class AutoFarmHack extends Hack
for(int i = 0; i < sides.length; i++)
{
// check if neighbor can be right clicked
if(!BlockUtils.canBeClicked(pos.method_35851(sides[i])))
if(!BlockUtils.canBeClicked(pos.offset(sides[i])))
continue;
// check if side is facing away from player
@ -425,7 +425,7 @@ public final class AutoFarmHack extends Hack
return;
// place block
IMC.getInteractionManager().rightClickBlock(pos.method_35851(side),
IMC.getInteractionManager().rightClickBlock(pos.offset(side),
side.getOpposite(), hitVec);
// swing arm

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

@ -254,7 +254,7 @@ public final class BaseFinderHack extends Hack
addVertex(pos, 1, 1, 0);
}
if(!matchingBlocks.contains(pos.method_35861()))
if(!matchingBlocks.contains(pos.north()))
{
addVertex(pos, 0, 0, 0);
addVertex(pos, 0, 1, 0);
@ -262,7 +262,7 @@ public final class BaseFinderHack extends Hack
addVertex(pos, 1, 0, 0);
}
if(!matchingBlocks.contains(pos.method_35855()))
if(!matchingBlocks.contains(pos.east()))
{
addVertex(pos, 1, 0, 0);
addVertex(pos, 1, 1, 0);
@ -270,7 +270,7 @@ public final class BaseFinderHack extends Hack
addVertex(pos, 1, 0, 1);
}
if(!matchingBlocks.contains(pos.method_35859()))
if(!matchingBlocks.contains(pos.south()))
{
addVertex(pos, 0, 0, 1);
addVertex(pos, 1, 0, 1);
@ -278,7 +278,7 @@ public final class BaseFinderHack extends Hack
addVertex(pos, 0, 1, 1);
}
if(!matchingBlocks.contains(pos.method_35857()))
if(!matchingBlocks.contains(pos.west()))
{
addVertex(pos, 0, 0, 0);
addVertex(pos, 0, 0, 1);

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

@ -202,7 +202,7 @@ public final class BuildRandomHack extends Hack
for(Direction side : Direction.values())
{
BlockPos neighbor = pos.method_35851(side);
BlockPos neighbor = pos.offset(side);
// check if neighbor can be right clicked
if(!BlockUtils.canBeClicked(neighbor))
@ -253,7 +253,7 @@ public final class BuildRandomHack extends Hack
for(Direction side : Direction.values())
{
BlockPos neighbor = pos.method_35851(side);
BlockPos neighbor = pos.offset(side);
// check if neighbor can be right clicked
if(!BlockUtils.canBeClicked(neighbor))

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

@ -245,7 +245,7 @@ public class ChestEspHack extends Hack implements UpdateListener,
// larger box for double chest
if(chestType != ChestType.SINGLE)
{
BlockPos pos2 = pos.method_35851(ChestBlock.getFacing(state));
BlockPos pos2 = pos.offset(ChestBlock.getFacing(state));
if(BlockUtils.canBeClicked(pos2))
{

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

@ -411,8 +411,8 @@ public final class ExcavatorHack extends Hack
// offset if sneaking
if(MC.options.keySneak.isPressed())
posLookingAt = posLookingAt.method_35851(
((BlockHitResult)MC.crosshairTarget).getSide());
posLookingAt = posLookingAt
.offset(((BlockHitResult)MC.crosshairTarget).getSide());
}else
posLookingAt = null;
@ -687,16 +687,14 @@ public final class ExcavatorHack extends Hack
{
BlockPos goal = getGoal();
return done =
goal.down(2).equals(current) || goal.up().equals(current)
|| goal.method_35861().equals(current)
|| goal.method_35859().equals(current)
|| goal.method_35857().equals(current)
|| goal.method_35855().equals(current)
|| goal.down().method_35861().equals(current)
|| goal.down().method_35859().equals(current)
|| goal.down().method_35857().equals(current)
|| goal.down().method_35855().equals(current);
return done = goal.down(2).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)
|| goal.down().east().equals(current);
}
}
}

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

@ -190,7 +190,7 @@ public final class InstantBunkerHack extends Hack
for(int i = 0; i < sides.length; i++)
{
// check if neighbor can be right clicked
BlockPos neighbor = pos.method_35851(sides[i]);
BlockPos neighbor = pos.offset(sides[i]);
if(!BlockUtils.canBeClicked(neighbor))
continue;
@ -210,7 +210,7 @@ public final class InstantBunkerHack extends Hack
for(int i = 0; i < sides.length; i++)
{
// check if neighbor can be right clicked
if(!BlockUtils.canBeClicked(pos.method_35851(sides[i])))
if(!BlockUtils.canBeClicked(pos.offset(sides[i])))
continue;
// check if side is facing away from player
@ -236,7 +236,7 @@ public final class InstantBunkerHack extends Hack
// return;
// place block
IMC.getInteractionManager().rightClickBlock(pos.method_35851(side),
IMC.getInteractionManager().rightClickBlock(pos.offset(side),
side.getOpposite(), hitVec);
// swing arm

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

@ -155,8 +155,8 @@ public final class NukerHack extends Hack
int blockRange = (int)Math.ceil(range.getValue());
Vec3i rangeVec = new Vec3i(blockRange, blockRange, blockRange);
BlockPos min = eyesBlock.method_35852(rangeVec);
BlockPos max = eyesBlock.method_35853(rangeVec);
BlockPos min = eyesBlock.subtract(rangeVec);
BlockPos max = eyesBlock.add(rangeVec);
ArrayList<BlockPos> blocks = BlockUtils.getAllInBox(min, max);
Stream<BlockPos> stream = blocks.parallelStream();

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

@ -103,7 +103,7 @@ public final class ScaffoldWalkHack extends Hack implements UpdateListener
for(Direction side : Direction.values())
{
BlockPos neighbor = pos.method_35851(side);
BlockPos neighbor = pos.offset(side);
Direction side2 = side.getOpposite();
// check if side is visible (facing away from player)

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

@ -570,7 +570,7 @@ public final class TunnellerHack extends Hack
continue;
// check next blocks
BlockPos pos3 = pos.method_35851(direction);
BlockPos pos3 = pos.offset(direction);
if(!BlockUtils.getState(pos3).getFluidState().isEmpty())
liquids.add(pos3);
@ -609,7 +609,7 @@ public final class TunnellerHack extends Hack
BlockPos player = new BlockPos(MC.player.getPos());
KeyBinding forward = MC.options.keyForward;
Vec3d diffVec = Vec3d.of(player.method_35852(start));
Vec3d diffVec = Vec3d.of(player.subtract(start));
Vec3d dirVec = Vec3d.of(direction.getVector());
double dotProduct = diffVec.dotProduct(dirVec);
@ -762,7 +762,7 @@ public final class TunnellerHack extends Hack
for(int i = 0; i < sides.length; i++)
{
// check if neighbor can be right clicked
BlockPos neighbor = pos.method_35851(sides[i]);
BlockPos neighbor = pos.offset(sides[i]);
if(!BlockUtils.canBeClicked(neighbor))
continue;
@ -782,7 +782,7 @@ public final class TunnellerHack extends Hack
for(int i = 0; i < sides.length; i++)
{
// check if neighbor can be right clicked
if(!BlockUtils.canBeClicked(pos.method_35851(sides[i])))
if(!BlockUtils.canBeClicked(pos.offset(sides[i])))
continue;
// check if side is facing away from player
@ -808,7 +808,7 @@ public final class TunnellerHack extends Hack
return;
// place block
IMC.getInteractionManager().rightClickBlock(pos.method_35851(side),
IMC.getInteractionManager().rightClickBlock(pos.offset(side),
side.getOpposite(), hitVec);
// swing arm

8
src/main/java/net/wurstclient/util/BlockVertexCompiler.java
View File

@ -54,7 +54,7 @@ public enum BlockVertexCompiler
vertices.add(getVertex(pos, 1, 1, 0));
}
if(!matchingBlocks.contains(pos.method_35861()))
if(!matchingBlocks.contains(pos.north()))
{
vertices.add(getVertex(pos, 0, 0, 0));
vertices.add(getVertex(pos, 0, 1, 0));
@ -62,7 +62,7 @@ public enum BlockVertexCompiler
vertices.add(getVertex(pos, 1, 0, 0));
}
if(!matchingBlocks.contains(pos.method_35855()))
if(!matchingBlocks.contains(pos.east()))
{
vertices.add(getVertex(pos, 1, 0, 0));
vertices.add(getVertex(pos, 1, 1, 0));
@ -70,7 +70,7 @@ public enum BlockVertexCompiler
vertices.add(getVertex(pos, 1, 0, 1));
}
if(!matchingBlocks.contains(pos.method_35859()))
if(!matchingBlocks.contains(pos.south()))
{
vertices.add(getVertex(pos, 0, 0, 1));
vertices.add(getVertex(pos, 1, 0, 1));
@ -78,7 +78,7 @@ public enum BlockVertexCompiler
vertices.add(getVertex(pos, 0, 1, 1));
}
if(!matchingBlocks.contains(pos.method_35857()))
if(!matchingBlocks.contains(pos.west()))
{
vertices.add(getVertex(pos, 0, 0, 0));
vertices.add(getVertex(pos, 0, 0, 1));