aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kr/syeyoung/dungeonsguide
diff options
context:
space:
mode:
authorsyeyoung <cyong06@naver.com>2021-03-20 11:55:27 +0900
committersyeyoung <cyong06@naver.com>2021-03-20 11:55:27 +0900
commit6e8606b2dd52475021cd226758f855e2a59574df (patch)
treeaabd1f6bf76c808751e6c54dd6e422da43bdaed9 /src/main/java/kr/syeyoung/dungeonsguide
parentc11cd2144699ec909897d1eabe90f65992a5bb14 (diff)
downloadSkyblock-Dungeons-Guide-6e8606b2dd52475021cd226758f855e2a59574df.tar.gz
Skyblock-Dungeons-Guide-6e8606b2dd52475021cd226758f855e2a59574df.tar.bz2
Skyblock-Dungeons-Guide-6e8606b2dd52475021cd226758f855e2a59574df.zip
ability cooldown
Diffstat (limited to 'src/main/java/kr/syeyoung/dungeonsguide')
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java46
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMove.java17
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMoveNearestAir.java18
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java2
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/FeatureAbilityCooldown.java306
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/SkyblockAbility.java14
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/UsedAbility.java13
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/FeatureMechanicBrowse.java4
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/features/listener/TitleListener.java2
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/party/PartyManager.java2
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java6
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/utils/RenderUtils.java39
12 files changed, 442 insertions, 27 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java
index 979d21f8..1bd76e57 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java
@@ -4,8 +4,8 @@ import com.google.gson.JsonObject;
import kr.syeyoung.dungeonsguide.config.guiconfig.GuiConfig;
import kr.syeyoung.dungeonsguide.dungeon.DungeonContext;
import kr.syeyoung.dungeonsguide.dungeon.data.DungeonRoomInfo;
-import kr.syeyoung.dungeonsguide.dungeon.mechanics.DungeonMechanic;
-import kr.syeyoung.dungeonsguide.dungeon.mechanics.DungeonSecret;
+import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint;
+import kr.syeyoung.dungeonsguide.dungeon.mechanics.*;
import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom;
import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoomInfoRegistry;
import kr.syeyoung.dungeonsguide.e;
@@ -174,11 +174,43 @@ public class CommandDungeonsGuide extends CommandBase {
DungeonRoomInfo dri = (DungeonRoomInfo) ois.readObject();
ois.close();
fis.close();
- for (Map.Entry<String, DungeonMechanic> stringDungeonMechanicEntry : dri.getMechanics().entrySet()) {
- if (stringDungeonMechanicEntry.getValue() instanceof DungeonSecret) {
- if (stringDungeonMechanicEntry.getKey().charAt(0) != Character.toLowerCase(((DungeonSecret) stringDungeonMechanicEntry.getValue()).getSecretType().name().charAt(0))) {
- System.out.println("Mismatch found at "+dri.getName() + " - "+stringDungeonMechanicEntry.getKey() +" - "+((DungeonSecret) stringDungeonMechanicEntry.getValue()).getSecretType());
- System.out.print(' ');
+ System.out.println("Starting at "+dri.getName() +" - "+dri.getUuid());
+ for (Map.Entry<String, DungeonMechanic> value2 : dri.getMechanics().entrySet()) {
+ DungeonMechanic value = value2.getValue();
+ if (value instanceof DungeonSecret &&
+ (((DungeonSecret) value).getSecretType() == DungeonSecret.SecretType.BAT
+ || ((DungeonSecret) value).getSecretType() == DungeonSecret.SecretType.CHEST)
+ && ((DungeonSecret) value).getSecretPoint().getY() == 0) {
+ OffsetPoint offsetPoint = ((DungeonSecret) value).getSecretPoint();
+ dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] = -1;
+ System.out.println("Fixing "+value2.getKey()+" - as secret "+((DungeonSecret) value).getSecretType() + " - at "+((DungeonSecret) value).getSecretPoint());
+ } else if (value instanceof DungeonOnewayDoor) {
+ for (OffsetPoint offsetPoint : ((DungeonOnewayDoor) value).getSecretPoint().getOffsetPointList()) {
+ if (offsetPoint.getY() == 0) {
+ dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] = -1;
+ System.out.println("Fixing "+value2.getKey()+" - o-door - at "+offsetPoint);
+ }
+ }
+ } else if (value instanceof DungeonDoor) {
+ for (OffsetPoint offsetPoint : ((DungeonDoor) value).getSecretPoint().getOffsetPointList()) {
+ if (offsetPoint.getY() == 0) {
+ dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] = -1;
+ System.out.println("Fixing "+value2.getKey()+" - door - at "+offsetPoint);
+ }
+ }
+ } else if (value instanceof DungeonBreakableWall) {
+ for (OffsetPoint offsetPoint : ((DungeonBreakableWall) value).getSecretPoint().getOffsetPointList()) {
+ if (offsetPoint.getY() == 0) {
+ dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] = -1;
+ System.out.println("Fixing "+value2.getKey()+" - wall - at "+offsetPoint);
+ }
+ }
+ } else if (value instanceof DungeonTomb) {
+ for (OffsetPoint offsetPoint : ((DungeonTomb) value).getSecretPoint().getOffsetPointList()) {
+ if (offsetPoint.getY() == 0) {
+ dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] = -1;
+ System.out.println("Fixing "+value2.getKey()+" - crypt - at "+offsetPoint);
+ }
}
}
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMove.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMove.java
index 3013d1de..a9d80266 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMove.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMove.java
@@ -50,24 +50,27 @@ public class ActionMove extends AbstractAction {
if (FeatureRegistry.SECRET_TOGGLE_KEY.isEnabled() && Keybinds.togglePathfindStatus) return;
- if (latest != null){
- List<BlockPos> poses = new ArrayList<BlockPos>();
- for (int i = 0; i < latest.getCurrentPathLength(); i++) {
- PathPoint pathPoint = latest.getPathPointFromIndex(i);
- poses.add(dungeonRoom.getMin().add(pathPoint.xCoord, pathPoint.yCoord, pathPoint.zCoord));
- }
- RenderUtils.drawLines(poses, FeatureRegistry.SECRET_BROWSE.getColor(), partialTicks, true);
+ if (poses != null){
+ RenderUtils.drawLines(poses, FeatureRegistry.SECRET_BROWSE.getColor(), partialTicks, FeatureRegistry.SECRET_BROWSE.getThickness(), true);
}
}
private int tick = -1;
private PathEntity latest;
+ private List<BlockPos> poses;
@Override
public void onTick(DungeonRoom dungeonRoom) {
tick = (tick+1) % 10;
if (tick == 0) {
latest = dungeonRoom.getPathFinder().createEntityPathTo(dungeonRoom.getContext().getWorld(),
Minecraft.getMinecraft().thePlayer, target.getBlockPos(dungeonRoom), Integer.MAX_VALUE);
+ if (latest != null) {
+ poses = new ArrayList<>();
+ for (int i = 0; i < latest.getCurrentPathLength(); i++) {
+ PathPoint pathPoint = latest.getPathPointFromIndex(i);
+ poses.add(dungeonRoom.getMin().add(pathPoint.xCoord, pathPoint.yCoord, pathPoint.zCoord));
+ }
+ }
}
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMoveNearestAir.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMoveNearestAir.java
index f8969cc1..72f39115 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMoveNearestAir.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMoveNearestAir.java
@@ -48,26 +48,30 @@ public class ActionMoveNearestAir extends AbstractAction {
RenderUtils.drawTextAtWorld(String.format("%.2f",MathHelper.sqrt_double(pos.distanceSq(Minecraft.getMinecraft().thePlayer.getPosition())))+"m", pos.getX() + 0.5f, pos.getY() + 0.5f - scale, pos.getZ() + 0.5f, 0xFFFFFF00, 1f, true, false, partialTicks);
if (FeatureRegistry.SECRET_TOGGLE_KEY.isEnabled() && Keybinds.togglePathfindStatus) return;
- if (latest != null){
- List<BlockPos> poses = new ArrayList<BlockPos>();
- for (int i = 0; i < latest.getCurrentPathLength(); i++) {
- PathPoint pathPoint = latest.getPathPointFromIndex(i);
- poses.add(dungeonRoom.getMin().add(pathPoint.xCoord, pathPoint.yCoord, pathPoint.zCoord));
- }
- RenderUtils.drawLines(poses, FeatureRegistry.SECRET_BROWSE.getColor(), partialTicks, true);
+ if (poses != null){
+ RenderUtils.drawLines(poses, FeatureRegistry.SECRET_BROWSE.getColor(), partialTicks, FeatureRegistry.SECRET_BROWSE.getThickness(), true);
}
}
private int tick = -1;
private PathEntity latest;
+ private List<BlockPos> poses;
@Override
public void onTick(DungeonRoom dungeonRoom) {
tick = (tick+1) % 10;
if (tick == 0) {
latest = dungeonRoom.getPathFinder().createEntityPathTo(dungeonRoom.getContext().getWorld(),
Minecraft.getMinecraft().thePlayer, target.getBlockPos(dungeonRoom), Integer.MAX_VALUE);
+ if (latest != null) {
+ poses = new ArrayList<>();
+ for (int i = 0; i < latest.getCurrentPathLength(); i++) {
+ PathPoint pathPoint = latest.getPathPointFromIndex(i);
+ poses.add(dungeonRoom.getMin().add(pathPoint.xCoord, pathPoint.yCoord, pathPoint.zCoord));
+ }
+ }
}
}
+
@Override
public String toString() {
return "MoveNearestAir\n- target: "+target.toString();
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java b/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
index 2c2916c9..9914318f 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
@@ -9,6 +9,7 @@ import kr.syeyoung.dungeonsguide.features.impl.boss.terminal.FeatureSimonSaysSol
import kr.syeyoung.dungeonsguide.features.impl.boss.terminal.FeatureTerminalSolvers;
import kr.syeyoung.dungeonsguide.features.impl.dungeon.*;
import kr.syeyoung.dungeonsguide.features.impl.etc.*;
+import kr.syeyoung.dungeonsguide.features.impl.etc.ability.FeatureAbilityCooldown;
import kr.syeyoung.dungeonsguide.features.impl.secret.FeatureActions;
import kr.syeyoung.dungeonsguide.features.impl.secret.FeatureMechanicBrowse;
import kr.syeyoung.dungeonsguide.features.impl.secret.FeatureSoulRoomWarning;
@@ -66,6 +67,7 @@ public class FeatureRegistry {
public static final FeatureTooltipDungeonStat ETC_DUNGEONSTAT = register(new FeatureTooltipDungeonStat());
public static final FeatureTooltipPrice ETC_PRICE = register(new FeatureTooltipPrice());
+ public static final FeatureAbilityCooldown ETC_ABILITY_COOLDOWN = register(new FeatureAbilityCooldown());
public static final FeatureCooldownCounter ETC_COOLDOWN = register(new FeatureCooldownCounter());
public static final FeatureRepartyCommand ETC_REPARTY = register(new FeatureRepartyCommand());
public static final FeatureDecreaseExplosionSound ETC_EXPLOSION_SOUND = register(new FeatureDecreaseExplosionSound());
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/FeatureAbilityCooldown.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/FeatureAbilityCooldown.java
new file mode 100644
index 00000000..7a82d07b
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/FeatureAbilityCooldown.java
@@ -0,0 +1,306 @@
+package kr.syeyoung.dungeonsguide.features.impl.etc.ability;
+
+import kr.syeyoung.dungeonsguide.SkyblockStatus;
+import kr.syeyoung.dungeonsguide.config.types.AColor;
+import kr.syeyoung.dungeonsguide.e;
+import kr.syeyoung.dungeonsguide.features.listener.ChatListener;
+import kr.syeyoung.dungeonsguide.features.text.StyledText;
+import kr.syeyoung.dungeonsguide.features.text.TextHUDFeature;
+import kr.syeyoung.dungeonsguide.features.text.TextStyle;
+import kr.syeyoung.dungeonsguide.utils.TextUtils;
+import net.minecraftforge.client.event.ClientChatReceivedEvent;
+import scala.Long;
+
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class FeatureAbilityCooldown extends TextHUDFeature implements ChatListener {
+ SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
+
+ public FeatureAbilityCooldown() {
+ super("ETC", "View Ability Cooldowns", "A handy hud for viewing cooldown abilities", "etc.abilitycd2", false, 100, getFontRenderer().FONT_HEIGHT * 5);
+ getStyles().add(new TextStyle("abilityname", new AColor(0x00, 0xAA,0xAA,255), new AColor(0, 0,0,0), false));
+ getStyles().add(new TextStyle("separator", new AColor(0x55, 0x55,0x55,255), new AColor(0, 0,0,0), false));
+ getStyles().add(new TextStyle("number", new AColor(0x55, 0xFF,0xFF,255), new AColor(0, 0,0,0), false));
+ getStyles().add(new TextStyle("unit",new AColor(0x00, 0xAA,0xAA,255), new AColor(0, 0,0,0), false));
+ getStyles().add(new TextStyle("ready",new AColor(0xDF, 0x00,0x67,255), new AColor(0, 0,0,0), false));
+ }
+
+ @Override
+ public boolean isHUDViewable() {
+ return skyblockStatus.isOnSkyblock();
+ }
+
+ @Override
+ public boolean doesScaleWithHeight() {
+ return false;
+ }
+
+ @Override
+ public List<String> getUsedTextStyle() {
+ return Arrays.asList("abilityname", "separator", "number", "unit", "ready");
+ }
+
+ private static final List<StyledText> dummy = new ArrayList<>();
+
+ static {
+ dummy.add(new StyledText("Random Ability", "abilityname"));
+ dummy.add(new StyledText(": ", "separator"));
+ dummy.add(new StyledText("10", "number"));
+ dummy.add(new StyledText("s\n", "unit"));
+ dummy.add(new StyledText("Random Ability2", "abilityname"));
+ dummy.add(new StyledText(": ", "separator"));
+ dummy.add(new StyledText("10", "number"));
+ dummy.add(new StyledText("m ", "unit"));
+ dummy.add(new StyledText("9", "number"));
+ dummy.add(new StyledText("s\n", "unit"));
+ dummy.add(new StyledText("Random Ability", "abilityname"));
+ dummy.add(new StyledText(": ", "separator"));
+ dummy.add(new StyledText("READY", "ready"));
+ }
+
+ @Override
+ public List<StyledText> getDummyText() {
+ return dummy;
+ }
+
+ private static final Map<String, SkyblockAbility> skyblockAbilities = new HashMap<>();
+ static {
+ register(new SkyblockAbility("Disgusting Healing", -1, -1, "REAPER_MASK"));
+ register(new SkyblockAbility("Spirit Leap", -1, 5, "SPIRIT_LEAP"));
+ register(new SkyblockAbility("Farmer's Grace", -1, -1, "RANCHERS_BOOTS"));
+ register(new SkyblockAbility("Raise Souls", -1, 1, "SUMMONING_RING"));
+ register(new SkyblockAbility("Instant Heal", 70, -1, "FLORID_ZOMBIE_SWORD"));
+ register(new SkyblockAbility("Phantom Impel", -1, -1, "PHANTOM_ROD"));
+ register(new SkyblockAbility("Implosion", 300, 10, "IMPLOSION_SCROLL"));
+ register(new SkyblockAbility("Parley", -1, 5, "ASPECT_OF_THE_JERRY"));
+ register(new SkyblockAbility("Guided Bat", 250, -1, "BAT_WAND"));
+ register(new SkyblockAbility("Bat Swarm", -1, -1, "WITCH_MASK"));
+ register(new SkyblockAbility("Flay", -1, -1, "SOUL_WHIP"));
+ register(new SkyblockAbility("Instant Heal", 70, -1, "ZOMBIE_SWORD"));
+ register(new SkyblockAbility("Mithril's Protection", -1, -1, "MITHRIL_COAT"));
+ register(new SkyblockAbility("Second Wind", -1, 30, "SPIRIT_MASK"));
+ register(new SkyblockAbility("Love Tap", -1, -1, "ZOMBIE_SOLDIER_CUTLASS"));
+ register(new SkyblockAbility("Spiky", -1, -1, "PUFFERFISH_HAT"));
+ register(new SkyblockAbility("Jingle Bells", -1, 1, "JINGLE_BELLS"));
+ register(new SkyblockAbility("Wither Shield", 150, 10, "WITHER_SHIELD_SCROLL"));
+ register(new SkyblockAbility("Brute Force", -1, -1, "WARDEN_HELMET"));
+ register(new SkyblockAbility("Growth", -1, 4, "GROWTH_LEGGINGS"));
+ register(new SkyblockAbility("Shadowstep", -1, 60, "SILENT_DEATH"));
+ register(new SkyblockAbility("Creeper Veil", -1, -1, "WITHER_CLOAK"));
+ register(new SkyblockAbility("Ice Bolt", 50, -1, "FROZEN_SCYTHE"));
+ register(new SkyblockAbility("Rapid-fire", 10, -1, "JERRY_STAFF"));
+ register(new SkyblockAbility("Water Burst", 20, -1, "SALMON_HELMET_NEW"));
+ register(new SkyblockAbility("Mist Aura", -1, -1, "SORROW_BOOTS"));
+ register(new SkyblockAbility("Deploy", -1, -1, "RADIANT_POWER_ORB"));
+ register(new SkyblockAbility("Ice Spray", 50, 5, "ICE_SPRAY_WAND"));
+ register(new SkyblockAbility("Grand... Zapper?", -1, -1, "BLOCK_ZAPPER"));
+ register(new SkyblockAbility("Seek the King", -1, 5, "ROYAL_PIGEON"));
+ register(new SkyblockAbility("Mist Aura", -1, -1, "SORROW_CHESTPLATE"));
+ register(new SkyblockAbility("Healing Boost", -1, -1, "REVIVED_HEART"));
+ register(new SkyblockAbility("Deploy", -1, -1, "OVERFLUX_POWER_ORB"));
+ register(new SkyblockAbility("Swing", -1, -1, "BONE_BOOMERANG"));
+ register(new SkyblockAbility("Growth", -1, 4, "GROWTH_CHESTPLATE"));
+ register(new SkyblockAbility("Squash 'em", -1, -1, "RECLUSE_FANG"));
+ register(new SkyblockAbility("Roll em'", -1, -1, "PUMPKIN_DICER"));
+ register(new SkyblockAbility("Cleave", -1, -1, "SUPER_CLEAVER"));
+ register(new SkyblockAbility("Water Burst", 20, -1, "SALMON_BOOTS_NEW"));
+ register(new SkyblockAbility("Farmer's Delight", -1, -1, "BASKET_OF_SEEDS"));
+ register(new SkyblockAbility("Block Damage", -1, 60, "GUARDIAN_CHESTPLATE"));
+ register(new SkyblockAbility("Water Burst", 20, -1, "SALMON_LEGGINGS"));
+ register(new SkyblockAbility("Bone Shield", -1, -1, "SKELETON_HELMET"));
+ register(new SkyblockAbility("Iron Punch", 70, 3, "GOLEM_SWORD"));
+ register(new SkyblockAbility("Built-in Storage", -1, -1, "BUILDERS_WAND"));
+ register(new SkyblockAbility("Nasty Bite", -1, -1, "MOSQUITO_BOW"));
+ register(new SkyblockAbility("Ender Warp", 50, 45, "ENDER_BOW"));
+ register(new SkyblockAbility("Cleave", -1, -1, "CLEAVER"));
+ register(new SkyblockAbility("Party Time!", -1, -1, "PARTY_HAT_CRAB"));
+ register(new SkyblockAbility("Giant's Slam", 100, 30, "GIANTS_SWORD"));
+ register(new SkyblockAbility("Snow Placer", -1, -1, "SNOW_SHOVEL"));
+ register(new SkyblockAbility("Greed", -1, -1, "MIDAS_SWORD"));
+ register(new SkyblockAbility("Clownin' Around", -1, 316, "STARRED_BONZO_MASK"));
+ register(new SkyblockAbility("Weather", -1, 5, "WEATHER_STICK"));
+ register(new SkyblockAbility("ME SMASH HEAD", 100, -1, "EDIBLE_MACE"));
+ register(new SkyblockAbility("Splash", 10, 1, "FISH_HAT"));
+ register(new SkyblockAbility("Deploy", -1, -1, "PLASMAFLUX_POWER_ORB"));
+ register(new SkyblockAbility("Dragon Rage", 100, -1, "ASPECT_OF_THE_DRAGON"));
+ register(new SkyblockAbility("Burning Souls", 400, -1, "PIGMAN_SWORD"));
+ register(new SkyblockAbility("Water Burst", 20, -1, "SALMON_CHESTPLATE_NEW"));
+ register(new SkyblockAbility("Fire Blast", 150, 30, "EMBER_ROD"));
+ register(new SkyblockAbility("Commander Whip", -1, -1, "ZOMBIE_COMMANDER_WHIP"));
+ register(new SkyblockAbility("Spooktacular", -1, -1, "GHOUL_BUSTER"));
+ register(new SkyblockAbility("Cleave", -1, -1, "HYPER_CLEAVER"));
+ register(new SkyblockAbility("Leap", 50, 1, "SILK_EDGE_SWORD"));
+ register(new SkyblockAbility("Throw", 150, 5, "LIVID_DAGGER"));
+ register(new SkyblockAbility("Raise Souls", -1, 1, "NECROMANCER_SWORD"));
+ register(new SkyblockAbility("Double Jump", 50, -1, "SPIDER_BOOTS"));
+ register(new SkyblockAbility("Speed Boost", 50, -1, "ROGUE_SWORD"));
+ register(new SkyblockAbility("Spirit Glide", 250, 60, "THORNS_BOOTS"));
+ register(new SkyblockAbility("Sting", 100, -1, "STINGER_BOW"));
+ register(new SkyblockAbility("Roll em'", -1, -1, "MELON_DICER"));
+ register(new SkyblockAbility("Explosive Shot", -1, -1, "EXPLOSIVE_BOW"));
+ register(new SkyblockAbility("Heat-Seeking Rose", 35, 1, "FLOWER_OF_TRUTH"));
+ register(new SkyblockAbility("Small Heal", 60, 1, "WAND_OF_HEALING"));
+ register(new SkyblockAbility("Dreadlord", 40, -1, "CRYPT_DREADLORD_SWORD"));
+ register(new SkyblockAbility("Shadow Fury", -1, 15, "STARRED_SHADOW_FURY"));
+ register(new SkyblockAbility("Double Jump", 40, -1, "TARANTULA_BOOTS"));
+ register(new SkyblockAbility("Acupuncture", 200, 5, "VOODOO_DOLL"));
+ register(new SkyblockAbility("Showtime", 100, -1, "STARRED_BONZO_STAFF"));
+ register(new SkyblockAbility("Heartstopper", -1, -1, "SCORPION_FOIL"));
+ register(new SkyblockAbility("Rapid Fire", -1, 100, "MACHINE_GUN_BOW"));
+ register(new SkyblockAbility("Water Burst", 20, -1, "SALMON_HELMET"));
+ register(new SkyblockAbility("Alchemist's Bliss", -1, -1, "NETHER_WART_POUCH"));
+ register(new SkyblockAbility("Water Burst", 20, -1, "SALMON_CHESTPLATE"));
+ register(new SkyblockAbility("Instant Heal", 70, -1, "ORNATE_ZOMBIE_SWORD"));
+ register(new SkyblockAbility("Shadow Fury", -1, 15, "SHADOW_FURY"));
+ register(new SkyblockAbility("Healing Boost", -1, -1, "ZOMBIE_HEART"));
+ register(new SkyblockAbility("Witherlord", 40, 3, "CRYPT_WITHERLORD_SWORD"));
+ register(new SkyblockAbility("Revive", -1, -1, "REVIVE_STONE"));
+ register(new SkyblockAbility("Raise Souls", -1, 1, "REAPER_SCYTHE"));
+ register(new SkyblockAbility("Rejuvenate", -1, -1, "VAMPIRE_MASK"));
+ register(new SkyblockAbility("Mist Aura", -1, -1, "SORROW_HELMET"));
+ register(new SkyblockAbility("Place Dirt", -1, -1, "INFINIDIRT_WAND"));
+ register(new SkyblockAbility("Clownin' Around", -1, 360, "BONZO_MASK"));
+ register(new SkyblockAbility("Shadow Warp", 300, 10, "SHADOW_WARP_SCROLL"));
+ register(new SkyblockAbility("Molten Wave", 500, 1, "MIDAS_STAFF"));
+ register(new SkyblockAbility("Growth", -1, 4, "GROWTH_HELMET"));
+ register(new SkyblockAbility("Howl", 150, 20, "WEIRD_TUBA"));
+ register(new SkyblockAbility("Medium Heal", 80, 1, "WAND_OF_MENDING"));
+ register(new SkyblockAbility("Throw", 20, -1, "AXE_OF_THE_SHREDDED"));
+ register(new SkyblockAbility("Ink Bomb", 60, 30, "INK_WAND"));
+ register(new SkyblockAbility("Whassup?", -1, -1, "AATROX_BATPHONE"));
+ register(new SkyblockAbility("Deploy", -1, -1, "MANA_FLUX_POWER_ORB"));
+ register(new SkyblockAbility("Extreme Focus", -1, -1, "END_STONE_BOW"));
+ register(new SkyblockAbility("Healing Boost", -1, -1, "CRYSTALLIZED_HEART"));
+ register(new SkyblockAbility("Mist Aura", -1, -1, "SORROW_LEGGINGS"));
+ register(new SkyblockAbility("Showtime", 100, -1, "BONZO_STAFF"));
+ register(new SkyblockAbility("Triple Shot", -1, -1, "RUNAANS_BOW"));
+ register(new SkyblockAbility("Water Burst", 20, -1, "SALMON_LEGGINGS_NEW"));
+ register(new SkyblockAbility("Rejuvenate", -1, -1, "VAMPIRE_WITCH_MASK"));
+ register(new SkyblockAbility("Terrain Toss", 250, 1, "YETI_SWORD"));
+ register(new SkyblockAbility("Instant Transmission", 50, -1, "ASPECT_OF_THE_END"));
+ register(new SkyblockAbility("Detonate", -1, 60, "CREEPER_LEGGINGS"));
+ register(new SkyblockAbility("Extreme Focus", -1, -1, "END_STONE_SWORD"));
+ register(new SkyblockAbility("Leap", 50, 1, "LEAPING_SWORD"));
+ register(new SkyblockAbility("Fun Guy Bonus", -1, -1, "FUNGI_CUTTER"));
+ register(new SkyblockAbility("Cleave", -1, -1, "GIANT_CLEAVER"));
+ register(new SkyblockAbility("Tempest", -1, -1, "HURRICANE_BOW"));
+ register(new SkyblockAbility("Big Heal", 100, 1, "WAND_OF_RESTORATION"));
+ register(new SkyblockAbility("Growth", -1, 4, "GROWTH_BOOTS"));
+ register(new SkyblockAbility("Stinger", 150, -1, "SCORPION_BOW"));
+ register(new SkyblockAbility("Eye Beam", -1, -1, "PRECURSOR_EYE"));
+ register(new SkyblockAbility("Water Burst", 20, -1, "SALMON_BOOTS"));
+ register(new SkyblockAbility("Mining Speed Boost", -1, 120, null));
+ register(new SkyblockAbility("Pikobulus", -1, 110, null));
+ // abilities
+
+ register(new SkyblockAbility("Healing Circle", -1, 2, null));
+ register(new SkyblockAbility("Wish", -1, 120, null));
+ register(new SkyblockAbility("Guided Sheep", -1, 30, null));
+ register(new SkyblockAbility("Thunderstorm", -1, 500, null));
+ register(new SkyblockAbility("Throwing Axe", -1, 10, null));
+ register(new SkyblockAbility("Ragnarok", -1, 60, null));
+ register(new SkyblockAbility("Explosive Shot", -1, 40, null));
+ register(new SkyblockAbility("Rapid Fire", -1, 100, null));
+ register(new SkyblockAbility("Seismic Wave", -1, 60, null));
+ register(new SkyblockAbility("Castle of Stone", -1, 150, null));
+ }
+
+ static void register(SkyblockAbility skyblockAbility) {
+ skyblockAbilities.put(skyblockAbility.getName()+(skyblockAbility.getManaCost()> 0 ? ":"+skyblockAbility.getManaCost():""), skyblockAbility);
+ }
+
+ private TreeSet<UsedAbility> usedAbilities = new TreeSet<UsedAbility>((c1,c2) -> {
+ int a = Comparator.comparingLong(UsedAbility::getCooldownEnd).compare(c1,c2);
+ return c1.getAbility() == c2.getAbility() ? 0 : a;
+ });
+
+ @Override
+ public List<StyledText> getText() {
+ List<StyledText> cooldowns = new ArrayList<>();
+
+ for (UsedAbility usedAbility : usedAbilities) {
+ cooldowns.add(new StyledText(usedAbility.getAbility().getName(), "abilityname"));
+ cooldowns.add(new StyledText(": ", "separator"));
+ long end = usedAbility.getCooldownEnd();
+ if (System.currentTimeMillis() >= end) {
+ cooldowns.add(new StyledText("READY\n", "ready"));
+ } else {
+ long seconds = (long) Math.ceil((end - System.currentTimeMillis()) / 1000.0);
+ long hr = seconds / (60 * 60); seconds -= hr * 60 * 60;
+ long min = seconds / 60; seconds -= min * 60;
+
+ if (hr > 0) {
+ cooldowns.add(new StyledText(String.valueOf(hr), "number"));
+ cooldowns.add(new StyledText("h ", "unit"));
+ }
+ if (hr > 0 || min > 0) {
+ cooldowns.add(new StyledText(String.valueOf(min), "number"));
+ cooldowns.add(new StyledText("m ", "unit"));
+ }
+ if (hr > 0 || min > 0 || seconds > 0) {
+ cooldowns.add(new StyledText(String.valueOf(seconds), "number"));
+ cooldowns.add(new StyledText("s ", "unit"));
+ }
+ cooldowns.add(new StyledText("\n", "unit"));
+ }
+ }
+ return cooldowns;
+ }
+
+ Pattern thePattern = Pattern.compile("§b-(\\d+) Mana \\(§6(.+)§b\\)");
+ Pattern thePattern2 = Pattern.compile("§r§aUsed (.+)§r§a! §r§b\\((1194) Mana\\)§r");
+ Pattern thePattern3 = Pattern.compile("§r§aUsed (.+)§r§a!§r");
+
+ private String lastActionbarAbility;
+ @Override
+ public void onChat(ClientChatReceivedEvent clientChatReceivedEvent) {
+ if (clientChatReceivedEvent.type == 2) {
+ Matcher m = thePattern.matcher(clientChatReceivedEvent.message.getFormattedText());
+ if (m.find()) {
+ String name = m.group(2)+":"+m.group(1);
+ if (!name.equalsIgnoreCase(lastActionbarAbility)) {
+ used(name);
+ }
+ lastActionbarAbility = name;
+ } else {
+ lastActionbarAbility = null;
+ }
+ } else {
+ String message = clientChatReceivedEvent.message.getFormattedText();
+ Matcher m = thePattern2.matcher(message);
+ if (m.matches()) {
+ String abilityName = TextUtils.stripColor(m.group(1));
+ String manas = TextUtils.stripColor(m.group(2));
+
+ used(abilityName+":"+manas);
+ } else {
+ Matcher m2 = thePattern3.matcher(message);
+ if (m2.matches()) {
+ String abilityName = TextUtils.stripColor(m2.group(1));
+ used(abilityName);
+ } else if (message.startsWith("§r§aYou used your ") || message.endsWith("§r§aPickaxe Ability!§r")) {
+ String nocolor = TextUtils.stripColor(message);
+ String abilityName = nocolor.substring(nocolor.indexOf("your")+5, nocolor.indexOf("Pickaxe")-1);
+
+ used(abilityName);
+ }
+ }
+ }
+ }
+
+ private void used(String ability) {
+ if (skyblockAbilities.containsKey(ability)) {
+ SkyblockAbility skyblockAbility = skyblockAbilities.get(ability);
+ if (skyblockAbility.getCooldown() > 0) {
+ UsedAbility usedAbility = new UsedAbility(skyblockAbility, System.currentTimeMillis() + skyblockAbility.getCooldown() * 1000);
+ usedAbilities.remove(usedAbility);
+ usedAbilities.add(usedAbility);
+ }
+ System.out.println("known ability: "+ability+": "+skyblockAbility.getCooldown());
+ } else {
+ System.out.println("Unknown ability: "+ability);
+ }
+ }
+}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/SkyblockAbility.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/SkyblockAbility.java
new file mode 100644
index 00000000..19e4ae02
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/SkyblockAbility.java
@@ -0,0 +1,14 @@
+package kr.syeyoung.dungeonsguide.features.impl.etc.ability;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class SkyblockAbility {
+ private String name;
+ private int manaCost;
+ private int cooldown;
+
+ private String itemId;
+}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/UsedAbility.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/UsedAbility.java
new file mode 100644
index 00000000..59644212
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/UsedAbility.java
@@ -0,0 +1,13 @@
+package kr.syeyoung.dungeonsguide.features.impl.etc.ability;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@AllArgsConstructor
+public class UsedAbility {
+ private SkyblockAbility ability;
+ @EqualsAndHashCode.Exclude
+ private long cooldownEnd;
+}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/FeatureMechanicBrowse.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/FeatureMechanicBrowse.java
index 270fb4cb..bd80f0f1 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/FeatureMechanicBrowse.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/FeatureMechanicBrowse.java
@@ -40,11 +40,15 @@ public class FeatureMechanicBrowse extends GuiFeature implements GuiPreRenderLis
public FeatureMechanicBrowse() {
super("Secret","Mechanic(Secret) Browser", "Browse and Pathfind secrets and mechanics in the current room", "secret.mechanicbrowse", false, 100, 300);
parameters.put("linecolor", new FeatureParameter<Color>("linecolor", "Color", "Color of Pathfind line", Color.green, "color"));
+ parameters.put("linethickness", new FeatureParameter<Float>("linethickness", "Thickness", "Thickness of Pathfind line", 1.0f, "float"));
}
public Color getColor() {
return this.<Color>getParameter("linecolor").getValue();
}
+ public float getThickness() {
+ return this.<Float>getParameter("linethickness").getValue();
+ }
SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
@Override
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/listener/TitleListener.java b/src/main/java/kr/syeyoung/dungeonsguide/features/listener/TitleListener.java
index 21cbd0f2..ecdd253e 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/listener/TitleListener.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/listener/TitleListener.java
@@ -1,8 +1,6 @@
package kr.syeyoung.dungeonsguide.features.listener;
import net.minecraft.network.play.server.S45PacketTitle;
-import net.minecraftforge.client.event.RenderLivingEvent;
-import scala.tools.nsc.doc.base.comment.Title;
public interface TitleListener {
void onTitle(S45PacketTitle renderPlayerEvent);
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/party/PartyManager.java b/src/main/java/kr/syeyoung/dungeonsguide/party/PartyManager.java
index 6ef89019..2ba47dfc 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/party/PartyManager.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/party/PartyManager.java
@@ -21,7 +21,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent;
import org.json.JSONArray;
import org.json.JSONObject;
-import scala.util.parsing.json.JSON;
import java.security.SecureRandom;
import java.util.HashMap;
@@ -135,6 +134,7 @@ public class PartyManager implements StompMessageHandler {
members.add(player);
}
} else if (str.equals("§9§m-----------------------------§r")) {
+ System.out.println(checkPlayer + " - "+partyJoin + " - "+invitedDash);
if ((checkPlayer > 0 || partyJoin > 0) && partyJoin != 100) {
chatReceivedEvent.setCanceled(true);
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java
index 088a00b3..a69cf56e 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java
@@ -173,10 +173,10 @@ public class RoomProcessorBlazeSolver extends GeneralRoomProcessor {
RenderUtils.highlightBox(entity, AxisAlignedBB.fromBounds(-1, 0, -1, 1, 2, 1), FeatureRegistry.SOLVER_BLAZE.<AColor>getParameter("blazeborder").getValue(), partialTicks, false);
- GL11.glDisable(GL11.GL_STENCIL_TEST);
- GlStateManager.enableDepth();
- GlStateManager.popMatrix();
}
+ GL11.glDisable(GL11.GL_STENCIL_TEST);
+ GlStateManager.enableDepth();
+ GlStateManager.popMatrix();
}
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/utils/RenderUtils.java b/src/main/java/kr/syeyoung/dungeonsguide/utils/RenderUtils.java
index 35319e71..b2722e77 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/utils/RenderUtils.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/utils/RenderUtils.java
@@ -295,6 +295,45 @@ public class RenderUtils {
GlStateManager.popMatrix();
}
+ public static void drawLines(List<BlockPos> poses, Color colour, float thickness, float partialTicks, boolean depth) {
+ Entity render = Minecraft.getMinecraft().getRenderViewEntity();
+ WorldRenderer worldRenderer = Tessellator.getInstance().getWorldRenderer();
+
+ double realX = render.lastTickPosX + (render.posX - render.lastTickPosX) * partialTicks;
+ double realY = render.lastTickPosY + (render.posY - render.lastTickPosY) * partialTicks;
+ double realZ = render.lastTickPosZ + (render.posZ - render.lastTickPosZ) * partialTicks;
+
+ GlStateManager.pushMatrix();
+ GlStateManager.translate(-realX, -realY, -realZ);
+ GlStateManager.disableTexture2D();
+ GlStateManager.enableBlend();
+ GlStateManager.disableAlpha();
+ GL11.glLineWidth(thickness);
+ if (!depth) {
+ GlStateManager.disableDepth();
+ GlStateManager.depthMask(false);
+ }
+ GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+
+ GlStateManager.color(colour.getRed() / 255f, colour.getGreen() / 255f, colour.getBlue()/ 255f, colour.getAlpha() / 255f);
+ worldRenderer.begin(GL11.GL_LINE_STRIP, DefaultVertexFormats.POSITION);
+ for (BlockPos pos:poses) {
+ worldRenderer.pos(pos.getX() +0.5, pos.getY() +0.5, pos.getZ() +0.5).endVertex();
+ }
+ Tessellator.getInstance().draw();
+
+ GlStateManager.translate(realX, realY, realZ);
+ GlStateManager.disableBlend();
+ GlStateManager.enableAlpha();
+ GlStateManager.enableTexture2D();
+ if (!depth) {
+ GlStateManager.enableDepth();
+ GlStateManager.depthMask(true);
+ }
+ GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+ GlStateManager.popMatrix();
+ }
+
public static void highlightBlock(BlockPos blockpos, Color c, float partialTicks) {
highlightBlock(blockpos,c,partialTicks,false);
}