Merge pull request #291 from 3arthqu4ke/v.1.8.5

V.1.8.5

Author: 3arthqu4ke

.github/workflows/gradle-publish.yml

@@ -2,6 +2,7 @@ name: Gradle Build
 
 on:
   push:
+  workflow_dispatch:
   pull_request:
     types: [opened, reopened]
 

src/main/java/me/earth/earthhack/forge/mixins/minecraftforge/MixinFMLClientHandler.java

@@ -8,7 +8,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = FMLClientHandler.class, remap = false)
-public class MixinFMLClientHandler {
+public abstract class MixinFMLClientHandler {
     @Inject(
         method = "finishMinecraftLoading",
         at = @At(

src/main/java/me/earth/earthhack/forge/mixins/minecraftforge/MixinGameData.java

@@ -14,7 +14,7 @@
 import java.util.List;
 
 @Mixin(value = GameData.class, remap = false)
-public class MixinGameData
+public abstract class MixinGameData
 {
     private static final SettingCache
      <Boolean, BooleanSetting, Management> IGNORE =

src/main/java/me/earth/earthhack/impl/core/mixins/block/ITileEntity.java

@@ -8,9 +8,6 @@
 @Mixin(TileEntity.class)
 public interface ITileEntity
 {
-    @Accessor(value = "blockType")
-    Block getBlockType();
-
     @Accessor(value = "blockType")
     void setBlockType(Block block);
 }

src/main/java/me/earth/earthhack/impl/core/mixins/block/MixinAvoid.java

@@ -0,0 +1,48 @@
+package me.earth.earthhack.impl.core.mixins.block;
+
+import me.earth.earthhack.api.cache.ModuleCache;
+import me.earth.earthhack.impl.modules.Caches;
+import me.earth.earthhack.impl.modules.movement.avoid.Avoid;
+import net.minecraft.block.*;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin({
+    Block.class,
+    BlockAir.class,
+    BlockFire.class,
+    BlockCactus.class,
+    BlockLiquid.class
+})
+public abstract class MixinAvoid {
+    private static final ModuleCache<Avoid> AVOID =
+        Caches.getModule(Avoid.class);
+    private final Minecraft mc = Minecraft.getMinecraft();
+
+    @Inject(
+        method = "getCollisionBoundingBox",
+        at = @At("HEAD"),
+        cancellable = true)
+    private void getCollisionBoundingBoxHook(IBlockState blockState,
+                                             IBlockAccess worldIn,
+                                             BlockPos pos,
+                                             CallbackInfoReturnable<AxisAlignedBB> cir) {
+        World world = mc.world;
+        if (world != null
+            && AVOID.isEnabled()
+            && !(worldIn instanceof World && !((World) worldIn).isRemote)
+            && AVOID.get().check(pos, world)) {
+            // offset based on the BB instead?
+            cir.setReturnValue(Block.FULL_BLOCK_AABB);
+        }
+    }
+
+}

src/main/java/me/earth/earthhack/impl/core/mixins/render/chunk/MixinVisGraph.java

@@ -2,19 +2,44 @@
 
 import me.earth.earthhack.api.cache.ModuleCache;
 import me.earth.earthhack.impl.modules.Caches;
+import me.earth.earthhack.impl.modules.player.freecam.Freecam;
+import me.earth.earthhack.impl.modules.player.spectate.Spectate;
 import me.earth.earthhack.impl.modules.render.xray.XRay;
 import me.earth.earthhack.impl.modules.render.xray.mode.XrayMode;
 import net.minecraft.client.renderer.chunk.VisGraph;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.EnumSet;
+import java.util.Set;
 
 @Mixin(VisGraph.class)
 public abstract class MixinVisGraph
 {
-    private static final ModuleCache<XRay> XRAY = Caches.getModule(XRay.class);
+    private static final ModuleCache<XRay> XRAY =
+        Caches.getModule(XRay.class);
+    private static final ModuleCache<Freecam> FREECAM =
+        Caches.getModule(Freecam.class);
+    private static final ModuleCache<Spectate> SPECTATE =
+        Caches.getModule(Spectate.class);
+
+    @Inject(
+        method = "getVisibleFacings",
+        at = @At("HEAD"),
+        cancellable = true)
+    public void getVisibleFacingsHook(
+        CallbackInfoReturnable<Set<EnumFacing>> cir)
+    {
+        if (FREECAM.isEnabled() || SPECTATE.isEnabled())
+        {
+            cir.setReturnValue(EnumSet.allOf(EnumFacing.class));
+        }
+    }
 
     @Inject(
         method = "setOpaqueCube",

src/main/java/me/earth/earthhack/impl/managers/client/ModuleManager.java

@@ -91,6 +91,7 @@
 import me.earth.earthhack.impl.modules.movement.anchor.Anchor;
 import me.earth.earthhack.impl.modules.movement.antimove.NoMove;
 import me.earth.earthhack.impl.modules.movement.autosprint.AutoSprint;
+import me.earth.earthhack.impl.modules.movement.avoid.Avoid;
 import me.earth.earthhack.impl.modules.movement.blocklag.BlockLag;
 import me.earth.earthhack.impl.modules.movement.boatfly.BoatFly;
 import me.earth.earthhack.impl.modules.movement.elytraflight.ElytraFlight;
@@ -109,6 +110,7 @@
 import me.earth.earthhack.impl.modules.movement.reversestep.ReverseStep;
 import me.earth.earthhack.impl.modules.movement.safewalk.SafeWalk;
 import me.earth.earthhack.impl.modules.movement.speed.Speed;
+import me.earth.earthhack.impl.modules.movement.stairs.Stairs;
 import me.earth.earthhack.impl.modules.movement.step.Step;
 import me.earth.earthhack.impl.modules.movement.tickshift.TickShift;
 import me.earth.earthhack.impl.modules.movement.velocity.Velocity;
@@ -269,6 +271,7 @@ public void init()
 
         this.forceRegister(new Anchor());
         this.forceRegister(new AutoSprint());
+        this.forceRegister(new Avoid());
         this.forceRegister(new BlockLag());
         this.forceRegister(new BoatFly());
         this.forceRegister(new ElytraFlight());
@@ -288,6 +291,7 @@ public void init()
         this.forceRegister(new Phase());
         this.forceRegister(new SafeWalk());
         this.forceRegister(new Speed());
+        this.forceRegister(new Stairs());
         this.forceRegister(new Step());
         this.forceRegister(new TickShift());
         this.forceRegister(new Velocity());

src/main/java/me/earth/earthhack/impl/modules/client/hud/HUD.java

@@ -24,6 +24,7 @@
 import me.earth.earthhack.impl.util.render.ColorUtil;
 import me.earth.earthhack.impl.util.text.ChatUtil;
 import me.earth.earthhack.impl.util.text.TextColor;
+import me.earth.earthhack.pingbypass.modules.PbModule;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
@@ -308,7 +309,16 @@ protected void renderModules() {
                     if (isArrayMember(module.getValue()))
                         continue;
                     getArrayEntries().put(module.getValue(), new ArrayEntry(module.getValue()));
+                    if (!(module.getValue() instanceof PbModule)) {
+                        getArrayEntries()
+                            .entrySet()
+                            .removeIf(m -> m.getKey() instanceof PbModule
+                                && Objects.equals(
+                                    ((PbModule) m.getKey()).getModule(),
+                                    module.getValue()));
+                    }
                 }
+
                 Map<Module, ArrayEntry> arrayEntriesSorted;
                 if (renderModules.getValue() == Modules.Length) {
                     arrayEntriesSorted = getArrayEntries().entrySet().stream().sorted(Comparator.comparingDouble(entry -> Managers.TEXT.getStringWidth(ModuleUtil.getHudName(entry.getKey())) * -1)).collect(Collectors.toMap(
@@ -406,7 +416,10 @@ public Map<Module, ArrayEntry> getRemoveEntries() {
     }
 
     protected boolean isArrayMember(Module module) {
-        return getArrayEntries().containsKey(module);
+        return getArrayEntries().containsKey(module)
+            || module instanceof PbModule
+               && getArrayEntries().containsKey(((PbModule) module)
+                                                    .getModule());
     }
 
 }

src/main/java/me/earth/earthhack/impl/modules/combat/autocrystal/AbstractCalculation.java

@@ -807,6 +807,17 @@ protected boolean placeNoAntiTotem(PlaceData data, MineSlots liquid)
         PositionData firstData = null;
         for (PositionData d : data.getData())
         {
+            if (module.override.getValue()
+                && d.getSelfDamage() > module.maxSelfPlace.getValue()
+                && d.getMaxDamage() < d.getHealth()
+                || module.efficientPlacements.getValue()
+                    && d.getMaxDamage() < d.getSelfDamage()
+                    && (!module.override.getValue()
+                        || d.getMaxDamage() < d.getHealth()))
+            {
+                continue;
+            }
+
             if (d.isBlocked())
             {
                 if (maxBlockedDamage < d.getMaxDamage())

src/main/java/me/earth/earthhack/impl/modules/combat/autocrystal/AutoCrystal.java

@@ -118,7 +118,7 @@ public class AutoCrystal extends Module
     protected final Setting<Integer> slowPlaceDelay =
             register(new NumberSetting<>("SlowPlaceDelay", 500, 0, 500))
                 .setComplexity(Complexity.Medium);
-    protected final Setting<Boolean> override = // TODO: Isnt implemented properly
+    protected final Setting<Boolean> override =
             register(new BooleanSetting("OverridePlace", false))
                 .setComplexity(Complexity.Expert);
     protected final Setting<Boolean> newVer =
@@ -172,6 +172,9 @@ public class AutoCrystal extends Module
     protected final Setting<Boolean> ignoreNonFull =
             register(new BooleanSetting("IgnoreNonFull", false))
                 .setComplexity(Complexity.Expert);
+    protected final Setting<Boolean> efficientPlacements =
+            register(new BooleanSetting("EfficientPlacements", false))
+                .setComplexity(Complexity.Expert);
     protected final Setting<Integer> simulatePlace =
             register(new NumberSetting<>("Simulate-Place", 0, 0, 10))
                 .setComplexity(Complexity.Medium);