Add baritone integration

.gitignore

@@ -5,24 +5,17 @@ bin
 .metadata
 .classpath
 .project
-
 # .idea
 out
 *.ipr
 *.iws
 *.iml
 .idea
-
 # Gradle.
 build
 .gradle
-
 # Other.
 eclipse
 run
-
-# Forge.
-forge*changelog.txt
-
 # Mac
 *.DS_Store

build.gradle

@@ -14,8 +14,9 @@ loom {
 }
 
 repositories {
-    maven {
+    mavenCentral() {
         url "https://jitpack.io"
+        url "https://impactdevelopment.github.io/maven/"
     }
 }
 
@@ -24,6 +25,8 @@ dependencies {
     mappings "net.fabricmc:yarn:${project.yarn_version}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    modImplementation "cabaletta:baritone-api:1.2"
+    modImplementation "cabaletta:baritone-deobf-unoptimized-mcp-dev:1.2"
 }
 
 processResources {

gradle.properties

@@ -7,3 +7,4 @@ mod_version=1.0-b5
 maven_group=net.shoreline
 archives_base_name=shoreline
 fabric_version=0.95.3+1.20.4
+baritone_api_version=1.10.2

src/main/java/net/shoreline/client/ShorelineMod.java

@@ -2,6 +2,7 @@
 
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
 
 /**
  * Fabric {@link ModInitializer}.
@@ -35,4 +36,8 @@ public void onInitializeClient() {
         Shoreline.init();
         Shoreline.postInit();
     }
+
+    public static boolean isBaritonePresent() {
+        return FabricLoader.getInstance().getModContainer("baritone").isPresent();
+    }
 }

src/main/java/net/shoreline/client/api/command/arg/Argument.java

@@ -2,7 +2,7 @@
 
 import net.shoreline.client.api.command.Command;
 import net.shoreline.client.api.config.Config;
-import net.shoreline.client.api.manager.client.CommandManager;
+import net.shoreline.client.impl.manager.client.CommandManager;
 import net.shoreline.client.impl.event.gui.chat.ChatInputEvent;
 
 import java.util.Collection;

src/main/java/net/shoreline/client/api/macro/Macro.java

@@ -1,7 +1,7 @@
 package net.shoreline.client.api.macro;
 
 import net.shoreline.client.api.Identifiable;
-import net.shoreline.client.api.manager.client.MacroManager;
+import net.shoreline.client.impl.manager.client.MacroManager;
 import org.lwjgl.glfw.GLFW;
 
 /**

src/main/java/net/shoreline/client/api/manager/ModuleManager.java → src/main/java/net/shoreline/client/impl/manager/ModuleManager.java

@@ -1,11 +1,9 @@
-package net.shoreline.client.api.manager;
+package net.shoreline.client.impl.manager;
 
 import net.shoreline.client.Shoreline;
+import net.shoreline.client.ShorelineMod;
 import net.shoreline.client.api.module.Module;
-import net.shoreline.client.impl.module.client.ClickGuiModule;
-import net.shoreline.client.impl.module.client.ColorsModule;
-import net.shoreline.client.impl.module.client.HUDModule;
-import net.shoreline.client.impl.module.client.RotationsModule;
+import net.shoreline.client.impl.module.client.*;
 import net.shoreline.client.impl.module.combat.*;
 import net.shoreline.client.impl.module.exploit.*;
 import net.shoreline.client.impl.module.misc.*;
@@ -151,6 +149,9 @@ public ModuleManager() {
                 new SpeedmineModule()
                 // new WallhackModule()
         );
+        if (ShorelineMod.isBaritonePresent()) {
+            register(new BaritoneModule());
+        }
         Shoreline.info("Registered {} modules!", modules.size());
     }
 

src/main/java/net/shoreline/client/impl/manager/anticheat/GrimManager.java

@@ -0,0 +1,5 @@
+package net.shoreline.client.impl.manager.anticheat;
+
+public class GrimManager {
+
+}

src/main/java/net/shoreline/client/api/manager/anticheat/NCPManager.java → src/main/java/net/shoreline/client/impl/manager/anticheat/NCPManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.anticheat;
+package net.shoreline.client.impl.manager.anticheat;
 
 import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket;
 import net.minecraft.util.math.BlockPos;

src/main/java/net/shoreline/client/api/manager/client/AccountManager.java → src/main/java/net/shoreline/client/impl/manager/client/AccountManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.client;
+package net.shoreline.client.impl.manager.client;
 
 import net.shoreline.client.api.account.Account;
 import net.shoreline.client.api.account.microsoft.MicrosoftAuthenticator;

src/main/java/net/shoreline/client/api/manager/client/CapeManager.java → src/main/java/net/shoreline/client/impl/manager/client/CapeManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.client;
+package net.shoreline.client.impl.manager.client;
 
 import com.mojang.authlib.GameProfile;
 import net.minecraft.client.texture.NativeImage;

src/main/java/net/shoreline/client/api/manager/client/CommandManager.java → src/main/java/net/shoreline/client/impl/manager/client/CommandManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.client;
+package net.shoreline.client.impl.manager.client;
 
 import net.minecraft.client.gui.screen.ChatScreen;
 import net.shoreline.client.Shoreline;

src/main/java/net/shoreline/client/api/manager/client/DiscordManager.java → src/main/java/net/shoreline/client/impl/manager/client/DiscordManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.client;
+package net.shoreline.client.impl.manager.client;
 
 /**
  * @author linus

src/main/java/net/shoreline/client/api/manager/client/MacroManager.java → src/main/java/net/shoreline/client/impl/manager/client/MacroManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.client;
+package net.shoreline.client.impl.manager.client;
 
 import net.shoreline.client.Shoreline;
 import net.shoreline.client.api.event.listener.EventListener;

src/main/java/net/shoreline/client/api/manager/client/SocialManager.java → src/main/java/net/shoreline/client/impl/manager/client/SocialManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.client;
+package net.shoreline.client.impl.manager.client;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.shoreline.client.api.social.SocialRelation;

src/main/java/net/shoreline/client/api/manager/combat/TotemManager.java → src/main/java/net/shoreline/client/impl/manager/combat/TotemManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.combat;
+package net.shoreline.client.impl.manager.combat;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityStatuses;

src/main/java/net/shoreline/client/api/manager/combat/hole/Hole.java → src/main/java/net/shoreline/client/impl/manager/combat/hole/Hole.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.combat.hole;
+package net.shoreline.client.impl.manager.combat.hole;
 
 import com.google.common.collect.Lists;
 import net.minecraft.entity.Entity;

src/main/java/net/shoreline/client/api/manager/combat/hole/HoleManager.java → src/main/java/net/shoreline/client/impl/manager/combat/hole/HoleManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.combat.hole;
+package net.shoreline.client.impl.manager.combat.hole;
 
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;

src/main/java/net/shoreline/client/api/manager/combat/hole/HoleSafety.java → src/main/java/net/shoreline/client/impl/manager/combat/hole/HoleSafety.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.combat.hole;
+package net.shoreline.client.impl.manager.combat.hole;
 
 public enum HoleSafety {
     RESISTANT,

src/main/java/net/shoreline/client/api/manager/network/NetworkManager.java → src/main/java/net/shoreline/client/impl/manager/network/NetworkManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.network;
+package net.shoreline.client.impl.manager.network;
 
 import net.minecraft.client.network.*;
 import net.minecraft.network.listener.ServerPlayPacketListener;

src/main/java/net/shoreline/client/api/manager/network/latency/LatencyManager.java → src/main/java/net/shoreline/client/impl/manager/network/latency/LatencyManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.network.latency;
+package net.shoreline.client.impl.manager.network.latency;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;

src/main/java/net/shoreline/client/api/manager/network/latency/PlayerLatencyTracker.java → src/main/java/net/shoreline/client/impl/manager/network/latency/PlayerLatencyTracker.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.network.latency;
+package net.shoreline.client.impl.manager.network.latency;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.Vec3d;

src/main/java/net/shoreline/client/api/manager/player/InteractionManager.java → src/main/java/net/shoreline/client/impl/manager/player/InteractionManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.player;
+package net.shoreline.client.impl.manager.player;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.network.packet.c2s.play.*;

src/main/java/net/shoreline/client/api/manager/player/InventoryManager.java → src/main/java/net/shoreline/client/impl/manager/player/InventoryManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.player;
+package net.shoreline.client.impl.manager.player;
 
 import com.google.common.collect.Lists;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;

src/main/java/net/shoreline/client/api/manager/player/MovementManager.java → src/main/java/net/shoreline/client/impl/manager/player/MovementManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.player;
+package net.shoreline.client.impl.manager.player;
 
 import net.minecraft.util.math.Vec3d;
 import net.shoreline.client.util.Globals;

src/main/java/net/shoreline/client/api/manager/player/PositionManager.java → src/main/java/net/shoreline/client/impl/manager/player/PositionManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.player;
+package net.shoreline.client.impl.manager.player;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket;

src/main/java/net/shoreline/client/api/manager/player/rotation/RotationManager.java → src/main/java/net/shoreline/client/impl/manager/player/rotation/RotationManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.player.rotation;
+package net.shoreline.client.impl.manager.player.rotation;
 
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
 import net.minecraft.util.math.MathHelper;

src/main/java/net/shoreline/client/api/manager/player/rotation/RotationRequest.java → src/main/java/net/shoreline/client/impl/manager/player/rotation/RotationRequest.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.player.rotation;
+package net.shoreline.client.impl.manager.player.rotation;
 
 import net.shoreline.client.api.module.RotationModule;
 

src/main/java/net/shoreline/client/api/manager/world/WaypointManager.java → src/main/java/net/shoreline/client/impl/manager/world/WaypointManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.world;
+package net.shoreline.client.impl.manager.world;
 
 import io.netty.util.internal.ConcurrentSet;
 import net.shoreline.client.api.waypoint.Waypoint;

src/main/java/net/shoreline/client/api/manager/world/sound/SoundEvents.java → src/main/java/net/shoreline/client/impl/manager/world/sound/SoundEvents.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.world.sound;
+package net.shoreline.client.impl.manager.world.sound;
 
 import net.minecraft.util.Identifier;
 

src/main/java/net/shoreline/client/api/manager/world/sound/SoundManager.java → src/main/java/net/shoreline/client/impl/manager/world/sound/SoundManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.world.sound;
+package net.shoreline.client.impl.manager.world.sound;
 
 import net.minecraft.client.sound.Sound;
 import net.minecraft.client.sound.SoundInstance;

src/main/java/net/shoreline/client/api/manager/world/tick/TickManager.java → src/main/java/net/shoreline/client/impl/manager/world/tick/TickManager.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.world.tick;
+package net.shoreline.client.impl.manager.world.tick;
 
 import com.google.common.collect.Lists;
 import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;

src/main/java/net/shoreline/client/api/manager/world/tick/TickSync.java → src/main/java/net/shoreline/client/impl/manager/world/tick/TickSync.java

@@ -1,4 +1,4 @@
-package net.shoreline.client.api.manager.world.tick;
+package net.shoreline.client.impl.manager.world.tick;
 
 public enum TickSync {
     CURRENT,

src/main/java/net/shoreline/client/impl/module/client/BaritoneModule.java

@@ -0,0 +1,72 @@
+package net.shoreline.client.impl.module.client;
+
+import baritone.api.BaritoneAPI;
+import net.shoreline.client.api.config.Config;
+import net.shoreline.client.api.config.setting.BooleanConfig;
+import net.shoreline.client.api.event.EventStage;
+import net.shoreline.client.api.event.listener.EventListener;
+import net.shoreline.client.api.module.ConcurrentModule;
+import net.shoreline.client.api.module.ModuleCategory;
+import net.shoreline.client.impl.event.TickEvent;
+
+/**
+ * @author Shoreline
+ * @since 1.0
+ */
+public class BaritoneModule extends ConcurrentModule {
+
+    Config<Boolean> placeConfig = new BooleanConfig("Place", "Allow baritone to place blocks", true);
+    Config<Boolean> breakConfig = new BooleanConfig("Break", "Allow baritone to break blocks", true);
+    Config<Boolean> sprintConfig = new BooleanConfig("Sprint", "Allow baritone to sprint", true);
+    Config<Boolean> inventoryConfig = new BooleanConfig("UseInventory", "Allow baritone to use player inventory", false);
+
+    Config<Boolean> vinesConfig = new BooleanConfig("Vines", "Allow baritone to climb vines", true);
+
+    Config<Boolean> jump256Config = new BooleanConfig("JumpAt256", "Allow baritone to jump at 256 blocks", false);
+    Config<Boolean> parkourConfig = new BooleanConfig("Parkour", "Allow baritone to jump between blocks", true);
+    Config<Boolean> parkourPlaceConfig = new BooleanConfig("ParkourPlace", "Allow baritone to jump and place blocks", false);
+
+    Config<Boolean> parkourAscendConfig = new BooleanConfig("ParkourAscend", "Allow baritone to jump up blocks", true);
+    Config<Boolean> diagonalAscendConfig = new BooleanConfig("DiagonalAscend", "Allow baritone to jump up blocks diagonally", false);
+
+    Config<Boolean> diagonalDescendConfig = new BooleanConfig("DiagonalDescend", "Allow baritone to move down blocks diagonally", false);
+    Config<Boolean> mineDownConfig = new BooleanConfig("MineDownward", "Allow baritone to mine down", true);
+    Config<Boolean> legitMineConfig = new BooleanConfig("LegitMine", "Uses baritone legit mine", false);
+    Config<Boolean> logOnArrivalConfig = new BooleanConfig("LogOnArrival", "Logsout when you arrive at destination", false);
+    Config<Boolean> freeLookConfig = new BooleanConfig("FreeLook", "Allows you to look around freely while using baritone", true);
+    Config<Boolean> antiCheatConfig = new BooleanConfig("AntiCheat", "Uses NCP placements and breaks", false);
+    Config<Boolean> censorCoordsConfig = new BooleanConfig("CensorCoords", "Censors goal coordinates in chat", false);
+    Config<Boolean> debugConfig = new BooleanConfig("Debug", "Debugs in the chat", false);
+
+    /**
+     *
+     */
+    public BaritoneModule() {
+        super("Baritone", "Configure baritone", ModuleCategory.CLIENT);
+    }
+
+    @EventListener
+    public void onTick(TickEvent event) {
+        if (event.getStage() != EventStage.POST) {
+            return;
+        }
+        BaritoneAPI.getSettings().allowPlace.value = placeConfig.getValue();
+        BaritoneAPI.getSettings().allowBreak.value = breakConfig.getValue();
+        BaritoneAPI.getSettings().allowSprint.value = sprintConfig.getValue();
+        BaritoneAPI.getSettings().allowInventory.value = inventoryConfig.getValue();
+        BaritoneAPI.getSettings().allowVines.value = vinesConfig.getValue();
+        BaritoneAPI.getSettings().allowJumpAt256.value = jump256Config.getValue();
+        BaritoneAPI.getSettings().allowParkour.value = parkourConfig.getValue();
+        BaritoneAPI.getSettings().allowParkourAscend.value = parkourAscendConfig.getValue();
+        BaritoneAPI.getSettings().allowParkourPlace.value = parkourPlaceConfig.getValue();
+        BaritoneAPI.getSettings().allowDiagonalAscend.value = diagonalAscendConfig.getValue();
+        BaritoneAPI.getSettings().allowDiagonalDescend.value = diagonalDescendConfig.getValue();
+        BaritoneAPI.getSettings().allowDownward.value = mineDownConfig.getValue();
+        BaritoneAPI.getSettings().legitMine.value = legitMineConfig.getValue();
+        BaritoneAPI.getSettings().disconnectOnArrival.value = logOnArrivalConfig.getValue();
+        BaritoneAPI.getSettings().freeLook.value = freeLookConfig.getValue();
+        BaritoneAPI.getSettings().antiCheatCompatibility.value = antiCheatConfig.getValue();
+        BaritoneAPI.getSettings().censorCoordinates.value = censorCoordsConfig.getValue();
+        BaritoneAPI.getSettings().chatDebug.value = debugConfig.getValue();
+    }
+}

src/main/java/net/shoreline/client/impl/module/combat/AuraModule.java

@@ -26,7 +26,7 @@
 import net.shoreline.client.api.config.setting.EnumConfig;
 import net.shoreline.client.api.config.setting.NumberConfig;
 import net.shoreline.client.api.event.listener.EventListener;
-import net.shoreline.client.api.manager.world.tick.TickSync;
+import net.shoreline.client.impl.manager.world.tick.TickSync;
 import net.shoreline.client.api.module.ModuleCategory;
 import net.shoreline.client.api.module.RotationModule;
 import net.shoreline.client.api.render.Interpolation;

src/main/java/net/shoreline/client/impl/module/combat/AutoCrystalModule.java

@@ -31,7 +31,7 @@
 import net.shoreline.client.api.config.setting.EnumConfig;
 import net.shoreline.client.api.config.setting.NumberConfig;
 import net.shoreline.client.api.event.listener.EventListener;
-import net.shoreline.client.api.manager.world.tick.TickSync;
+import net.shoreline.client.impl.manager.world.tick.TickSync;
 import net.shoreline.client.api.module.ModuleCategory;
 import net.shoreline.client.api.module.RotationModule;
 import net.shoreline.client.api.render.RenderManager;

src/main/java/net/shoreline/client/impl/module/combat/CriticalsModule.java

@@ -82,7 +82,7 @@ public void onPacketOutbound(PacketEvent.Outbound event) {
         }
         if (event.getPacket() instanceof IPlayerInteractEntityC2SPacket packet
                 && packet.getType() == InteractType.ATTACK && !event.isClientPacket()) {
-            if (modeConfig.getValue() == CritMode.GRIM) {
+            if (isGrim()) {
                 if (!mc.player.isOnGround()) {
                     double x = mc.player.getX();
                     double y = mc.player.getY();

src/main/java/net/shoreline/client/impl/module/render/HoleESPModule.java

@@ -7,8 +7,8 @@
 import net.shoreline.client.api.config.setting.ColorConfig;
 import net.shoreline.client.api.config.setting.NumberConfig;
 import net.shoreline.client.api.event.listener.EventListener;
-import net.shoreline.client.api.manager.combat.hole.Hole;
-import net.shoreline.client.api.manager.combat.hole.HoleSafety;
+import net.shoreline.client.impl.manager.combat.hole.Hole;
+import net.shoreline.client.impl.manager.combat.hole.HoleSafety;
 import net.shoreline.client.api.module.ModuleCategory;
 import net.shoreline.client.api.module.ToggleModule;
 import net.shoreline.client.api.render.RenderManager;