From dad262c9cb1800638c89c336ec2d40526b924729 Mon Sep 17 00:00:00 2001 From: Oleg Ivanov Date: Tue, 15 Feb 2022 12:10:52 +0300 Subject: [PATCH] Full mod rewrite (#3) * Full mod rewrite * Remove legacy code * Remove second draw call for position particle --- gradle.properties | 2 +- src/main/java/com/gtnh/findit/FindIt.java | 86 ++++---- .../java/com/gtnh/findit/FindItConfig.java | 43 ++++ .../java/com/gtnh/findit/FindItNetwork.java | 17 ++ .../com/gtnh/findit/fx/ParticlePosition.java | 70 +++++++ .../com/gtnh/findit/fx/SlotHighlighter.java | 67 ++++++ .../gtnh/findit/network/KIFoundItMessage.java | 76 ------- .../gtnh/findit/network/PlzFindItMessage.java | 125 ----------- .../com/gtnh/findit/proxy/FindItClient.java | 72 ------- .../com/gtnh/findit/proxy/FindItCommon.java | 29 --- .../findit/proxy/client/ParticlePosition.java | 35 ---- .../service/blockfinder/BlockFindService.java | 58 ++++++ .../blockfinder/BlockFoundResponse.java | 49 +++++ .../blockfinder/ClientBlockFindService.java | 49 +++++ .../service/blockfinder/FindBlockRequest.java | 54 +++++ .../cooldown/SearchCooldownService.java | 25 +++ .../itemfinder/ClientItemFindService.java | 146 +++++++++++++ .../service/itemfinder/FindItemRequest.java | 47 +++++ .../itemfinder/HighlightSlotsPacket.java | 72 +++++++ .../service/itemfinder/ItemFindService.java | 194 ++++++++++++++++++ .../service/itemfinder/ItemFoundResponse.java | 61 ++++++ .../gtnh/findit/util/AbstractStackFinder.java | 74 +++++++ .../java/com/gtnh/findit/util/ProtoUtils.java | 54 +++++ .../java/com/gtnh/findit/util/WorldUtils.java | 50 +++++ src/main/resources/META-INF/findit_at.cfg | 4 + .../resources/assets/findit/lang/en_US.lang | 3 + .../findit/textures/gui/slot_highlight.png | Bin 0 -> 274 bytes .../resources/assets/findme/lang/en_US.lang | 1 - 28 files changed, 1178 insertions(+), 385 deletions(-) create mode 100644 src/main/java/com/gtnh/findit/FindItConfig.java create mode 100644 src/main/java/com/gtnh/findit/FindItNetwork.java create mode 100644 src/main/java/com/gtnh/findit/fx/ParticlePosition.java create mode 100644 src/main/java/com/gtnh/findit/fx/SlotHighlighter.java delete mode 100644 src/main/java/com/gtnh/findit/network/KIFoundItMessage.java delete mode 100644 src/main/java/com/gtnh/findit/network/PlzFindItMessage.java delete mode 100644 src/main/java/com/gtnh/findit/proxy/FindItClient.java delete mode 100644 src/main/java/com/gtnh/findit/proxy/FindItCommon.java delete mode 100644 src/main/java/com/gtnh/findit/proxy/client/ParticlePosition.java create mode 100644 src/main/java/com/gtnh/findit/service/blockfinder/BlockFindService.java create mode 100644 src/main/java/com/gtnh/findit/service/blockfinder/BlockFoundResponse.java create mode 100644 src/main/java/com/gtnh/findit/service/blockfinder/ClientBlockFindService.java create mode 100644 src/main/java/com/gtnh/findit/service/blockfinder/FindBlockRequest.java create mode 100644 src/main/java/com/gtnh/findit/service/cooldown/SearchCooldownService.java create mode 100644 src/main/java/com/gtnh/findit/service/itemfinder/ClientItemFindService.java create mode 100644 src/main/java/com/gtnh/findit/service/itemfinder/FindItemRequest.java create mode 100644 src/main/java/com/gtnh/findit/service/itemfinder/HighlightSlotsPacket.java create mode 100644 src/main/java/com/gtnh/findit/service/itemfinder/ItemFindService.java create mode 100644 src/main/java/com/gtnh/findit/service/itemfinder/ItemFoundResponse.java create mode 100644 src/main/java/com/gtnh/findit/util/AbstractStackFinder.java create mode 100644 src/main/java/com/gtnh/findit/util/ProtoUtils.java create mode 100644 src/main/java/com/gtnh/findit/util/WorldUtils.java create mode 100644 src/main/resources/META-INF/findit_at.cfg create mode 100644 src/main/resources/assets/findit/lang/en_US.lang create mode 100644 src/main/resources/assets/findit/textures/gui/slot_highlight.png delete mode 100644 src/main/resources/assets/findme/lang/en_US.lang diff --git a/gradle.properties b/gradle.properties index 530484b..7b81eb4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,7 +39,7 @@ apiPackage = # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/ # Example value: mymodid_at.cfg -accessTransformersFile = +accessTransformersFile = findit_at.cfg # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! usesMixins = false diff --git a/src/main/java/com/gtnh/findit/FindIt.java b/src/main/java/com/gtnh/findit/FindIt.java index c59b61e..f4eaed7 100644 --- a/src/main/java/com/gtnh/findit/FindIt.java +++ b/src/main/java/com/gtnh/findit/FindIt.java @@ -1,17 +1,16 @@ package com.gtnh.findit; -import com.gtnh.findit.proxy.FindItCommon; +import codechicken.nei.guihook.GuiContainerManager; +import com.gtnh.findit.service.blockfinder.BlockFindService; +import com.gtnh.findit.service.blockfinder.ClientBlockFindService; +import com.gtnh.findit.service.cooldown.SearchCooldownService; +import com.gtnh.findit.service.itemfinder.ClientItemFindService; +import com.gtnh.findit.service.itemfinder.ItemFindService; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.config.Property; - -import java.io.File; +import cpw.mods.fml.relauncher.Side; @Mod( modid = FindIt.MOD_ID, @@ -27,53 +26,48 @@ public class FindIt { public static final String MOD_NAME = "GRADLETOKEN_MODNAME"; public static final String VERSION = "GRADLETOKEN_VERSION"; - // Config - public static int SEARCH_RADIUS = 16; - - public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(MOD_ID); - @Mod.Instance(MOD_ID) public static FindIt INSTANCE; - @SidedProxy(serverSide = "com.gtnh.findit.proxy.FindItCommon", clientSide = "com.gtnh.findit.proxy.FindItClient") - public static FindItCommon proxy; + private boolean extraUtilitiesLoaded; + private SearchCooldownService cooldownService; + private BlockFindService blockFindService; + private ItemFindService itemFindService; @Mod.EventHandler - public void preinit(FMLPreInitializationEvent event) { - this.setupConfig(event.getSuggestedConfigurationFile()); - proxy.preinit(event); - } + public void preInit(FMLPreInitializationEvent event) { + extraUtilitiesLoaded = Loader.isModLoaded("ExtraUtilities"); + FindItConfig.setup(event.getSuggestedConfigurationFile()); + boolean isClient = event.getSide() == Side.CLIENT; - - @Mod.EventHandler - public void init(FMLInitializationEvent event) { - proxy.init(event); + cooldownService = new SearchCooldownService(); + blockFindService = isClient ? new ClientBlockFindService() : new BlockFindService(); + itemFindService = isClient ? new ClientItemFindService() : new ItemFindService(); } @Mod.EventHandler - public void postinit(FMLPostInitializationEvent event) { - proxy.postinit(event); - } - - public void setupConfig(final File file) { - final Configuration config = new Configuration(file); - try { - // Load config - config.load(); - - // Read props from config - Property searchRadiousProp = config.get(Configuration.CATEGORY_GENERAL, - "SearchRadius", // Property name - "16", // Default value - "Radius to search within"); // Comment - - FindIt.SEARCH_RADIUS = searchRadiousProp.getInt(); - } catch (Exception e) { - // Failed reading/writing, just continue - } finally { - // Save props to config IF config changed - if (config.hasChanged()) config.save(); + public void postInit(FMLPostInitializationEvent event) { + if (event.getSide() == Side.CLIENT && FindIt.isExtraUtilitiesLoaded()) { + GuiContainerManager.inputHandlers.removeIf((inputHandler) -> + inputHandler.getClass().getName().equals("com.rwtema.extrautils.nei.ping.NEIPing") + ); } } + + public static SearchCooldownService getCooldownService() { + return INSTANCE.cooldownService; + } + + public static BlockFindService getBlockFindService() { + return INSTANCE.blockFindService; + } + + public static ItemFindService getItemFindService() { + return INSTANCE.itemFindService; + } + + public static boolean isExtraUtilitiesLoaded() { + return INSTANCE.extraUtilitiesLoaded; + } } diff --git a/src/main/java/com/gtnh/findit/FindItConfig.java b/src/main/java/com/gtnh/findit/FindItConfig.java new file mode 100644 index 0000000..506a1ca --- /dev/null +++ b/src/main/java/com/gtnh/findit/FindItConfig.java @@ -0,0 +1,43 @@ +package com.gtnh.findit; + +import net.minecraftforge.common.config.Configuration; + +import java.io.File; + +public class FindItConfig { + + public static int SEARCH_RADIUS = 16; + public static int SEARCH_COOLDOWN = 10; + public static int MAX_RESPONSE_SIZE = 20; + + public static void setup(final File file) { + final Configuration config = new Configuration(file); + try { + config.load(); + + SEARCH_RADIUS = config.get( + Configuration.CATEGORY_GENERAL, + "SearchRadius", + "16", + "Radius to search within" + ).getInt(); + + SEARCH_COOLDOWN = config.get( + Configuration.CATEGORY_GENERAL, + "SearchCooldown", + "10", + "Search cooldown in ticks" + ).getInt(); + + MAX_RESPONSE_SIZE = config.get( + Configuration.CATEGORY_GENERAL, + "MaxResponseSize", + "20", + "Maximum number of positions that can be displayed by item/block search" + ).getInt(); + } catch (Exception ignore) { + } finally { + if (config.hasChanged()) config.save(); + } + } +} diff --git a/src/main/java/com/gtnh/findit/FindItNetwork.java b/src/main/java/com/gtnh/findit/FindItNetwork.java new file mode 100644 index 0000000..8284d0c --- /dev/null +++ b/src/main/java/com/gtnh/findit/FindItNetwork.java @@ -0,0 +1,17 @@ +package com.gtnh.findit; + +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import cpw.mods.fml.relauncher.Side; + +public class FindItNetwork { + + private static int lastMessageId = -1; + public static final SimpleNetworkWrapper CHANNEL = NetworkRegistry.INSTANCE.newSimpleChannel(FindIt.MOD_ID); + + public static void registerMessage(Class> messageHandler, Class requestMessageType, Side side) { + CHANNEL.registerMessage(messageHandler, requestMessageType, ++lastMessageId, side); + } +} diff --git a/src/main/java/com/gtnh/findit/fx/ParticlePosition.java b/src/main/java/com/gtnh/findit/fx/ParticlePosition.java new file mode 100644 index 0000000..331bea5 --- /dev/null +++ b/src/main/java/com/gtnh/findit/fx/ParticlePosition.java @@ -0,0 +1,70 @@ +package com.gtnh.findit.fx; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntityReddustFX; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.world.ChunkPosition; +import net.minecraft.world.World; +import org.lwjgl.opengl.GL11; + +import java.util.List; + +public class ParticlePosition extends EntityReddustFX { + + private static int validVersion = 0; + + private int version; + + public ParticlePosition(World world, ChunkPosition pos) { + this( + world, + pos.chunkPosX + (0.5 + (world.rand.nextDouble() - 0.5) * world.rand.nextDouble()), + pos.chunkPosY + (0.5 + (world.rand.nextDouble() - 0.5) * world.rand.nextDouble()), + pos.chunkPosZ + (0.5 + (world.rand.nextDouble() - 0.5) * world.rand.nextDouble()) + ); + version = validVersion; + } + + @Override + public void onUpdate() { + if (version == validVersion) { + super.onUpdate(); + } else { + setDead(); + } + } + + public ParticlePosition(World world, double posX, double posY, double posZ) { + super(world, posX, posY, posZ, 255 / 255f, 165 / 255f, 255 / 255f); + this.noClip = true; + this.particleMaxAge *= 10; + this.motionX *= 0.1; + this.motionY *= 0.1; + this.motionZ *= 0.1; + this.particleScale *= 2.0f; + } + + @Override + public void renderParticle(final Tessellator tessellator, float partialTickTime, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { + tessellator.draw(); + + GL11.glDisable(GL11.GL_DEPTH_TEST); + + tessellator.startDrawingQuads(); + super.renderParticle(tessellator, partialTickTime, rotationX, rotationZ, rotationYZ, rotationXY, rotationXZ); + tessellator.draw(); + + GL11.glEnable(GL11.GL_DEPTH_TEST); + tessellator.startDrawingQuads(); + } + + public static void highlightBlocks(World world, List positions) { + validVersion++; + int particleCount = positions.size() <= 10 ? 12 : Math.max(12 - (positions.size() - 10) / 2, 2); + for (ChunkPosition pos : positions) { + for (int i = 0; i < particleCount; ++i) { + Minecraft.getMinecraft().effectRenderer.addEffect(new ParticlePosition(world, pos)); + } + } + } +} diff --git a/src/main/java/com/gtnh/findit/fx/SlotHighlighter.java b/src/main/java/com/gtnh/findit/fx/SlotHighlighter.java new file mode 100644 index 0000000..01d35f6 --- /dev/null +++ b/src/main/java/com/gtnh/findit/fx/SlotHighlighter.java @@ -0,0 +1,67 @@ +package com.gtnh.findit.fx; + +import com.gtnh.findit.FindIt; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.inventory.Slot; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + +import java.util.List; + +public class SlotHighlighter { + + private static final ResourceLocation highlightTexture = new ResourceLocation(FindIt.MOD_ID, "textures/gui/slot_highlight.png"); + + public static void highlightSlots(GuiContainer gui, List slots, int color) { + if (slots.isEmpty()) { + return; + } + + 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; + + GL11.glPushMatrix(); + GL11.glTranslated(gui.guiLeft, gui.guiTop, 0); + + 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(); + } + + private static void highlightSlot(Tessellator tessellator, int x, int y) { + double zLevel = 1; + int x2 = x + 18; + int y2 = y + 18; + + tessellator.addVertexWithUV(x2, y, zLevel, 18 / 32.0, 0); + tessellator.addVertexWithUV(x, y, zLevel, 0, 0); + tessellator.addVertexWithUV(x, y2, zLevel, 0, 18 / 32.0); + tessellator.addVertexWithUV(x2, y2, zLevel, 18 / 32.0, 18 / 32.0); + } +} diff --git a/src/main/java/com/gtnh/findit/network/KIFoundItMessage.java b/src/main/java/com/gtnh/findit/network/KIFoundItMessage.java deleted file mode 100644 index dd68540..0000000 --- a/src/main/java/com/gtnh/findit/network/KIFoundItMessage.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.gtnh.findit.network; - -import com.gtnh.findit.proxy.client.ParticlePosition; -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 cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; -import net.minecraft.network.PacketBuffer; -import net.minecraft.world.ChunkPosition; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; - -public class KIFoundItMessage implements IMessage { - - private List positions; - - public KIFoundItMessage(List positions) { - this.positions = positions; - } - - public KIFoundItMessage() { - } - - @Override - public void fromBytes(ByteBuf buf) { - PacketBuffer packetBuffer = new PacketBuffer(buf); - int amount = packetBuffer.readInt(); - positions = new ArrayList<>(); - while (amount > 0) { - final int x = packetBuffer.readInt(); - final int y = packetBuffer.readUnsignedByte(); - final int z = packetBuffer.readInt(); - positions.add(new ChunkPosition(x, y, z)); - --amount; - } - } - - @Override - public void toBytes(ByteBuf buf) { - PacketBuffer packetBuffer = new PacketBuffer(buf); - packetBuffer.writeInt(positions.size()); - for (ChunkPosition pos : positions) { - packetBuffer.writeInt(pos.chunkPosX); - packetBuffer.writeByte(pos.chunkPosY); - packetBuffer.writeInt(pos.chunkPosZ); - } - } - - public static class Handler implements IMessageHandler { - - @SideOnly(Side.CLIENT) - @Override - public IMessage onMessage(KIFoundItMessage message, MessageContext ctx) { - Minecraft.getMinecraft().thePlayer.closeScreen(); - World world = Minecraft.getMinecraft().thePlayer.worldObj; - for (ChunkPosition pos : message.positions) { - for (int i = 0; i < 2; ++i) - Minecraft.getMinecraft().effectRenderer.addEffect( - new ParticlePosition( - Minecraft.getMinecraft().thePlayer.worldObj, - pos.chunkPosX + (0.5 + (world.rand.nextDouble() - 0.5) * world.rand.nextDouble()), - pos.chunkPosY + (0.5 + (world.rand.nextDouble() - 0.5) * world.rand.nextDouble()), - pos.chunkPosZ + (0.5 + (world.rand.nextDouble() - 0.5) * world.rand.nextDouble()) - ) - ); - } - return null; - } - } - -} diff --git a/src/main/java/com/gtnh/findit/network/PlzFindItMessage.java b/src/main/java/com/gtnh/findit/network/PlzFindItMessage.java deleted file mode 100644 index 1811478..0000000 --- a/src/main/java/com/gtnh/findit/network/PlzFindItMessage.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.gtnh.findit.network; - -import com.gtnh.findit.FindIt; -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 gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.ChunkPosition; -import net.minecraft.world.World; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.WeakHashMap; - -public class PlzFindItMessage implements IMessage { - static WeakHashMap lastCalled = new WeakHashMap<>(); - - private ItemStack stack; - - public PlzFindItMessage(ItemStack stack) { - this.stack = stack; - } - - public PlzFindItMessage() { - } - - public static List getBlockPosInAABB(AxisAlignedBB axisAlignedBB) { - List blocks = new ArrayList<>(); - - int maxY = (int) Math.round(axisAlignedBB.maxY), - maxX = (int) Math.round(axisAlignedBB.maxX), - maxZ = (int) Math.round(axisAlignedBB.maxZ); - - for (int y = (int) Math.round(axisAlignedBB.minY); y < maxY; ++y) { - for (int x = (int) Math.round(axisAlignedBB.minX); x < maxX; ++x) { - for (int z = (int) Math.round(axisAlignedBB.minZ); z < maxZ; ++z) { - blocks.add(new ChunkPosition(x, y, z)); - } - } - } - return blocks; - } - - @Override - public void fromBytes(ByteBuf buf) { - PacketBuffer packetBuffer = new PacketBuffer(buf); - stack = null; - try { - stack = packetBuffer.readItemStackFromBuffer(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void toBytes(ByteBuf buf) { - PacketBuffer packetBuffer = new PacketBuffer(buf); - try { - packetBuffer.writeItemStackToBuffer(stack); - } catch (IOException e) { - e.printStackTrace(); - } - } - - public static class Handler implements IMessageHandler { - - @Override - public KIFoundItMessage onMessage(PlzFindItMessage message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - World world = player.worldObj; - - // Don't let people spam this, otherwise bad performance and they'll probably get disconnected - final long time = world.getTotalWorldTime(); - final Long lastCalled = PlzFindItMessage.lastCalled.get(player); - if (lastCalled != null && time - lastCalled < 10L) { - return null; - } - - final Item toFind = message.stack.getItem(); - final int metaToFind = message.stack.getItemDamage(); - - final double x = player.posX, - y = player.posY, - z = player.posZ; - - int r = FindIt.SEARCH_RADIUS; - AxisAlignedBB box = AxisAlignedBB.getBoundingBox(x - r, y - r, z -r, x + r, y + r, z + r); - - List posList = new ArrayList<>(); - for (ChunkPosition pos : getBlockPosInAABB(box)) { - try { - final TileEntity tileEntity = world.getTileEntity(pos.chunkPosX, pos.chunkPosY, pos.chunkPosZ); - if(tileEntity == null) continue; - - final Item tileItem = Item.getItemFromBlock(tileEntity.getBlockType()); - if (tileItem == null) continue; - - final int tileMeta; - if (tileEntity instanceof IGregTechTileEntity) - tileMeta = ((IGregTechTileEntity)tileEntity).getMetaTileID(); - else - tileMeta = world.getBlockMetadata(pos.chunkPosX, pos.chunkPosY, pos.chunkPosZ); - - if (toFind.equals(tileItem) && metaToFind == tileMeta) { - posList.add(pos); - } - } catch (NullPointerException e) { - e.printStackTrace(); - } - } - if (!posList.isEmpty()) - FindIt.NETWORK.sendTo(new KIFoundItMessage(posList), player); - - return null; - } - } -} diff --git a/src/main/java/com/gtnh/findit/proxy/FindItClient.java b/src/main/java/com/gtnh/findit/proxy/FindItClient.java deleted file mode 100644 index 8d5a0bf..0000000 --- a/src/main/java/com/gtnh/findit/proxy/FindItClient.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.gtnh.findit.proxy; - -import codechicken.nei.LayoutManager; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.api.API; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.guihook.IContainerInputHandler; -import com.gtnh.findit.FindIt; -import com.gtnh.findit.network.PlzFindItMessage; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import org.lwjgl.input.Keyboard; - - -public class FindItClient extends FindItCommon implements IContainerInputHandler{ - - @Override - public void preinit(FMLPreInitializationEvent event) { - super.preinit(event); - API.addKeyBind("gui.findit", Keyboard.KEY_Y); - GuiContainerManager.addInputHandler((IContainerInputHandler)new FindItClient()); - } - - public boolean keyTyped(final GuiContainer window, final char c, final int k) { - final int keyBinding = NEIClientConfig.getKeyBinding("gui.findit"); - if (k != keyBinding) { - return false; - } - - final LayoutManager layout = LayoutManager.instance(); - if (layout == null || LayoutManager.itemPanel == null || NEIClientConfig.isHidden()) { - return false; - } - - final ItemStack stack = GuiContainerManager.getStackMouseOver(window); - if (stack == null || stack.getItem() == null) { - return false; - } - - FindIt.NETWORK.sendToServer(new PlzFindItMessage(stack)); - return true; - } - - public void onKeyTyped(final GuiContainer guiContainer, final char c, final int i) { - } - - public boolean lastKeyTyped(final GuiContainer guiContainer, final char c, final int i) { - return false; - } - - public boolean mouseClicked(final GuiContainer guiContainer, final int i, final int i1, final int i2) { - return false; - } - - public void onMouseClicked(final GuiContainer guiContainer, final int i, final int i1, final int i2) { - } - - public void onMouseUp(final GuiContainer guiContainer, final int i, final int i1, final int i2) { - } - - public boolean mouseScrolled(final GuiContainer guiContainer, final int i, final int i1, final int i2) { - return false; - } - - public void onMouseScrolled(final GuiContainer guiContainer, final int i, final int i1, final int i2) { - } - - public void onMouseDragged(final GuiContainer guiContainer, final int i, final int i1, final int i2, final long l) { - } - -} diff --git a/src/main/java/com/gtnh/findit/proxy/FindItCommon.java b/src/main/java/com/gtnh/findit/proxy/FindItCommon.java deleted file mode 100644 index 8dc9032..0000000 --- a/src/main/java/com/gtnh/findit/proxy/FindItCommon.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.gtnh.findit.proxy; - -import com.gtnh.findit.network.KIFoundItMessage; -import com.gtnh.findit.network.PlzFindItMessage; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.relauncher.Side; - -import static com.gtnh.findit.FindIt.NETWORK; - -public class FindItCommon { - - - public void preinit(FMLPreInitializationEvent event) { - NETWORK.registerMessage(PlzFindItMessage.Handler.class, PlzFindItMessage.class, 0, Side.SERVER); - NETWORK.registerMessage(KIFoundItMessage.Handler.class, KIFoundItMessage.class, 1, Side.CLIENT); - } - - - public void init(FMLInitializationEvent event) { - - } - - - public void postinit(FMLPostInitializationEvent event) { - - } -} diff --git a/src/main/java/com/gtnh/findit/proxy/client/ParticlePosition.java b/src/main/java/com/gtnh/findit/proxy/client/ParticlePosition.java deleted file mode 100644 index dfb89f8..0000000 --- a/src/main/java/com/gtnh/findit/proxy/client/ParticlePosition.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.gtnh.findit.proxy.client; - -import net.minecraft.client.particle.EntityReddustFX; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; - -public class ParticlePosition extends EntityReddustFX { - - public ParticlePosition(World world, double posX, double posY, double posZ) { - super(world, posX, posY, posZ, 1.0f, 1.0f, 1.0f); - this.noClip = true; - this.particleMaxAge *= 10; - this.motionX *= 0.1; - this.motionY *= 0.1; - this.motionZ *= 0.1; - this.particleScale *= 2.0f; - } - - @Override - public void renderParticle(final Tessellator tessellator, float partialTickTime, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { - super.renderParticle(tessellator, partialTickTime, rotationX, rotationZ, rotationYZ, rotationXY, rotationXZ); - tessellator.draw(); - - GL11.glDisable(2929 /*GL_DEPTH_TEST*/); - - tessellator.startDrawingQuads(); - super.renderParticle(tessellator, partialTickTime, rotationX, rotationZ, rotationYZ, rotationXY, rotationXZ); - tessellator.draw(); - - GL11.glEnable(2929 /*GL_DEPTH_TEST*/); - tessellator.startDrawingQuads(); - - } -} diff --git a/src/main/java/com/gtnh/findit/service/blockfinder/BlockFindService.java b/src/main/java/com/gtnh/findit/service/blockfinder/BlockFindService.java new file mode 100644 index 0000000..36f9b2d --- /dev/null +++ b/src/main/java/com/gtnh/findit/service/blockfinder/BlockFindService.java @@ -0,0 +1,58 @@ +package com.gtnh.findit.service.blockfinder; + +import com.gtnh.findit.FindIt; +import com.gtnh.findit.FindItConfig; +import com.gtnh.findit.FindItNetwork; +import com.gtnh.findit.util.WorldUtils; +import cpw.mods.fml.relauncher.Side; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.ChunkPosition; + +import java.util.ArrayList; +import java.util.List; + +public class BlockFindService { + + public BlockFindService() { + FindItNetwork.registerMessage(FindBlockRequest.Handler.class, FindBlockRequest.class, Side.SERVER); + FindItNetwork.registerMessage(BlockFoundResponse.Handler.class, BlockFoundResponse.class, Side.CLIENT); + } + public void handleRequest(EntityPlayerMP player, FindBlockRequest request) { + if (FindIt.getCooldownService().checkSearchCooldown(player)) { + return; + } + + List positions = new ArrayList<>(); + for (TileEntity tileEntity : WorldUtils.getTileEntitiesAround(player, FindItConfig.SEARCH_RADIUS)) { + try { + Block tileBlock = tileEntity.getBlockType(); + if (!request.getBlockToFind().equals(tileBlock)) { + continue; + } + + int tileMeta; + if (tileEntity instanceof IGregTechTileEntity) { + tileMeta = ((IGregTechTileEntity) tileEntity).getMetaTileID(); + } else { + tileMeta = tileEntity.getBlockMetadata(); + } + + if (request.getMetaToFind() == tileMeta) { + positions.add(new ChunkPosition(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord)); + if (positions.size() == FindItConfig.MAX_RESPONSE_SIZE) { + break; + } + } + } catch (NullPointerException e) { + e.printStackTrace(); + } + } + + if (!positions.isEmpty()) { + FindItNetwork.CHANNEL.sendTo(new BlockFoundResponse(positions), player); + } + } +} diff --git a/src/main/java/com/gtnh/findit/service/blockfinder/BlockFoundResponse.java b/src/main/java/com/gtnh/findit/service/blockfinder/BlockFoundResponse.java new file mode 100644 index 0000000..2104da0 --- /dev/null +++ b/src/main/java/com/gtnh/findit/service/blockfinder/BlockFoundResponse.java @@ -0,0 +1,49 @@ +package com.gtnh.findit.service.blockfinder; + +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 cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import net.minecraft.client.Minecraft; +import net.minecraft.world.ChunkPosition; + +import java.util.List; + +public class BlockFoundResponse implements IMessage { + + private List positions; + + public BlockFoundResponse(List positions) { + this.positions = positions; + } + + public BlockFoundResponse() { + } + + public List getPositions() { + return positions; + } + + @Override + public void fromBytes(ByteBuf buf) { + positions = ProtoUtils.readPositions(buf); + } + + @Override + public void toBytes(ByteBuf buf) { + ProtoUtils.writePositions(buf, positions); + } + + public static class Handler implements IMessageHandler { + + @SideOnly(Side.CLIENT) + @Override + public IMessage onMessage(BlockFoundResponse message, MessageContext ctx) { + ClientBlockFindService.getInstance().handleResponse(Minecraft.getMinecraft().thePlayer, message); + return null; + } + } +} diff --git a/src/main/java/com/gtnh/findit/service/blockfinder/ClientBlockFindService.java b/src/main/java/com/gtnh/findit/service/blockfinder/ClientBlockFindService.java new file mode 100644 index 0000000..eea8f20 --- /dev/null +++ b/src/main/java/com/gtnh/findit/service/blockfinder/ClientBlockFindService.java @@ -0,0 +1,49 @@ +package com.gtnh.findit.service.blockfinder; + +import codechicken.nei.api.API; +import codechicken.nei.guihook.GuiContainerManager; +import com.gtnh.findit.FindIt; +import com.gtnh.findit.FindItNetwork; +import com.gtnh.findit.fx.ParticlePosition; +import com.gtnh.findit.util.AbstractStackFinder; +import net.minecraft.block.Block; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import org.lwjgl.input.Keyboard; + +public class ClientBlockFindService extends BlockFindService { + + public ClientBlockFindService() { + API.addKeyBind("gui.findit.find_block", Keyboard.KEY_Y); + GuiContainerManager.addInputHandler(new BlockFindInputHandler()); + } + + public void handleResponse(EntityClientPlayerMP player, BlockFoundResponse response) { + player.closeScreen(); + ParticlePosition.highlightBlocks(player.worldObj, response.getPositions()); + } + + private static class BlockFindInputHandler extends AbstractStackFinder { + + @Override + protected String getKeyBindId() { + return "gui.findit.find_block"; + } + + @Override + protected boolean findStack(ItemStack stack) { + Block block = Block.getBlockFromItem(stack.getItem()); + if (block == Blocks.air) { + return false; + } + + FindItNetwork.CHANNEL.sendToServer(new FindBlockRequest(block, stack.getItemDamage())); + return true; + } + } + + public static ClientBlockFindService getInstance() { + return (ClientBlockFindService) FindIt.getBlockFindService(); + } +} \ No newline at end of file diff --git a/src/main/java/com/gtnh/findit/service/blockfinder/FindBlockRequest.java b/src/main/java/com/gtnh/findit/service/blockfinder/FindBlockRequest.java new file mode 100644 index 0000000..6825b5a --- /dev/null +++ b/src/main/java/com/gtnh/findit/service/blockfinder/FindBlockRequest.java @@ -0,0 +1,54 @@ +package com.gtnh.findit.service.blockfinder; + +import com.gtnh.findit.FindIt; +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; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; + +public class FindBlockRequest implements IMessage { + + private Block blockToFind; + private int metaToFind; + + public FindBlockRequest(Block block, int meta) { + this.blockToFind = block; + this.metaToFind = meta; + } + + public FindBlockRequest() { + } + + @Override + public void fromBytes(ByteBuf buf) { + blockToFind = Block.getBlockById(buf.readShort()); + metaToFind = buf.readShort(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeShort(Block.getIdFromBlock(blockToFind)); + buf.writeShort(metaToFind); + } + + public Block getBlockToFind() { + return blockToFind; + } + + public int getMetaToFind() { + return metaToFind; + } + + public static class Handler implements IMessageHandler { + + @Override + public BlockFoundResponse onMessage(FindBlockRequest message, MessageContext ctx) { + if (message.blockToFind != null && message.blockToFind != Blocks.air) { + FindIt.getBlockFindService().handleRequest(ctx.getServerHandler().playerEntity, message); + } + return null; + } + } +} diff --git a/src/main/java/com/gtnh/findit/service/cooldown/SearchCooldownService.java b/src/main/java/com/gtnh/findit/service/cooldown/SearchCooldownService.java new file mode 100644 index 0000000..59f897c --- /dev/null +++ b/src/main/java/com/gtnh/findit/service/cooldown/SearchCooldownService.java @@ -0,0 +1,25 @@ +package com.gtnh.findit.service.cooldown; + +import com.gtnh.findit.FindItConfig; +import net.minecraft.entity.player.EntityPlayerMP; + +import java.util.WeakHashMap; + +public class SearchCooldownService { + + private final WeakHashMap lastSearchTime = new WeakHashMap<>(); + + /** + * @return true if player has active cooldown + */ + public boolean checkSearchCooldown(EntityPlayerMP player) { + long time = player.getEntityWorld().getTotalWorldTime(); + Long lastTime = lastSearchTime.get(player); + + if (lastTime != null && time - lastTime < FindItConfig.SEARCH_COOLDOWN) { + return true; + } + lastSearchTime.put(player, time); + return false; + } +} diff --git a/src/main/java/com/gtnh/findit/service/itemfinder/ClientItemFindService.java b/src/main/java/com/gtnh/findit/service/itemfinder/ClientItemFindService.java new file mode 100644 index 0000000..6d1700f --- /dev/null +++ b/src/main/java/com/gtnh/findit/service/itemfinder/ClientItemFindService.java @@ -0,0 +1,146 @@ +package com.gtnh.findit.service.itemfinder; + +import codechicken.nei.api.API; +import codechicken.nei.guihook.GuiContainerManager; +import com.gtnh.findit.FindIt; +import com.gtnh.findit.FindItNetwork; +import com.gtnh.findit.fx.ParticlePosition; +import com.gtnh.findit.fx.SlotHighlighter; +import com.gtnh.findit.util.AbstractStackFinder; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +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.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.common.MinecraftForge; +import org.lwjgl.input.Keyboard; + +import java.util.ArrayList; +import java.util.List; + +public class ClientItemFindService extends ItemFindService { + + private ContainerHighlightData highlightData = null; + + public ClientItemFindService() { + if (!FindIt.isExtraUtilitiesLoaded()) { + API.addKeyBind("gui.findit.find_item", Keyboard.KEY_T); + } + GuiContainerManager.addInputHandler(new ItemFindInputHandler()); + + MinecraftForge.EVENT_BUS.register(new GuiListener()); + FMLCommonHandler.instance().bus().register(new TickListener()); + } + + public void handleResponse(EntityClientPlayerMP player, ItemFoundResponse response) { + World world = player.worldObj; + + player.closeScreen(); + ParticlePosition.highlightBlocks(world, response.getPositions()); + } + + public void handleSlotHighlight(HighlightSlotsPacket packet) { + highlightData = new ContainerHighlightData(packet.getWindowId(), packet.getTargetStack(), packet.getTargetSlots()); + } + + public class TickListener { + + @SubscribeEvent + public void onClientPostTick(TickEvent.ClientTickEvent event) { + if (event.phase != TickEvent.Phase.END) { + return; + } + WorldClient world = Minecraft.getMinecraft().theWorld; + if (world == null) { + return; + } + 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; + } + } + } + } + + 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); + } + } + } + + private static class ItemFindInputHandler extends AbstractStackFinder { + + @Override + protected String getKeyBindId() { + return FindIt.isExtraUtilitiesLoaded() ? "gui.xu_ping" : "gui.findit.find_item"; + } + + @Override + protected boolean findStack(ItemStack stack) { + FindItNetwork.CHANNEL.sendToServer(new FindItemRequest(stack)); + return true; + } + } + + private static class ContainerHighlightData { + private final int windowId; + private final ItemStack targetStack; + private final List targetSlots; + private final List highlightedSlots = new ArrayList<>(); + + public ContainerHighlightData(int windowId, ItemStack targetStack, List targetSlots) { + this.windowId = windowId; + this.targetStack = targetStack; + this.targetSlots = targetSlots; + } + + public void updateHighlightedSlots(GuiContainer gui) { + highlightedSlots.clear(); + + List slots = (List) 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 ClientItemFindService getInstance() { + return (ClientItemFindService) FindIt.getItemFindService(); + } +} \ No newline at end of file diff --git a/src/main/java/com/gtnh/findit/service/itemfinder/FindItemRequest.java b/src/main/java/com/gtnh/findit/service/itemfinder/FindItemRequest.java new file mode 100644 index 0000000..fcd80a6 --- /dev/null +++ b/src/main/java/com/gtnh/findit/service/itemfinder/FindItemRequest.java @@ -0,0 +1,47 @@ +package com.gtnh.findit.service.itemfinder; + +import com.gtnh.findit.FindIt; +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; +import net.minecraft.item.ItemStack; + +public class FindItemRequest implements IMessage { + + private ItemStack stack; + + public FindItemRequest(ItemStack stack) { + this.stack = stack; + } + + public FindItemRequest() { + } + + @Override + public void fromBytes(ByteBuf buf) { + stack = ProtoUtils.readItemStack(buf); + } + + @Override + public void toBytes(ByteBuf buf) { + ProtoUtils.writeItemStack(buf, stack); + } + + public ItemStack getStackToFind() { + return stack; + } + + public static class Handler implements IMessageHandler { + + @Override + public BlockFoundResponse onMessage(FindItemRequest message, MessageContext ctx) { + if (message.stack != null) { + FindIt.getItemFindService().handleRequest(ctx.getServerHandler().playerEntity, message); + } + return null; + } + } +} diff --git a/src/main/java/com/gtnh/findit/service/itemfinder/HighlightSlotsPacket.java b/src/main/java/com/gtnh/findit/service/itemfinder/HighlightSlotsPacket.java new file mode 100644 index 0000000..29250a1 --- /dev/null +++ b/src/main/java/com/gtnh/findit/service/itemfinder/HighlightSlotsPacket.java @@ -0,0 +1,72 @@ +package com.gtnh.findit.service.itemfinder; + +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; +import net.minecraft.item.ItemStack; + +import java.util.ArrayList; +import java.util.List; + +public class HighlightSlotsPacket implements IMessage { + + private int windowId; + private ItemStack targetStack; + private List targetSlots; + + public HighlightSlotsPacket(int windowId, ItemStack targetStack, List 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 getTargetSlots() { + return targetSlots; + } + + public static class Handler implements IMessageHandler { + + @Override + public BlockFoundResponse onMessage(HighlightSlotsPacket message, MessageContext ctx) { + if (message.getTargetStack() != null) { + ClientItemFindService.getInstance().handleSlotHighlight(message); + } + return null; + } + } +} \ No newline at end of file diff --git a/src/main/java/com/gtnh/findit/service/itemfinder/ItemFindService.java b/src/main/java/com/gtnh/findit/service/itemfinder/ItemFindService.java new file mode 100644 index 0000000..7294682 --- /dev/null +++ b/src/main/java/com/gtnh/findit/service/itemfinder/ItemFindService.java @@ -0,0 +1,194 @@ +package com.gtnh.findit.service.itemfinder; + +import com.gtnh.findit.FindIt; +import com.gtnh.findit.FindItConfig; +import com.gtnh.findit.FindItNetwork; +import com.gtnh.findit.util.WorldUtils; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +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 java.util.*; + +public class ItemFindService { + + private final Map lastResults = new HashMap<>(); + private final Map 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 positions = new ArrayList<>(); + + tileIter: + 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; + } + break; + } + } + } catch (NullPointerException e) { + e.printStackTrace(); + } + } + + 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); + } + } + + private void processOpenContainer(EntityPlayerMP player) { + lastProcessedContainers.put(player, player.openContainer.windowId); + Container container = player.openContainer; + + ItemFoundResult lastFoundResult = getLastFoundResult(player); + if (lastFoundResult == null) { + return; + } + + List slots = (List) container.inventorySlots; + List targetSlots = new ArrayList<>(); + Set 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; + } + } + } + + 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); + } + } + } + + public static class ItemFoundResult { + private final ItemStack foundStack; + private final Set positions = new HashSet<>(); + private final long responseTime; + + public ItemFoundResult(ItemStack foundStack, List 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); + } + } +} diff --git a/src/main/java/com/gtnh/findit/service/itemfinder/ItemFoundResponse.java b/src/main/java/com/gtnh/findit/service/itemfinder/ItemFoundResponse.java new file mode 100644 index 0000000..581a11d --- /dev/null +++ b/src/main/java/com/gtnh/findit/service/itemfinder/ItemFoundResponse.java @@ -0,0 +1,61 @@ +package com.gtnh.findit.service.itemfinder; + +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 cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.world.ChunkPosition; + +import java.util.List; + +public class ItemFoundResponse implements IMessage { + + private ItemStack foundStack; + private List positions; + + public ItemFoundResponse(ItemStack foundStack, List positions) { + this.foundStack = foundStack; + this.positions = positions; + } + + public ItemFoundResponse() { + } + + @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 getPositions() { + return positions; + } + + public static class Handler implements IMessageHandler { + + @SideOnly(Side.CLIENT) + @Override + public IMessage onMessage(ItemFoundResponse message, MessageContext ctx) { + if (message.foundStack != null && !message.positions.isEmpty()) { + ClientItemFindService.getInstance().handleResponse(Minecraft.getMinecraft().thePlayer, message); + } + return null; + } + } + +} diff --git a/src/main/java/com/gtnh/findit/util/AbstractStackFinder.java b/src/main/java/com/gtnh/findit/util/AbstractStackFinder.java new file mode 100644 index 0000000..6f00b58 --- /dev/null +++ b/src/main/java/com/gtnh/findit/util/AbstractStackFinder.java @@ -0,0 +1,74 @@ +package com.gtnh.findit.util; + +import codechicken.nei.LayoutManager; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.guihook.IContainerInputHandler; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; + +public abstract class AbstractStackFinder implements IContainerInputHandler { + + protected abstract String getKeyBindId(); + + protected abstract boolean findStack(ItemStack stack); + + @Override + public boolean keyTyped(GuiContainer window, char c, int key) { + int keyBinding = NEIClientConfig.getKeyBinding(getKeyBindId()); + if (key != keyBinding) { + return false; + } + + LayoutManager layout = LayoutManager.instance(); + if (layout == null || LayoutManager.itemPanel == null || NEIClientConfig.isHidden()) { + return false; + } + + ItemStack stack = GuiContainerManager.getStackMouseOver(window); + if (stack == null || stack.getItem() == null) { + return false; + } + return findStack(stack); + } + + @Override + public void onKeyTyped(GuiContainer guiContainer, char c, int i) { + + } + + @Override + public boolean lastKeyTyped(GuiContainer guiContainer, char c, int i) { + return false; + } + + @Override + public boolean mouseClicked(GuiContainer guiContainer, int i, int i1, int i2) { + return false; + } + + @Override + public void onMouseClicked(GuiContainer guiContainer, int i, int i1, int i2) { + + } + + @Override + public void onMouseUp(GuiContainer guiContainer, int i, int i1, int i2) { + + } + + @Override + public boolean mouseScrolled(GuiContainer guiContainer, int i, int i1, int i2) { + return false; + } + + @Override + public void onMouseScrolled(GuiContainer guiContainer, int i, int i1, int i2) { + + } + + @Override + public void onMouseDragged(GuiContainer guiContainer, int i, int i1, int i2, long l) { + + } +} diff --git a/src/main/java/com/gtnh/findit/util/ProtoUtils.java b/src/main/java/com/gtnh/findit/util/ProtoUtils.java new file mode 100644 index 0000000..0735b5c --- /dev/null +++ b/src/main/java/com/gtnh/findit/util/ProtoUtils.java @@ -0,0 +1,54 @@ +package com.gtnh.findit.util; + +import io.netty.buffer.ByteBuf; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; +import net.minecraft.world.ChunkPosition; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +public class ProtoUtils { + + public static void writePositions(ByteBuf buf, List positions) { + buf.writeInt(positions.size()); + for (ChunkPosition pos : positions) { + buf.writeInt(pos.chunkPosX); + buf.writeByte(pos.chunkPosY); + buf.writeInt(pos.chunkPosZ); + } + } + + public static void writeItemStack(ByteBuf buf, ItemStack stack) { + PacketBuffer packetBuffer = new PacketBuffer(buf); + try { + packetBuffer.writeItemStackToBuffer(stack); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public static List readPositions(ByteBuf buf) { + int amount = buf.readInt(); + List positions = new ArrayList<>(); + while (amount > 0) { + final int x = buf.readInt(); + final int y = buf.readUnsignedByte(); + final int z = buf.readInt(); + positions.add(new ChunkPosition(x, y, z)); + --amount; + } + return positions; + } + + public static ItemStack readItemStack(ByteBuf buf) { + PacketBuffer packetBuffer = new PacketBuffer(buf); + try { + return packetBuffer.readItemStackFromBuffer(); + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } +} diff --git a/src/main/java/com/gtnh/findit/util/WorldUtils.java b/src/main/java/com/gtnh/findit/util/WorldUtils.java new file mode 100644 index 0000000..a92f4db --- /dev/null +++ b/src/main/java/com/gtnh/findit/util/WorldUtils.java @@ -0,0 +1,50 @@ +package com.gtnh.findit.util; + +import net.minecraft.entity.Entity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.ChunkPosition; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class WorldUtils { + + public static List getTileEntitiesAround(Entity entity, int r) { + int x = (int) Math.floor(entity.posX); + int y = (int) entity.posY; + int z = (int) Math.floor(entity.posZ); + return getTileEntitiesInRegion(entity.worldObj, x - r, y - r, z - r, x + r + 1, y + r + 1, z + r + 1); + } + + /** + * @param (x1,y1,z1) included + * @param (x2,y2,z2) excluded + */ + public static List getTileEntitiesInRegion(World world, int x1, int y1, int z1, int x2, int y2, int z2) { + List result = new ArrayList<>(); + int cx1 = x2 >> 4; + int cz1 = z2 >> 4; + + for (int cx = x1 >> 4; cx <= cx1; cx++) { + for (int cz = z1 >> 4; cz <= cz1; cz++) { + Chunk chunk = world.getChunkFromChunkCoords(cx, cz); + if (chunk != null) { + Map tiles = chunk.chunkTileEntityMap; + for (TileEntity tile : tiles.values()) { + if (!tile.isInvalid() + && tile.xCoord >= x1 && tile.xCoord < x2 + && tile.yCoord >= y1 && tile.yCoord < y2 + && tile.zCoord >= z1 && tile.zCoord < z2) { + result.add(tile); + } + } + } + } + } + + return result; + } +} diff --git a/src/main/resources/META-INF/findit_at.cfg b/src/main/resources/META-INF/findit_at.cfg new file mode 100644 index 0000000..45458de --- /dev/null +++ b/src/main/resources/META-INF/findit_at.cfg @@ -0,0 +1,4 @@ +public net.minecraft.client.gui.inventory.GuiContainer field_147003_i #guiLeft +public net.minecraft.client.gui.inventory.GuiContainer field_147009_r #guiTop +public net.minecraft.inventory.InventoryLargeChest field_70477_b #upperChest +public net.minecraft.inventory.InventoryLargeChest field_70478_c #lowerChest \ No newline at end of file diff --git a/src/main/resources/assets/findit/lang/en_US.lang b/src/main/resources/assets/findit/lang/en_US.lang new file mode 100644 index 0000000..b67144b --- /dev/null +++ b/src/main/resources/assets/findit/lang/en_US.lang @@ -0,0 +1,3 @@ +nei.options.keys.gui.findit=Find-It Keys +nei.options.keys.gui.findit.find_block=Search For Block Nearby +nei.options.keys.gui.findit.find_item=Search For Item In Nearby Inventories diff --git a/src/main/resources/assets/findit/textures/gui/slot_highlight.png b/src/main/resources/assets/findit/textures/gui/slot_highlight.png new file mode 100644 index 0000000000000000000000000000000000000000..a684644cf61b9df6e4f84fb8da9f97d4819c9666 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSK$uZf!>a)(xZKmlF(ktM?KDHKBMJhp$4$(($(_GksmPt5 zn4LV;pjmp7uGl2~s5g6@I9dKb?pAus++q0ci_l^2B~wmR`!AhRTy`#S?biR_X3sHh z74Z3AbL1GaP@fXh^@6l8i{k7A)^z5W-&`&U&*s%DGp#-(DHzeob%5!`%SINrIdUEi zhkpt=H?X+fSDy|DKoQr#f3l018^k9Zwe(q` Q33M`pr>mdKI;Vst0N&1G2><{9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/findme/lang/en_US.lang b/src/main/resources/assets/findme/lang/en_US.lang deleted file mode 100644 index 855eb49..0000000 --- a/src/main/resources/assets/findme/lang/en_US.lang +++ /dev/null @@ -1 +0,0 @@ -nei.options.keys.gui.findit=Search the world