mirror of
https://github.com/GTNewHorizons/FindIt.git
synced 2026-11-18 23:59:05 +00:00
Search Fluids; Changed Block Highlighter (#13)
* Search Fluids; Changed Block Highlighter * fix hightlight when use rotate view --------- Co-authored-by: slprime <[email protected]>
This commit is contained in:
1 parent
9d6ce05d9e
commit
fc025b3b85
12 files changed
+303
-381
No files matched your search
@@ -10,6 +10,9 @@ public class FindItConfig {
|
||||
public static int SEARCH_COOLDOWN = 10;
|
||||
public static int MAX_RESPONSE_SIZE = 20;
|
||||
public static boolean ENABLE_ROTATE_VIEW = false;
|
||||
public static boolean USE_PARTICLE_HIGHLIGHTER = false;
|
||||
public static int ITEM_HIGHLIGHTING_DURATION = 10;
|
||||
public static int BLOCK_HIGHLIGHTING_DURATION = 8;
|
||||
|
||||
public static void setup(final File file) {
|
||||
final Configuration config = new Configuration(file);
|
||||
@@ -28,6 +31,22 @@ public class FindItConfig {
|
||||
"20",
|
||||
"Maximum number of positions that can be displayed by item/block search").getInt();
|
||||
|
||||
USE_PARTICLE_HIGHLIGHTER = config.get(
|
||||
Configuration.CATEGORY_GENERAL,
|
||||
"UseParticleHighlighter",
|
||||
"false",
|
||||
"Use Particle for Block Highlighter").getBoolean();
|
||||
|
||||
ITEM_HIGHLIGHTING_DURATION = config
|
||||
.get(Configuration.CATEGORY_GENERAL, "ItemHighlightingDuration", "10", "Item highlighting duration")
|
||||
.getInt();
|
||||
|
||||
BLOCK_HIGHLIGHTING_DURATION = config.get(
|
||||
Configuration.CATEGORY_GENERAL,
|
||||
"BlockHighlightingDuration",
|
||||
"8",
|
||||
"Block highlighting duration").getInt();
|
||||
|
||||
ENABLE_ROTATE_VIEW = config.get(
|
||||
Configuration.CATEGORY_GENERAL,
|
||||
"EnableRotateView",
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.gtnh.findit.fx;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.EntityPlayerSP;
|
||||
import net.minecraft.world.ChunkPosition;
|
||||
import net.minecraftforge.client.event.RenderWorldLastEvent;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
// inspired by McJtyLib
|
||||
|
||||
public class HighlighterHandler {
|
||||
|
||||
private static List<ChunkPosition> positions = new ArrayList<>();
|
||||
private static long expireHighlight;
|
||||
|
||||
public static void highlightBlocks(List<ChunkPosition> positions, long expireHighlight) {
|
||||
HighlighterHandler.positions = positions;
|
||||
HighlighterHandler.expireHighlight = expireHighlight;
|
||||
}
|
||||
|
||||
public static void renderHilightedBlock(RenderWorldLastEvent event) {
|
||||
List<ChunkPosition> list = HighlighterHandler.positions;
|
||||
|
||||
if (list.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
long time = System.currentTimeMillis();
|
||||
|
||||
EntityPlayerSP p = mc.thePlayer;
|
||||
double doubleX = p.lastTickPosX + (p.posX - p.lastTickPosX) * event.partialTicks;
|
||||
double doubleY = p.lastTickPosY + (p.posY - p.lastTickPosY) * event.partialTicks;
|
||||
double doubleZ = p.lastTickPosZ + (p.posZ - p.lastTickPosZ) * event.partialTicks;
|
||||
|
||||
if (((time / 500) & 1) == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (time > expireHighlight) {
|
||||
positions.clear();
|
||||
}
|
||||
|
||||
for (ChunkPosition c : list) {
|
||||
GL11.glPushMatrix();
|
||||
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
|
||||
GL11.glLineWidth(3);
|
||||
GL11.glTranslated(-doubleX, -doubleY, -doubleZ);
|
||||
|
||||
GL11.glDisable(GL11.GL_DEPTH_TEST);
|
||||
GL11.glDisable(GL11.GL_TEXTURE_2D);
|
||||
|
||||
GL11.glColor4f(1.0f, 0.0f, 0.0f, 1.0f);
|
||||
renderHighLightedBlocksOutline(c.chunkPosX, c.chunkPosY, c.chunkPosZ);
|
||||
|
||||
GL11.glPopAttrib();
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
}
|
||||
|
||||
static void renderHighLightedBlocksOutline(double x, double y, double z) {
|
||||
GL11.glBegin(GL11.GL_LINE_STRIP);
|
||||
|
||||
GL11.glVertex3d(x, y, z);
|
||||
GL11.glVertex3d(x, y + 1, z);
|
||||
GL11.glVertex3d(x, y + 1, z + 1);
|
||||
GL11.glVertex3d(x, y, z + 1);
|
||||
GL11.glVertex3d(x, y, z);
|
||||
|
||||
GL11.glVertex3d(x + 1, y, z);
|
||||
GL11.glVertex3d(x + 1, y + 1, z);
|
||||
GL11.glVertex3d(x + 1, y + 1, z + 1);
|
||||
GL11.glVertex3d(x + 1, y, z + 1);
|
||||
GL11.glVertex3d(x + 1, y, z);
|
||||
|
||||
GL11.glVertex3d(x, y, z);
|
||||
GL11.glVertex3d(x + 1, y, z);
|
||||
GL11.glVertex3d(x + 1, y, z + 1);
|
||||
GL11.glVertex3d(x, y, z + 1);
|
||||
GL11.glVertex3d(x, y + 1, z + 1);
|
||||
GL11.glVertex3d(x + 1, y + 1, z + 1);
|
||||
GL11.glVertex3d(x + 1, y + 1, z);
|
||||
GL11.glVertex3d(x + 1, y, z);
|
||||
GL11.glVertex3d(x, y, z);
|
||||
GL11.glVertex3d(x + 1, y, z);
|
||||
GL11.glVertex3d(x + 1, y + 1, z);
|
||||
GL11.glVertex3d(x, y + 1, z);
|
||||
GL11.glVertex3d(x, y + 1, z + 1);
|
||||
GL11.glVertex3d(x + 1, y + 1, z + 1);
|
||||
GL11.glVertex3d(x + 1, y, z + 1);
|
||||
GL11.glVertex3d(x, y, z + 1);
|
||||
|
||||
GL11.glEnd();
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.gtnh.findit.fx;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.HashSet;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
@@ -13,55 +13,76 @@ import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.gtnh.findit.FindIt;
|
||||
|
||||
public class SlotHighlighter {
|
||||
import codechicken.nei.guihook.IContainerDrawHandler;
|
||||
|
||||
public class SlotHighlighter implements IContainerDrawHandler {
|
||||
|
||||
private static final ResourceLocation highlightTexture = new ResourceLocation(
|
||||
FindIt.MOD_ID,
|
||||
"textures/gui/slot_highlight.png");
|
||||
|
||||
public static void highlightSlots(GuiContainer gui, List<Integer> slots, int color) {
|
||||
if (slots.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
private GuiContainer gui = null;
|
||||
private HashSet<Slot> slots = new HashSet<>();
|
||||
private float red = 0;
|
||||
private float green = 0;
|
||||
private float blue = 0;
|
||||
private float alpha = 0;
|
||||
|
||||
float red = (float) (color >> 16 & 255) / 255.0F;
|
||||
float green = (float) (color >> 8 & 255) / 255.0F;
|
||||
float blue = (float) (color & 255) / 255.0F;
|
||||
float alpha = (float) (color >> 24 & 255) / 255.0F;
|
||||
public void highlightSlots(GuiContainer gui, HashSet<Slot> slots, int color) {
|
||||
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslated(gui.guiLeft, gui.guiTop, 0);
|
||||
this.gui = gui;
|
||||
this.slots = slots;
|
||||
|
||||
GL11.glDisable(GL11.GL_ALPHA_TEST);
|
||||
GL11.glShadeModel(GL11.GL_SMOOTH);
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
|
||||
|
||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||
Minecraft.getMinecraft().getTextureManager().bindTexture(highlightTexture);
|
||||
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setColorRGBA_F(red, green, blue, alpha);
|
||||
|
||||
for (int slotId : slots) {
|
||||
Slot slot = gui.inventorySlots.getSlot(slotId);
|
||||
highlightSlot(tessellator, slot.xDisplayPosition - 1, slot.yDisplayPosition - 1);
|
||||
}
|
||||
|
||||
tessellator.draw();
|
||||
|
||||
GL11.glShadeModel(GL11.GL_FLAT);
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
||||
|
||||
GL11.glPopMatrix();
|
||||
this.red = (float) (color >> 16 & 255) / 255.0F;
|
||||
this.green = (float) (color >> 8 & 255) / 255.0F;
|
||||
this.blue = (float) (color & 255) / 255.0F;
|
||||
this.alpha = (float) (color >> 24 & 255) / 255.0F;
|
||||
}
|
||||
|
||||
private static void highlightSlot(Tessellator tessellator, int x, int y) {
|
||||
@Override
|
||||
public void onPreDraw(GuiContainer gui) {}
|
||||
|
||||
@Override
|
||||
public void renderObjects(GuiContainer gui, int mousex, int mousey) {}
|
||||
|
||||
@Override
|
||||
public void postRenderObjects(GuiContainer gui, int mousex, int mousey) {}
|
||||
|
||||
@Override
|
||||
public void renderSlotOverlay(GuiContainer gui, Slot slot) {}
|
||||
|
||||
@Override
|
||||
public void renderSlotUnderlay(GuiContainer gui, Slot slot) {
|
||||
|
||||
if (this.gui == gui && this.slots.contains(slot)) {
|
||||
GL11.glPushMatrix();
|
||||
|
||||
GL11.glDisable(GL11.GL_ALPHA_TEST);
|
||||
GL11.glShadeModel(GL11.GL_SMOOTH);
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
|
||||
|
||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||
Minecraft.getMinecraft().getTextureManager().bindTexture(highlightTexture);
|
||||
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setColorRGBA_F(red, green, blue, alpha);
|
||||
highlightSlot(tessellator, slot.xDisplayPosition, slot.yDisplayPosition);
|
||||
tessellator.draw();
|
||||
|
||||
GL11.glShadeModel(GL11.GL_FLAT);
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
||||
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
}
|
||||
|
||||
private void highlightSlot(Tessellator tessellator, int x, int y) {
|
||||
double zLevel = 1;
|
||||
int x2 = x + 18;
|
||||
int y2 = y + 18;
|
||||
int x2 = x + 16;
|
||||
int y2 = y + 16;
|
||||
|
||||
tessellator.addVertexWithUV(x2, y, zLevel, 18 / 32.0, 0);
|
||||
tessellator.addVertexWithUV(x, y, zLevel, 0, 0);
|
||||
|
||||
@@ -32,6 +32,7 @@ public class BlockFindService {
|
||||
for (TileEntity tileEntity : WorldUtils.getTileEntitiesAround(player, FindItConfig.SEARCH_RADIUS)) {
|
||||
try {
|
||||
Block tileBlock = tileEntity.getBlockType();
|
||||
|
||||
if (!request.getBlockToFind().equals(tileBlock)) {
|
||||
continue;
|
||||
}
|
||||
@@ -54,8 +55,6 @@ public class BlockFindService {
|
||||
}
|
||||
}
|
||||
|
||||
if (!positions.isEmpty()) {
|
||||
FindItNetwork.CHANNEL.sendTo(new BlockFoundResponse(positions), player);
|
||||
}
|
||||
FindItNetwork.CHANNEL.sendTo(new BlockFoundResponse(positions), player);
|
||||
}
|
||||
}
|
||||
@@ -12,6 +12,7 @@ import org.lwjgl.input.Keyboard;
|
||||
import com.gtnh.findit.FindIt;
|
||||
import com.gtnh.findit.FindItConfig;
|
||||
import com.gtnh.findit.FindItNetwork;
|
||||
import com.gtnh.findit.fx.HighlighterHandler;
|
||||
import com.gtnh.findit.fx.ParticlePosition;
|
||||
import com.gtnh.findit.util.AbstractStackFinder;
|
||||
|
||||
@@ -26,11 +27,21 @@ public class ClientBlockFindService extends BlockFindService {
|
||||
}
|
||||
|
||||
public void handleResponse(EntityClientPlayerMP player, BlockFoundResponse response) {
|
||||
player.closeScreen();
|
||||
ParticlePosition.highlightBlocks(player.worldObj, response.getPositions());
|
||||
|
||||
if (FindItConfig.ENABLE_ROTATE_VIEW) {
|
||||
lookAtTarget(player, response);
|
||||
if (!response.getPositions().isEmpty()) {
|
||||
player.closeScreen();
|
||||
|
||||
if (FindItConfig.ENABLE_ROTATE_VIEW) {
|
||||
lookAtTarget(player, response);
|
||||
}
|
||||
}
|
||||
|
||||
if (FindItConfig.USE_PARTICLE_HIGHLIGHTER) {
|
||||
ParticlePosition.highlightBlocks(player.worldObj, response.getPositions());
|
||||
} else {
|
||||
HighlighterHandler.highlightBlocks(
|
||||
response.getPositions(),
|
||||
System.currentTimeMillis() + FindItConfig.BLOCK_HIGHLIGHTING_DURATION * 1000);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,6 +55,7 @@ public class ClientBlockFindService extends BlockFindService {
|
||||
@Override
|
||||
protected boolean findStack(ItemStack stack) {
|
||||
Block block = Block.getBlockFromItem(stack.getItem());
|
||||
|
||||
if (block == Blocks.air) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1,20 +1,16 @@
|
||||
package com.gtnh.findit.service.itemfinder;
|
||||
|
||||
import static com.gtnh.findit.util.ClientFinderHelperUtils.lookAtTarget;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.EntityClientPlayerMP;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.client.multiplayer.WorldClient;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.event.GuiScreenEvent;
|
||||
import net.minecraftforge.client.event.RenderWorldLastEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
@@ -22,7 +18,7 @@ import org.lwjgl.input.Keyboard;
|
||||
import com.gtnh.findit.FindIt;
|
||||
import com.gtnh.findit.FindItConfig;
|
||||
import com.gtnh.findit.FindItNetwork;
|
||||
import com.gtnh.findit.fx.ParticlePosition;
|
||||
import com.gtnh.findit.fx.HighlighterHandler;
|
||||
import com.gtnh.findit.fx.SlotHighlighter;
|
||||
import com.gtnh.findit.util.AbstractStackFinder;
|
||||
|
||||
@@ -35,12 +31,18 @@ import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
|
||||
public class ClientItemFindService extends ItemFindService {
|
||||
|
||||
private ContainerHighlightData highlightData = null;
|
||||
private final SlotHighlighter slotHighlighter;
|
||||
private FindItemRequest request = null;
|
||||
private long expirationTime = 0;
|
||||
|
||||
public ClientItemFindService() {
|
||||
if (!FindIt.isExtraUtilitiesLoaded()) {
|
||||
API.addHashBind("gui.findit.find_item", Keyboard.KEY_T);
|
||||
}
|
||||
|
||||
this.slotHighlighter = new SlotHighlighter();
|
||||
|
||||
GuiContainerManager.addDrawHandler(this.slotHighlighter);
|
||||
GuiContainerManager.addInputHandler(new ItemFindInputHandler());
|
||||
|
||||
MinecraftForge.EVENT_BUS.register(new GuiListener());
|
||||
@@ -49,62 +51,60 @@ public class ClientItemFindService extends ItemFindService {
|
||||
}
|
||||
|
||||
public void handleResponse(EntityClientPlayerMP player, ItemFoundResponse response) {
|
||||
World world = player.worldObj;
|
||||
|
||||
player.closeScreen();
|
||||
ParticlePosition.highlightBlocks(world, response.getPositions());
|
||||
|
||||
if (FindItConfig.ENABLE_ROTATE_VIEW) {
|
||||
lookAtTarget(player, response);
|
||||
}
|
||||
}
|
||||
|
||||
public void handleSlotHighlight(HighlightSlotsPacket packet) {
|
||||
highlightData = new ContainerHighlightData(
|
||||
packet.getWindowId(),
|
||||
packet.getTargetStack(),
|
||||
packet.getTargetSlots());
|
||||
this.slotHighlighter.highlightSlots(null, new HashSet<>(), 0xFFFF8726);
|
||||
this.request = response.getFoundStack() != null ? new FindItemRequest(response.getFoundStack()) : null;
|
||||
this.expirationTime = System.currentTimeMillis() + FindItConfig.ITEM_HIGHLIGHTING_DURATION * 1000;
|
||||
}
|
||||
|
||||
public class TickListener {
|
||||
|
||||
@SubscribeEvent
|
||||
public void onClientPostTick(TickEvent.ClientTickEvent event) {
|
||||
if (event.phase != TickEvent.Phase.END) {
|
||||
|
||||
if (request == null || event.phase != TickEvent.Phase.END) {
|
||||
return;
|
||||
}
|
||||
WorldClient world = Minecraft.getMinecraft().theWorld;
|
||||
if (world == null) {
|
||||
|
||||
if (Minecraft.getMinecraft().theWorld == null) {
|
||||
return;
|
||||
}
|
||||
GuiScreen screen = Minecraft.getMinecraft().currentScreen;
|
||||
|
||||
final GuiScreen screen = Minecraft.getMinecraft().currentScreen;
|
||||
if (!(screen instanceof GuiContainer)) {
|
||||
return;
|
||||
}
|
||||
GuiContainer gui = (GuiContainer) screen;
|
||||
|
||||
if (highlightData != null) {
|
||||
if (highlightData.windowId == gui.inventorySlots.windowId) {
|
||||
highlightData.updateHighlightedSlots(gui);
|
||||
} else {
|
||||
highlightData = null;
|
||||
final GuiContainer gui = (GuiContainer) screen;
|
||||
final HashSet<Slot> highlightedSlots = new HashSet<>();
|
||||
|
||||
if (System.currentTimeMillis() > expirationTime) {
|
||||
request = null;
|
||||
}
|
||||
|
||||
if (request != null) {
|
||||
@SuppressWarnings("unchecked")
|
||||
List<Slot> slots = gui.inventorySlots.inventorySlots;
|
||||
|
||||
for (Slot slot : slots) {
|
||||
if (!(slot.inventory instanceof InventoryPlayer) && request.equals(slot.getStack())) {
|
||||
highlightedSlots.add(slot);
|
||||
|
||||
if (highlightedSlots.size() > 256) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
slotHighlighter.highlightSlots(gui, highlightedSlots, 0xFFFF8726);
|
||||
}
|
||||
}
|
||||
|
||||
public class GuiListener {
|
||||
|
||||
@SubscribeEvent
|
||||
public void onGuiPostRender(GuiScreenEvent.DrawScreenEvent.Pre event) {
|
||||
if (!(event.gui instanceof GuiContainer)) {
|
||||
return;
|
||||
}
|
||||
GuiContainer gui = (GuiContainer) event.gui;
|
||||
|
||||
if (highlightData != null && highlightData.windowId == gui.inventorySlots.windowId) {
|
||||
SlotHighlighter.highlightSlots(gui, highlightData.highlightedSlots, 0xFFFF8726);
|
||||
}
|
||||
public void renderWorldLastEvent(RenderWorldLastEvent event) {
|
||||
HighlighterHandler.renderHilightedBlock(event);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -122,41 +122,6 @@ public class ClientItemFindService extends ItemFindService {
|
||||
}
|
||||
}
|
||||
|
||||
private static class ContainerHighlightData {
|
||||
|
||||
private final int windowId;
|
||||
private final ItemStack targetStack;
|
||||
private final List<Integer> targetSlots;
|
||||
private final List<Integer> highlightedSlots = new ArrayList<>();
|
||||
|
||||
public ContainerHighlightData(int windowId, ItemStack targetStack, List<Integer> targetSlots) {
|
||||
this.windowId = windowId;
|
||||
this.targetStack = targetStack;
|
||||
this.targetSlots = targetSlots;
|
||||
}
|
||||
|
||||
public void updateHighlightedSlots(GuiContainer gui) {
|
||||
highlightedSlots.clear();
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
List<Slot> slots = (List<Slot>) gui.inventorySlots.inventorySlots;
|
||||
Item targetItem = targetStack.getItem();
|
||||
int targetMeta = targetStack.getItemDamage();
|
||||
|
||||
for (int slotId : targetSlots) {
|
||||
if (slotId >= slots.size()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Slot slot = slots.get(slotId);
|
||||
ItemStack stack = slot.getStack();
|
||||
if (stack != null && stack.getItem() == targetItem && stack.getItemDamage() == targetMeta) {
|
||||
highlightedSlots.add(slotId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static class NEIEventListener {
|
||||
|
||||
@SubscribeEvent
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.gtnh.findit.service.itemfinder;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import com.gtnh.findit.FindIt;
|
||||
import com.gtnh.findit.service.blockfinder.BlockFoundResponse;
|
||||
import com.gtnh.findit.util.ProtoUtils;
|
||||
|
||||
import codechicken.nei.recipe.StackInfo;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
@@ -13,33 +15,62 @@ import io.netty.buffer.ByteBuf;
|
||||
|
||||
public class FindItemRequest implements IMessage {
|
||||
|
||||
private ItemStack stack;
|
||||
private ItemStack targetStack;
|
||||
private FluidStack targetFluidStack;
|
||||
|
||||
public FindItemRequest(ItemStack stack) {
|
||||
this.stack = stack;
|
||||
public FindItemRequest(ItemStack targetStack) {
|
||||
this.targetStack = targetStack;
|
||||
this.targetFluidStack = StackInfo.getFluid(targetStack);
|
||||
}
|
||||
|
||||
public FindItemRequest() {}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
stack = ProtoUtils.readItemStack(buf);
|
||||
targetStack = ProtoUtils.readItemStack(buf);
|
||||
targetFluidStack = StackInfo.getFluid(targetStack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf buf) {
|
||||
ProtoUtils.writeItemStack(buf, stack);
|
||||
ProtoUtils.writeItemStack(buf, targetStack);
|
||||
}
|
||||
|
||||
public ItemStack getStackToFind() {
|
||||
return stack;
|
||||
return targetStack;
|
||||
}
|
||||
|
||||
public boolean hasFluidStack() {
|
||||
return targetFluidStack != null;
|
||||
}
|
||||
|
||||
public boolean equals(FluidStack fluid) {
|
||||
|
||||
if (fluid != null && targetFluidStack != null) {
|
||||
return targetFluidStack.isFluidEqual(fluid);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean equals(ItemStack stack) {
|
||||
|
||||
if (stack == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (targetFluidStack != null) {
|
||||
return targetFluidStack.isFluidEqual(StackInfo.getFluid(stack));
|
||||
}
|
||||
|
||||
return StackInfo.equalItemAndNBT(targetStack, stack, true);
|
||||
}
|
||||
|
||||
public static class Handler implements IMessageHandler<FindItemRequest, BlockFoundResponse> {
|
||||
|
||||
@Override
|
||||
public BlockFoundResponse onMessage(FindItemRequest message, MessageContext ctx) {
|
||||
if (message.stack != null) {
|
||||
if (message.targetStack != null) {
|
||||
FindIt.getItemFindService().handleRequest(ctx.getServerHandler().playerEntity, message);
|
||||
}
|
||||
return null;
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
package com.gtnh.findit.service.itemfinder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import com.gtnh.findit.service.blockfinder.BlockFoundResponse;
|
||||
import com.gtnh.findit.util.ProtoUtils;
|
||||
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
public class HighlightSlotsPacket implements IMessage {
|
||||
|
||||
private int windowId;
|
||||
private ItemStack targetStack;
|
||||
private List<Integer> targetSlots;
|
||||
|
||||
public HighlightSlotsPacket(int windowId, ItemStack targetStack, List<Integer> targetSlots) {
|
||||
this.windowId = windowId;
|
||||
this.targetStack = targetStack;
|
||||
this.targetSlots = targetSlots;
|
||||
}
|
||||
|
||||
public HighlightSlotsPacket() {}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
windowId = buf.readInt();
|
||||
targetStack = ProtoUtils.readItemStack(buf);
|
||||
|
||||
int slotCount = buf.readInt();
|
||||
targetSlots = new ArrayList<>(slotCount);
|
||||
for (int i = 0; i < slotCount; i++) {
|
||||
targetSlots.add((int) buf.readShort());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf buf) {
|
||||
buf.writeInt(windowId);
|
||||
ProtoUtils.writeItemStack(buf, targetStack);
|
||||
|
||||
buf.writeInt(targetSlots.size());
|
||||
targetSlots.forEach(buf::writeShort);
|
||||
}
|
||||
|
||||
public int getWindowId() {
|
||||
return windowId;
|
||||
}
|
||||
|
||||
public ItemStack getTargetStack() {
|
||||
return targetStack;
|
||||
}
|
||||
|
||||
public List<Integer> getTargetSlots() {
|
||||
return targetSlots;
|
||||
}
|
||||
|
||||
public static class Handler implements IMessageHandler<HighlightSlotsPacket, BlockFoundResponse> {
|
||||
|
||||
@Override
|
||||
public BlockFoundResponse onMessage(HighlightSlotsPacket message, MessageContext ctx) {
|
||||
if (message.getTargetStack() != null) {
|
||||
ClientItemFindService.getInstance().handleSlotHighlight(message);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,83 +1,44 @@
|
||||
package com.gtnh.findit.service.itemfinder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.InventoryLargeChest;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.ChunkPosition;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.player.PlayerOpenContainerEvent;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
|
||||
import com.gtnh.findit.FindIt;
|
||||
import com.gtnh.findit.FindItConfig;
|
||||
import com.gtnh.findit.FindItNetwork;
|
||||
import com.gtnh.findit.service.blockfinder.BlockFoundResponse;
|
||||
import com.gtnh.findit.util.WorldUtils;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
|
||||
public class ItemFindService {
|
||||
|
||||
private final Map<EntityPlayerMP, ItemFoundResult> lastResults = new HashMap<>();
|
||||
private final Map<EntityPlayerMP, Integer> lastProcessedContainers = new HashMap<>(); // (player) -> (windowId)
|
||||
|
||||
public ItemFindService() {
|
||||
FindItNetwork.registerMessage(FindItemRequest.Handler.class, FindItemRequest.class, Side.SERVER);
|
||||
FindItNetwork.registerMessage(ItemFoundResponse.Handler.class, ItemFoundResponse.class, Side.CLIENT);
|
||||
FindItNetwork.registerMessage(HighlightSlotsPacket.Handler.class, HighlightSlotsPacket.class, Side.CLIENT);
|
||||
|
||||
MinecraftForge.EVENT_BUS.register(new ContainerListener());
|
||||
}
|
||||
|
||||
private ItemFoundResult getLastFoundResult(EntityPlayerMP player) {
|
||||
ItemFoundResult lastResult = lastResults.get(player);
|
||||
if (lastResult != null && !lastResult.isValid(player.getEntityWorld())) {
|
||||
lastResults.remove(player);
|
||||
return null;
|
||||
}
|
||||
return lastResult;
|
||||
}
|
||||
|
||||
public void handleRequest(EntityPlayerMP player, FindItemRequest request) {
|
||||
|
||||
if (FindIt.getCooldownService().checkSearchCooldown(player)) {
|
||||
return;
|
||||
}
|
||||
|
||||
Item itemToFind = request.getStackToFind().getItem();
|
||||
int metaToFind = request.getStackToFind().getItemDamage();
|
||||
|
||||
List<ChunkPosition> positions = new ArrayList<>();
|
||||
|
||||
tileIter: for (TileEntity tileEntity : WorldUtils.getTileEntitiesAround(player, FindItConfig.SEARCH_RADIUS)) {
|
||||
for (TileEntity tileEntity : WorldUtils.getTileEntitiesAround(player, FindItConfig.SEARCH_RADIUS)) {
|
||||
try {
|
||||
if (!(tileEntity instanceof IInventory)) {
|
||||
continue;
|
||||
}
|
||||
IInventory inventory = (IInventory) tileEntity;
|
||||
|
||||
for (int slot = 0; slot < inventory.getSizeInventory(); slot++) {
|
||||
ItemStack stackInSlot = inventory.getStackInSlot(slot);
|
||||
if (stackInSlot == null || stackInSlot.getItem() != itemToFind) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!itemToFind.getHasSubtypes() || stackInSlot.getItemDamage() == metaToFind) {
|
||||
positions.add(new ChunkPosition(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord));
|
||||
if (positions.size() == FindItConfig.MAX_RESPONSE_SIZE) {
|
||||
break tileIter;
|
||||
}
|
||||
if (tileEntity instanceof IInventory && findItemInInventory((IInventory) tileEntity, request)) {
|
||||
positions.add(new ChunkPosition(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord));
|
||||
if (positions.size() == FindItConfig.MAX_RESPONSE_SIZE) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -86,117 +47,28 @@ public class ItemFindService {
|
||||
}
|
||||
}
|
||||
|
||||
if (!positions.isEmpty()) {
|
||||
ItemFoundResult foundResult = new ItemFindService.ItemFoundResult(
|
||||
request.getStackToFind(),
|
||||
positions,
|
||||
player.getEntityWorld().getTotalWorldTime());
|
||||
|
||||
lastResults.put(player, foundResult);
|
||||
FindItNetwork.CHANNEL.sendTo(new ItemFoundResponse(request.getStackToFind(), positions), player);
|
||||
}
|
||||
FindItNetwork.CHANNEL.sendTo(new BlockFoundResponse(positions), player);
|
||||
FindItNetwork.CHANNEL.sendTo(new ItemFoundResponse(request.getStackToFind()), player);
|
||||
}
|
||||
|
||||
private void processOpenContainer(EntityPlayerMP player) {
|
||||
lastProcessedContainers.put(player, player.openContainer.windowId);
|
||||
Container container = player.openContainer;
|
||||
private boolean findItemInInventory(IInventory inventory, FindItemRequest request) {
|
||||
|
||||
ItemFoundResult lastFoundResult = getLastFoundResult(player);
|
||||
if (lastFoundResult == null) {
|
||||
return;
|
||||
}
|
||||
if (request.hasFluidStack() && inventory instanceof IFluidHandler) {
|
||||
FluidTankInfo[] tankInfo = ((IFluidHandler) inventory).getTankInfo(ForgeDirection.UNKNOWN);
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
List<Slot> slots = (List<Slot>) container.inventorySlots;
|
||||
List<Integer> targetSlots = new ArrayList<>();
|
||||
Set<ChunkPosition> tilePositions = new HashSet<>();
|
||||
|
||||
for (int slotId = 0; slotId < slots.size(); slotId++) {
|
||||
Slot slot = slots.get(slotId);
|
||||
IInventory inventory = getSlotTrueInventory(slot);
|
||||
if (!(inventory instanceof TileEntity)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
TileEntity tile = (TileEntity) inventory;
|
||||
ChunkPosition tilePos = new ChunkPosition(tile.xCoord, tile.yCoord, tile.zCoord);
|
||||
|
||||
if (lastFoundResult.containsPosition(tilePos)) {
|
||||
targetSlots.add(slotId);
|
||||
tilePositions.add(tilePos);
|
||||
|
||||
if (targetSlots.size() >= 256) {
|
||||
break;
|
||||
for (FluidTankInfo info : tankInfo) {
|
||||
if (request.equals(info.fluid)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!targetSlots.isEmpty()) {
|
||||
tilePositions.forEach(lastFoundResult::pollPosition);
|
||||
|
||||
FindItNetwork.CHANNEL.sendTo(
|
||||
new HighlightSlotsPacket(container.windowId, lastFoundResult.foundStack, targetSlots),
|
||||
player);
|
||||
}
|
||||
}
|
||||
|
||||
private IInventory getSlotTrueInventory(Slot slot) {
|
||||
if (slot.inventory instanceof InventoryLargeChest) {
|
||||
InventoryLargeChest largeChest = (InventoryLargeChest) slot.inventory;
|
||||
return slot.slotNumber < largeChest.upperChest.getSizeInventory() ? largeChest.upperChest
|
||||
: largeChest.lowerChest;
|
||||
}
|
||||
return slot.inventory;
|
||||
}
|
||||
|
||||
public class ContainerListener {
|
||||
|
||||
// called every tick to check if player can interact with container
|
||||
@SubscribeEvent
|
||||
public void onContainerOpen(PlayerOpenContainerEvent event) {
|
||||
if (event.entityPlayer.worldObj.isRemote) {
|
||||
return;
|
||||
}
|
||||
EntityPlayerMP player = (EntityPlayerMP) event.entityPlayer;
|
||||
|
||||
// may not spend time to process player inventory
|
||||
if (player.openContainer == player.inventoryContainer) {
|
||||
return;
|
||||
}
|
||||
|
||||
int lastProcessedContainer = lastProcessedContainers.getOrDefault(player, -1);
|
||||
if (player.openContainer.windowId != lastProcessedContainer) {
|
||||
processOpenContainer(player);
|
||||
for (int slot = 0; slot < inventory.getSizeInventory(); slot++) {
|
||||
if (request.equals(inventory.getStackInSlot(slot))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static class ItemFoundResult {
|
||||
|
||||
private final ItemStack foundStack;
|
||||
private final Set<ChunkPosition> positions = new HashSet<>();
|
||||
private final long responseTime;
|
||||
|
||||
public ItemFoundResult(ItemStack foundStack, List<ChunkPosition> positions, long responseTime) {
|
||||
this.foundStack = foundStack;
|
||||
this.positions.addAll(positions);
|
||||
this.responseTime = responseTime;
|
||||
}
|
||||
|
||||
public ItemStack getFoundStack() {
|
||||
return foundStack;
|
||||
}
|
||||
|
||||
public boolean isValid(World world) {
|
||||
return !positions.isEmpty() && world.getTotalWorldTime() - responseTime < 20 * 60; // 60 sec
|
||||
}
|
||||
|
||||
public boolean containsPosition(ChunkPosition position) {
|
||||
return positions.contains(position);
|
||||
}
|
||||
|
||||
public void pollPosition(ChunkPosition position) {
|
||||
positions.remove(position);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,7 @@
|
||||
package com.gtnh.findit.service.itemfinder;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.ChunkPosition;
|
||||
|
||||
import com.gtnh.findit.util.ProtoUtils;
|
||||
|
||||
@@ -18,11 +15,9 @@ import io.netty.buffer.ByteBuf;
|
||||
public class ItemFoundResponse implements IMessage {
|
||||
|
||||
private ItemStack foundStack;
|
||||
private List<ChunkPosition> positions;
|
||||
|
||||
public ItemFoundResponse(ItemStack foundStack, List<ChunkPosition> positions) {
|
||||
public ItemFoundResponse(ItemStack foundStack) {
|
||||
this.foundStack = foundStack;
|
||||
this.positions = positions;
|
||||
}
|
||||
|
||||
public ItemFoundResponse() {}
|
||||
@@ -30,31 +25,23 @@ public class ItemFoundResponse implements IMessage {
|
||||
@Override
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
foundStack = ProtoUtils.readItemStack(buf);
|
||||
positions = ProtoUtils.readPositions(buf);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf buf) {
|
||||
ProtoUtils.writeItemStack(buf, foundStack);
|
||||
ProtoUtils.writePositions(buf, positions);
|
||||
}
|
||||
|
||||
public ItemStack getFoundStack() {
|
||||
return foundStack;
|
||||
}
|
||||
|
||||
public List<ChunkPosition> getPositions() {
|
||||
return positions;
|
||||
}
|
||||
|
||||
public static class Handler implements IMessageHandler<ItemFoundResponse, IMessage> {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IMessage onMessage(ItemFoundResponse message, MessageContext ctx) {
|
||||
if (message.foundStack != null && !message.positions.isEmpty()) {
|
||||
ClientItemFindService.getInstance().handleResponse(Minecraft.getMinecraft().thePlayer, message);
|
||||
}
|
||||
ClientItemFindService.getInstance().handleResponse(Minecraft.getMinecraft().thePlayer, message);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@ package com.gtnh.findit.util;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import codechicken.nei.LayoutManager;
|
||||
import codechicken.nei.NEIClientConfig;
|
||||
import codechicken.nei.guihook.GuiContainerManager;
|
||||
import codechicken.nei.guihook.IContainerInputHandler;
|
||||
@@ -28,15 +27,11 @@ public abstract class AbstractStackFinder implements IContainerInputHandler {
|
||||
return false;
|
||||
}
|
||||
|
||||
LayoutManager layout = LayoutManager.instance();
|
||||
if (layout == null || LayoutManager.itemPanel == null || NEIClientConfig.isHidden()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
ItemStack stack = GuiContainerManager.getStackMouseOver(guiContainer);
|
||||
if (stack == null || stack.getItem() == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return findStack(stack);
|
||||
}
|
||||
|
||||
|
||||
@@ -7,21 +7,16 @@ import net.minecraft.util.Vec3;
|
||||
import net.minecraft.world.ChunkPosition;
|
||||
|
||||
import com.gtnh.findit.service.blockfinder.BlockFoundResponse;
|
||||
import com.gtnh.findit.service.itemfinder.ItemFoundResponse;
|
||||
|
||||
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);
|
||||
Vec3 first = center(targets.remove(0));
|
||||
Vec3 first = center(targets.get(0));
|
||||
|
||||
AxisUtils.AxisPair pair = AxisUtils.calculateAxisPair(playerVec, first);
|
||||
|
||||
|
||||
Reference in new issue
Block a user