fix autotrophyfish 'NaN' pitch value + setyawcommand for farming

StarZebra · Feb 19, 2023 · aa675bc · aa675bc
1 parent be71fe3
commit aa675bc
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/src/main/java/nexus/Nexus.java b/src/main/java/nexus/Nexus.java
@@ -12,6 +12,7 @@
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.InputEvent;
 import nexus.commands.DrillToggleCommand;
+import nexus.commands.SetYawCommand;
 import nexus.features.AutoTrophyFish;
 import nexus.features.StopFuelUpdateDrill;
 import org.lwjgl.input.Keyboard;
@@ -22,7 +23,7 @@
 public class Nexus {
 
 	public static Minecraft mc = Minecraft.getMinecraft();
-	public static boolean devMode = false;
+	public static boolean devMode = true;
 	public static HashMap<String, KeyBinding> keyBindings = new HashMap<>();
 	public static boolean nameChangeToggle = true;
 
@@ -32,6 +33,7 @@ public class Nexus {
 	@Mod.EventHandler
 	public void preInit(FMLPreInitializationEvent event){
 		ClientCommandHandler.instance.registerCommand(new DrillToggleCommand());
+		ClientCommandHandler.instance.registerCommand(new SetYawCommand());
 	}
 
 	@Mod.EventHandler

diff --git a/src/main/java/nexus/commands/SetYawCommand.java b/src/main/java/nexus/commands/SetYawCommand.java
@@ -0,0 +1,38 @@
+package nexus.commands;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentText;
+import nexus.Nexus;
+
+public class SetYawCommand extends CommandBase{
+	@Override
+	public String getCommandName() {
+		return "setyaw";
+	}
+
+	@Override
+	public String getCommandUsage(ICommandSender sender) {
+		return "/" + getCommandName();
+	}
+
+	@Override
+	public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+		if(args.length > 0){
+			String argYaw = args[0];
+			if(argYaw.matches("[a-z]+")) return;
+
+			Nexus.mc.thePlayer.rotationYaw = Float.parseFloat(argYaw);
+			Nexus.mc.thePlayer.addChatMessage(new ChatComponentText(Nexus.prefix + "Set yaw to " + argYaw));
+
+		}
+	}
+
+	@Override
+	public int getRequiredPermissionLevel(){
+		return 0;
+	}
+}
+
+
diff --git a/src/main/java/nexus/utils/Utils.java b/src/main/java/nexus/utils/Utils.java
@@ -48,7 +48,7 @@ public static Pair<Float, Float> blockPosToYawPitch(BlockPos blockPos, Vec3 play
 		double diffY = blockPos.getY() - (playerPos.yCoord +Nexus.mc.thePlayer.getEyeHeight()) + 0.5;
 		double diffZ = blockPos.getZ() - playerPos.zCoord + 0.5;
 		float yaw = (float) Math.toDegrees(Math.atan2(diffZ, diffX)) - 90.0f;
-		float dist = (float) Math.sqrt(diffY*diffX+diffZ*diffZ);
+		float dist = (float) Math.sqrt(diffX*diffX+diffZ*diffZ);
 		float pitch = (float) (-(Math.toDegrees(Math.atan2(diffY, dist))));
 		return new Pair<>(Nexus.mc.thePlayer.rotationYaw + wrapAngleTo180(yaw-Nexus.mc.thePlayer.rotationYaw),
 				Nexus.mc.thePlayer.rotationPitch + wrapAngleTo180(pitch-Nexus.mc.thePlayer.rotationPitch));