BETTUH

6 files changed, 147 insertions, 3 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandReparty.java b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandReparty.java
index 92d5546a..10e99dc6 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandReparty.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandReparty.java
@@ -3,6 +3,7 @@ package kr.syeyoung.dungeonsguide.commands;
 import kr.syeyoung.dungeonsguide.config.guiconfig.GuiConfig;
 import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoomInfoRegistry;
 import kr.syeyoung.dungeonsguide.e;
+import kr.syeyoung.dungeonsguide.utils.TextUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
@@ -10,6 +11,7 @@ import net.minecraft.util.ChatComponentText;
 import net.minecraftforge.client.event.ClientChatReceivedEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
+import scala.collection.parallel.ParIterableLike;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.IllegalBlockSizeException;
@@ -18,6 +20,8 @@ import java.io.IOException;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
 
 public class CommandReparty extends CommandBase {
     @Override
@@ -32,17 +36,71 @@ public class CommandReparty extends CommandBase {
 
     @Override
     public void processCommand(ICommandSender sender, String[] args) {
+        requestReparty();
+    }
 
+    public static enum Phase {
+        NOT,
+        REQUESTED,
+        RECEIVE_PARTYMEMBERS,
+        DISBAND,
+        REPARTY
     }
 
+    private List<String> players = new ArrayList<String>();
+    private long nextTrigger = Long.MAX_VALUE;
+    private Phase phase = Phase.NOT;
     @SubscribeEvent
     public void onChat(ClientChatReceivedEvent e) {
-
+        if (e.type == 2) return;
+        if (e.message.getFormattedText().startsWith("§6Party Members ") && phase == Phase.REQUESTED) {
+            players.clear();
+            phase = Phase.RECEIVE_PARTYMEMBERS;
+        }
+        if (e.message.getFormattedText().startsWith("§cYou are not currently in a party.§r") && phase == Phase.REQUESTED) {
+            phase = Phase.NOT;
+        }
+        String txt = e.message.getFormattedText();
+        if (txt.startsWith("§eParty ") && txt.contains(":")) {
+            String playerNames = TextUtils.stripColor(txt.split(":")[1]);
+            for (String s : playerNames.split(" ")) {
+                if (s.isEmpty()) continue;
+                if (s.equals("●")) continue;
+                if (s.startsWith("[")) continue;
+                players.add(s);
+            }
+        }
+        if (e.message.getFormattedText().equals("§9§m-----------------------------§r") && phase == Phase.RECEIVE_PARTYMEMBERS) {
+            phase = Phase.DISBAND;
+            nextTrigger = System.currentTimeMillis() + 500;
+        }
     }
 
     @SubscribeEvent
     public void onTick(TickEvent.ClientTickEvent e) {
+        if (nextTrigger < System.currentTimeMillis() && (phase == Phase.DISBAND || phase == Phase.REPARTY)) {
+            if (phase == Phase.DISBAND) {
+                nextTrigger = System.currentTimeMillis() + 1000;
+                phase = Phase.REPARTY;
+                Minecraft.getMinecraft().thePlayer.sendChatMessage("/p disband");
+            } else {
+                phase = Phase.NOT;
+                nextTrigger = Long.MAX_VALUE;
+                StringBuilder sb = new StringBuilder();
+                sb.append("/p invite");
+                for (String player : players) {
+                    sb.append(" ").append(player);
+                }
+                Minecraft.getMinecraft().thePlayer.sendChatMessage(sb.toString());
+            }
+        }
+    }
 
+    public void requestReparty() {
+        if (phase == Phase.NOT) {
+            phase = Phase.REQUESTED;
+            Minecraft.getMinecraft().thePlayer.sendChatMessage("/pl");
+        }
     }
 
     @Override
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/e.java b/src/main/java/kr/syeyoung/dungeonsguide/e.java
index e6ceb704..a422c117 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/e.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/e.java
@@ -44,15 +44,19 @@ public class e implements c {
         if (FeatureRegistry.DEBUG.isEnabled())
             Minecraft.getMinecraft().thePlayer.addChatMessage(iChatComponent);
     }
+    @Getter
+    CommandReparty commandReparty;
 
     public void init(FMLInitializationEvent event) {
         dungeonsGuide = this;
         skyblockStatus = new SkyblockStatus();
 
-        MinecraftForge.EVENT_BUS.register(new DungeonListener());
         CommandDungeonsGuide commandDungeonsGuide;
+        MinecraftForge.EVENT_BUS.register(new DungeonListener());
         ClientCommandHandler.instance.registerCommand(commandDungeonsGuide = new CommandDungeonsGuide());
         MinecraftForge.EVENT_BUS.register(commandDungeonsGuide);
+        ClientCommandHandler.instance.registerCommand(commandReparty = new CommandReparty());
+        MinecraftForge.EVENT_BUS.register(commandReparty);
         MinecraftForge.EVENT_BUS.register(new FeatureListener());
         MinecraftForge.EVENT_BUS.register(new PacketListener());
 
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java b/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
index 7022243e..d37f9bb6 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
@@ -54,9 +54,11 @@ public class FeatureRegistry {
 
 
     public static final SimpleFeature BOSSFIGHT_CHESTPRICE = register(new FeatureChestPrice());
+    public static final FeatureAutoReparty BOSSFIGHT_AUTOREPARTY = register(new FeatureAutoReparty());
 
     public static final FeatureInstaCloseChest DUNGEON_INSTACLOSE = register(new FeatureInstaCloseChest());
     public static final FeatureBoxSkelemaster DUNGEON_BOXSKELEMASTER = register(new FeatureBoxSkelemaster());
+    public static final FeatureBoxStarMobs DUNGEON_BOXSTARMOBS = register(new FeatureBoxStarMobs());
     public static final FeatureDungeonDeaths DUNGEON_DEATHS = register(new FeatureDungeonDeaths());
     public static final FeatureDungeonMilestone DUNGEON_MILESTONE = register(new FeatureDungeonMilestone());
     public static final FeatureDungeonRealTime DUNGEON_REALTIME = register(new FeatureDungeonRealTime());
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureAutoReparty.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureAutoReparty.java
new file mode 100644
index 00000000..ae01d5ee
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureAutoReparty.java
@@ -0,0 +1,30 @@
+package kr.syeyoung.dungeonsguide.features.impl;
+
+import kr.syeyoung.dungeonsguide.e;
+import kr.syeyoung.dungeonsguide.features.SimpleFeature;
+import kr.syeyoung.dungeonsguide.features.listener.DungeonEndListener;
+import kr.syeyoung.dungeonsguide.features.listener.GuiBackgroundRenderListener;
+import kr.syeyoung.dungeonsguide.utils.TextUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.inventory.GuiChest;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.inventory.ContainerChest;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraftforge.client.event.GuiScreenEvent;
+import org.lwjgl.opengl.GL11;
+
+public class FeatureAutoReparty extends SimpleFeature implements DungeonEndListener {
+    public FeatureAutoReparty() {
+        super("Bossfight", "Auto reparty when dungeon finishes","Auto reparty on dungeon finish", "bossfight.autoreparty", false);
+    }
+
+    @Override
+    public void onDungeonEnd() {
+        if (isEnabled()) e.getDungeonsGuide().getCommandReparty().requestReparty();
+    }
+}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureBoxSkelemaster.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureBoxSkelemaster.java
index 3165f462..e8eddf85 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureBoxSkelemaster.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureBoxSkelemaster.java
@@ -45,7 +45,7 @@ public class FeatureBoxSkelemaster extends SimpleFeature implements WorldRenderL
         });
         Color c = this.<Color>getParameter("color").getValue();
         for (EntityArmorStand entitySkeleton : skeletonList) {
-            RenderUtils.highlightBox(entitySkeleton, c, partialTicks, false);
+            RenderUtils.highlightBox(entitySkeleton, c, partialTicks, true);
         }
     }
 }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureBoxStarMobs.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureBoxStarMobs.java
new file mode 100644
index 00000000..dd61ce15
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureBoxStarMobs.java
@@ -0,0 +1,50 @@
+package kr.syeyoung.dungeonsguide.features.impl;
+
+import com.google.common.base.Predicate;
+import kr.syeyoung.dungeonsguide.SkyblockStatus;
+import kr.syeyoung.dungeonsguide.config.types.AColor;
+import kr.syeyoung.dungeonsguide.e;
+import kr.syeyoung.dungeonsguide.features.FeatureParameter;
+import kr.syeyoung.dungeonsguide.features.SimpleFeature;
+import kr.syeyoung.dungeonsguide.features.listener.WorldRenderListener;
+import kr.syeyoung.dungeonsguide.utils.RenderUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.util.BlockPos;
+import org.jetbrains.annotations.Nullable;
+
+import java.awt.*;
+import java.util.List;
+
+
+public class FeatureBoxStarMobs extends SimpleFeature implements WorldRenderListener {
+    public FeatureBoxStarMobs() {
+        super("Dungeon", "Box Starred mobs", "Box Starred mobs in dungeons", "dungeon.starmobbox", false);
+        parameters.put("radius", new FeatureParameter<Integer>("radius", "Highlight Radius", "The maximum distance between player and skeletonmaster to be boxed", 20, "integer"));
+        parameters.put("color", new FeatureParameter<AColor>("color", "Highlight Color", "Highlight Color of Skeleton master", new AColor(0,255,255,50), "acolor"));
+    }
+
+
+    private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
+    @Override
+    public void drawWorld(float partialTicks) {
+        if (!isEnabled()) return;
+        if (!skyblockStatus.isOnDungeon()) return;
+
+        final BlockPos player = Minecraft.getMinecraft().thePlayer.getPosition();
+        int val = this.<Integer>getParameter("radius").getValue();
+        final int sq = val * val;
+
+        List<EntityArmorStand> skeletonList = Minecraft.getMinecraft().theWorld.getEntities(EntityArmorStand.class, new Predicate<EntityArmorStand>() {
+            @Override
+            public boolean apply(@Nullable EntityArmorStand input) {
+                if (player.distanceSq(input.getPosition()) > sq) return false;
+                return input.getName().contains("✯");
+            }
+        });
+        Color c = this.<Color>getParameter("color").getValue();
+        for (EntityArmorStand entitySkeleton : skeletonList) {
+            RenderUtils.highlightBox(entitySkeleton, c, partialTicks, true);
+        }
+    }
+}