Skip to content

Commit

Permalink
adjust a couple default values, 1 spelling error fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@etianl
etianl authored Mar 5, 2023
1 parent 0f5255f commit 4c4264e
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 57 deletions.
2 changes: 1 addition & 1 deletion src/main/java/pwn/noobs/trouserstreak/modules/HandOfGod.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public class HandOfGod extends Module {
private final Setting<Integer> roofheight = sgPcentered.add(new IntSetting.Builder()
.name("height")
.description("height")
.defaultValue(256)
.defaultValue(255)
.sliderRange(64, 319)
.visible(() -> roofer.get())
.build());
Expand Down
112 changes: 56 additions & 56 deletions src/main/java/pwn/noobs/trouserstreak/modules/Teleport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class Teleport extends Module {
private final Setting<Integer> reach = sgGeneral.add(new IntSetting.Builder()
.name("reach")
.description("Reach")
.defaultValue(64)
.defaultValue(48)
.sliderRange(8, 96)
.build());
public final Setting<Double> tpTimer = sgGeneral.add(new DoubleSetting.Builder()
Expand Down Expand Up @@ -66,7 +66,7 @@ public class Teleport extends Module {
);

private final Setting<SettingColor> lineColor = sgRender.add(new ColorSetting.Builder()
.name("line-color-solid-bloc")
.name("line-color-solid-block")
.description("The color of the lines of the blocks being rendered.")
.defaultValue(new SettingColor(255, 0, 255, 255))
.visible(() -> render.get())
Expand Down Expand Up @@ -233,51 +233,51 @@ else if (ticks <=5 && notponactivateplz == false){
Modules.get().get(Timer.class).setOverride(tpTimer.get());
}
} else if (location.getX()+0.5-startpos.getX()<=64 && location.getX()+0.5-startpos.getX()>=-64 && location.getY()+0.5-startpos.getY()<=64 && location.getY()+0.5-startpos.getY()>=-64 && location.getZ()+0.5-startpos.getZ()<=64 && location.getZ()+0.5-startpos.getZ()>=-64 ){
if (ticks ==2 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.125), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.125)+1.0125), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.125));
mc.player.setVelocity(0,0.05,0);}
else if (ticks ==3 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.25), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.25)+1.025), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.25));
mc.player.setVelocity(0,0.05,0);}
else if (ticks == 4 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.375), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.375)+1.0375), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.375));
mc.player.setVelocity(0,0.05,0);}
else if (ticks == 5 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.50), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.50)+1.05), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.50));
mc.player.setVelocity(0,0.05,0);}
else if (ticks == 6 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.625), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.625)+1.0625), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.625));
mc.player.setVelocity(0,0.05,0);}
else if (ticks == 7 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.75), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.75)+1.075), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.75));
mc.player.setVelocity(0,0.05,0);}
else if (ticks == 8 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.875), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.875)+1.0875), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.875));
mc.player.setVelocity(0,0.05,0);}
BlockPos tptarget= new BlockPos(location.getX(), location.getY()+1, location.getZ());
if (mc.world.getBlockState(location).getMaterial().isSolid() && mc.world.getBlockState(tptarget).getMaterial().isSolid() && ticks==9 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.875), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.875)+1.0875), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.875));
mc.player.setVelocity(0,0.2,0);
error("Blocks in the target zone. Teleporting you near the target.");
} else if (liquids.get() && !mc.world.getBlockState(location).getMaterial().equals(Material.AIR) && !mc.world.getBlockState(tptarget).getMaterial().equals(Material.AIR) && ticks==9 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.875), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.875)+1.0875), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.875));
mc.player.setVelocity(0,0.2,0);
error("Blocks in the target zone. Teleporting you near the target.");
}
else if (ticks ==9 && notponactivateplz==false){
mc.player.setPos(location.getX()+0.5, location.getY()+1.1, location.getZ()+0.5);
mc.player.setVelocity(0,0.2,0);
}
else if (ticks <=9 && notponactivateplz==false){
mc.options.jumpKey.setPressed(false);
mc.options.sneakKey.setPressed(false);
mc.options.forwardKey.setPressed(false);
mc.options.backKey.setPressed(false);
mc.options.leftKey.setPressed(false);
mc.options.rightKey.setPressed(false);
mc.player.setVelocity(0,0,0);
TPnow=true;
}
if (ticks ==2 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.125), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.125)+1.0125), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.125));
mc.player.setVelocity(0,0.05,0);}
else if (ticks ==3 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.25), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.25)+1.025), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.25));
mc.player.setVelocity(0,0.05,0);}
else if (ticks == 4 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.375), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.375)+1.0375), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.375));
mc.player.setVelocity(0,0.05,0);}
else if (ticks == 5 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.50), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.50)+1.05), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.50));
mc.player.setVelocity(0,0.05,0);}
else if (ticks == 6 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.625), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.625)+1.0625), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.625));
mc.player.setVelocity(0,0.05,0);}
else if (ticks == 7 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.75), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.75)+1.075), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.75));
mc.player.setVelocity(0,0.05,0);}
else if (ticks == 8 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.875), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.875)+1.0875), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.875));
mc.player.setVelocity(0,0.05,0);}
BlockPos tptarget= new BlockPos(location.getX(), location.getY()+1, location.getZ());
if (mc.world.getBlockState(location).getMaterial().isSolid() && mc.world.getBlockState(tptarget).getMaterial().isSolid() && ticks==9 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.875), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.875)+1.0875), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.875));
mc.player.setVelocity(0,0.2,0);
error("Blocks in the target zone. Teleporting you near the target.");
} else if (liquids.get() && !mc.world.getBlockState(location).getMaterial().equals(Material.AIR) && !mc.world.getBlockState(tptarget).getMaterial().equals(Material.AIR) && ticks==9 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.875), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.875)+1.0875), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.875));
mc.player.setVelocity(0,0.2,0);
error("Blocks in the target zone. Teleporting you near the target.");
}
else if (ticks ==9 && notponactivateplz==false){
mc.player.setPos(location.getX()+0.5, location.getY()+1.1, location.getZ()+0.5);
mc.player.setVelocity(0,0.2,0);
}
else if (ticks <=9 && notponactivateplz==false){
mc.options.jumpKey.setPressed(false);
mc.options.sneakKey.setPressed(false);
mc.options.forwardKey.setPressed(false);
mc.options.backKey.setPressed(false);
mc.options.leftKey.setPressed(false);
mc.options.rightKey.setPressed(false);
mc.player.setVelocity(0,0,0);
TPnow=true;
}
if (ticks >= 9){
ticks = 666;
TPnow = false;
Expand All @@ -286,7 +286,7 @@ else if (ticks <=9 && notponactivateplz==false){
if (ticks >=1 && ticks <=9 && notponactivateplz == false){
Modules.get().get(Timer.class).setOverride(tpTimer.get());
}
} else if (location.getX()+0.5-startpos.getX() > 64 || location.getX()+0.5-startpos.getX() <-64 || location.getY()+0.5-startpos.getY()>64 || location.getY()+0.5-startpos.getY()<-64 || location.getZ()+0.5-startpos.getZ()>64 || location.getZ()+0.5-startpos.getZ()<-64 ) {
} else if (location.getX()+0.5-startpos.getX() > 64 || location.getX()+0.5-startpos.getX() <-64 || location.getY()+0.5-startpos.getY()>64 || location.getY()+0.5-startpos.getY()<-64 || location.getZ()+0.5-startpos.getZ()>64 || location.getZ()+0.5-startpos.getZ()<-64 ) {
if (ticks==2 && notponactivateplz==false){
mc.player.setPos(startpos.getX()+((location.getX()+0.5-startpos.getX())*0.0833333333333333), startpos.getY()+(((location.getY()+0.5-startpos.getY()+0.5)*0.0833333333333333)+1.00833333333333333), startpos.getZ()+((location.getZ()+0.5-startpos.getZ())*0.0833333333333333));
mc.player.setVelocity(0,0.05,0);}
Expand Down Expand Up @@ -357,7 +357,7 @@ else if (ticks <=13 && notponactivateplz==false){
@EventHandler
private void onRender(Render3DEvent event) {
if (TPnow==false){
location=target();}
location=target();}
if (location == null) return;
double x1 = location.getX();
double y1 = location.getY()+1;
Expand All @@ -368,12 +368,12 @@ private void onRender(Render3DEvent event) {

if (render.get()){
if (!liquids.get()){
if (!mc.world.getBlockState(location).getMaterial().equals(Material.AIR) && !mc.world.getBlockState(location).getMaterial().isLiquid()){
event.renderer.box(x1, y1, z1, x2, y2, z2, sideColor.get(), lineColor.get(), shapeMode.get(), 0);
}else if (mc.world.getBlockState(location).getMaterial().equals(Material.AIR) || mc.world.getBlockState(location).getMaterial().isLiquid()){
event.renderer.box(x1, y1, z1, x2, y2, z2, sideColor2.get(), lineColor2.get(), shapeMode.get(), 0);
}
}else if (liquids.get()) {
if (!mc.world.getBlockState(location).getMaterial().equals(Material.AIR) && !mc.world.getBlockState(location).getMaterial().isLiquid()){
event.renderer.box(x1, y1, z1, x2, y2, z2, sideColor.get(), lineColor.get(), shapeMode.get(), 0);
}else if (mc.world.getBlockState(location).getMaterial().equals(Material.AIR) || mc.world.getBlockState(location).getMaterial().isLiquid()){
event.renderer.box(x1, y1, z1, x2, y2, z2, sideColor2.get(), lineColor2.get(), shapeMode.get(), 0);
}
}else if (liquids.get()) {
if (!mc.world.getBlockState(location).getMaterial().equals(Material.AIR)){
event.renderer.box(x1, y1, z1, x2, y2, z2, sideColor.get(), lineColor.get(), shapeMode.get(), 0);
}else if (mc.world.getBlockState(location).getMaterial().equals(Material.AIR)){
Expand All @@ -393,4 +393,4 @@ private BlockPos target() {
return ((BlockHitResult) blockHit).getBlockPos();
}

}
}

0 comments on commit 4c4264e

Please sign in to comment.