Configuration & Separating lookAtTarget()

This commit is contained in:
gitboy committed 2024-02-12 19:36:32 +08:00
1 parent 4ffd7ee108
commit 64446eef4b
5 files changed
+45 -30

No files matched your search

@@ -9,6 +9,7 @@ public class FindItConfig {
public static int SEARCH_RADIUS = 16;
public static int SEARCH_COOLDOWN = 10;
public static int MAX_RESPONSE_SIZE = 20;
public static boolean ENABLE_ROTATE_VIEW = false;
public static void setup(final File file) {
final Configuration config = new Configuration(file);
@@ -26,6 +27,8 @@ public class FindItConfig {
"MaxResponseSize",
"20",
"Maximum number of positions that can be displayed by item/block search").getInt();
ENABLE_ROTATE_VIEW = config.get(Configuration.CATEGORY_GENERAL, "EnableRotateView", "false", "Rotate player's view when searched").getBoolean();
} catch (Exception ignore) {} finally {
if (config.hasChanged()) config.save();
}
@@ -1,14 +1,11 @@
package com.gtnh.findit.service.blockfinder;
import com.gtnh.findit.service.itemfinder.ItemFoundResponse;
import com.gtnh.findit.util.AxisUtils;
import com.gtnh.findit.FindItConfig;
import net.minecraft.block.Block;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Vec3;
import net.minecraft.world.ChunkPosition;
import org.lwjgl.input.Keyboard;
import com.gtnh.findit.FindIt;
@@ -19,6 +16,8 @@ import com.gtnh.findit.util.AbstractStackFinder;
import codechicken.nei.api.API;
import codechicken.nei.guihook.GuiContainerManager;
import static com.gtnh.findit.util.ClientFinderHelperUtils.lookAtTarget;
public class ClientBlockFindService extends BlockFindService {
public ClientBlockFindService() {
@@ -29,17 +28,10 @@ public class ClientBlockFindService extends BlockFindService {
public void handleResponse(EntityClientPlayerMP player, BlockFoundResponse response) {
player.closeScreen();
ParticlePosition.highlightBlocks(player.worldObj, response.getPositions());
lookAtTarget(player, response);
}
public void lookAtTarget(EntityClientPlayerMP player, BlockFoundResponse response){
Vec3 playerVec = player.getPosition(1.0F);
ChunkPosition first = response.getPositions().remove(0);
AxisUtils.AxisPair pair = AxisUtils.calculateAxisPair(playerVec, first);
player.rotationYaw = pair.yaw();
player.rotationPitch = pair.pitch();
if (FindItConfig.ENABLE_ROTATE_VIEW) {
lookAtTarget(player, response);
}
}
private static class BlockFindInputHandler extends AbstractStackFinder {
@@ -1,6 +1,6 @@
package com.gtnh.findit.service.itemfinder;
import com.gtnh.findit.util.AxisUtils;
import com.gtnh.findit.FindItConfig;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.client.gui.GuiScreen;
@@ -9,8 +9,6 @@ import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.inventory.Slot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Vec3;
import net.minecraft.world.ChunkPosition;
import net.minecraft.world.World;
import net.minecraftforge.client.event.GuiScreenEvent;
import net.minecraftforge.common.MinecraftForge;
@@ -33,6 +31,8 @@ import cpw.mods.fml.common.gameevent.TickEvent;
import java.util.ArrayList;
import java.util.List;
import static com.gtnh.findit.util.ClientFinderHelperUtils.lookAtTarget;
public class ClientItemFindService extends ItemFindService {
private ContainerHighlightData highlightData = null;
@@ -53,17 +53,10 @@ public class ClientItemFindService extends ItemFindService {
player.closeScreen();
ParticlePosition.highlightBlocks(world, response.getPositions());
lookAtTarget(player,response);
}
public void lookAtTarget(EntityClientPlayerMP player, ItemFoundResponse response){
Vec3 playerVec = player.getPosition(1.0F);
ChunkPosition first = response.getPositions().remove(0);
AxisUtils.AxisPair pair = AxisUtils.calculateAxisPair(playerVec, first);
player.rotationYaw = pair.yaw();
player.rotationPitch = pair.pitch();
if (FindItConfig.ENABLE_ROTATE_VIEW) {
lookAtTarget(player, response);
}
}
public void handleSlotHighlight(HighlightSlotsPacket packet) {
@@ -1,10 +1,7 @@
package com.gtnh.findit.util;
import com.github.bsideup.jabel.Desugar;
import net.minecraft.util.Vec3;
import net.minecraft.world.ChunkPosition;
import java.util.Objects;
public class AxisUtils {
@@ -0,0 +1,30 @@
package com.gtnh.findit.util;
import com.gtnh.findit.service.blockfinder.BlockFoundResponse;
import com.gtnh.findit.service.itemfinder.ItemFoundResponse;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.util.Vec3;
import net.minecraft.world.ChunkPosition;
import java.util.List;
public class ClientFinderHelperUtils {
public static void lookAtTarget(EntityClientPlayerMP player, ItemFoundResponse response) {
rotateViewHelper(player, response.getPositions());
}
public static void lookAtTarget(EntityClientPlayerMP player, BlockFoundResponse response) {
rotateViewHelper(player, response.getPositions());
}
public static void rotateViewHelper(EntityClientPlayerMP player, List<ChunkPosition> targets) {
Vec3 playerVec = player.getPosition(1.0F);
ChunkPosition first = targets.remove(0);
AxisUtils.AxisPair pair = AxisUtils.calculateAxisPair(playerVec, first);
player.rotationYaw = pair.yaw();
player.rotationPitch = pair.pitch();
}
}