aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kr/syeyoung
diff options
context:
space:
mode:
authorsyeyoung <42869671+cyoung06@users.noreply.github.com>2020-12-08 16:06:13 +0900
committersyeyoung <42869671+cyoung06@users.noreply.github.com>2020-12-08 16:06:13 +0900
commit9dda9c40514b24b87e33006a0d65fb00e5d62bde (patch)
tree93c5672f81a6f91afd4deb25651b78b2a8e63734 /src/main/java/kr/syeyoung
parent159957478c13ad0f3fb6377e69aaaa3962e27ebb (diff)
downloadSkyblock-Dungeons-Guide-9dda9c40514b24b87e33006a0d65fb00e5d62bde.tar.gz
Skyblock-Dungeons-Guide-9dda9c40514b24b87e33006a0d65fb00e5d62bde.tar.bz2
Skyblock-Dungeons-Guide-9dda9c40514b24b87e33006a0d65fb00e5d62bde.zip
get rid of weird stuff
Diffstat (limited to 'src/main/java/kr/syeyoung')
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java6
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/EventListener.java8
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/commands/CommandEditRoom.java2
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java7
4 files changed, 12 insertions, 11 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java b/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java
index de1b0067..33e3d3e6 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java
@@ -34,7 +34,7 @@ public class DungeonsGuide
public static final String MODID = "skyblock_dungeons_guide";
public static final String VERSION = "0.1";
- private SkyblockStatus skyblockStatus;
+ private Object skyblockStatus;
private static DungeonsGuide dungeonsGuide;
@@ -177,8 +177,8 @@ public class DungeonsGuide
throw e;
}
- public SkyblockStatus getSkyblockStatus() {
- return skyblockStatus;
+ public Object getSkyblockStatus() {
+ return (SkyblockStatus) skyblockStatus;
}
public static DungeonsGuide getDungeonsGuide() {
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/EventListener.java b/src/main/java/kr/syeyoung/dungeonsguide/EventListener.java
index 5f37ea82..defe1339 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/EventListener.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/EventListener.java
@@ -36,7 +36,7 @@ public class EventListener {
public void onTick(TickEvent.ClientTickEvent e) {
try {
if (e.phase == TickEvent.Phase.START) {
- SkyblockStatus skyblockStatus = DungeonsGuide.getDungeonsGuide().getSkyblockStatus();
+ SkyblockStatus skyblockStatus = (SkyblockStatus) DungeonsGuide.getDungeonsGuide().getSkyblockStatus();
{
boolean isOnDungeon = skyblockStatus.isOnDungeon();
// System.out.println(isOnDungeon);
@@ -75,7 +75,7 @@ public class EventListener {
public void onRender(RenderGameOverlayEvent.Post postRender) {
try {
if (postRender.type != RenderGameOverlayEvent.ElementType.TEXT) return;
- SkyblockStatus skyblockStatus = DungeonsGuide.getDungeonsGuide().getSkyblockStatus();
+ SkyblockStatus skyblockStatus = (SkyblockStatus) DungeonsGuide.getDungeonsGuide().getSkyblockStatus();
if (!skyblockStatus.isOnDungeon()) return;
if (DungeonsGuide.DEBUG) {
int[] textureData = dynamicTexture.getTextureData();
@@ -117,7 +117,7 @@ public class EventListener {
public void onChatReceived(ClientChatReceivedEvent clientChatReceivedEvent) {
try {
if (clientChatReceivedEvent.type == 2) return;
- SkyblockStatus skyblockStatus = DungeonsGuide.getDungeonsGuide().getSkyblockStatus();
+ SkyblockStatus skyblockStatus = (SkyblockStatus) DungeonsGuide.getDungeonsGuide().getSkyblockStatus();
if (!skyblockStatus.isOnDungeon()) return;
DungeonContext context = skyblockStatus.getContext();
@@ -156,7 +156,7 @@ public class EventListener {
@SubscribeEvent
public void onWorldRender(RenderWorldLastEvent renderWorldLastEvent) {
try {
- SkyblockStatus skyblockStatus = DungeonsGuide.getDungeonsGuide().getSkyblockStatus();
+ SkyblockStatus skyblockStatus = (SkyblockStatus) DungeonsGuide.getDungeonsGuide().getSkyblockStatus();
if (!skyblockStatus.isOnDungeon()) return;
DungeonContext context = skyblockStatus.getContext();
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandEditRoom.java b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandEditRoom.java
index 083d6295..18f37b09 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandEditRoom.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandEditRoom.java
@@ -30,7 +30,7 @@ public class CommandEditRoom extends CommandBase {
@Override
public void processCommand(ICommandSender sender, String[] args) {
- SkyblockStatus skyblockStatus = DungeonsGuide.getDungeonsGuide().getSkyblockStatus();
+ SkyblockStatus skyblockStatus = (SkyblockStatus) DungeonsGuide.getDungeonsGuide().getSkyblockStatus();
if (!skyblockStatus.isOnDungeon()) {
sender.addChatMessage(new ChatComponentText("You're not in dungeons"));
return;
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java
index 3a7a6256..71f74187 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java
@@ -2,6 +2,7 @@ package kr.syeyoung.dungeonsguide.dungeon;
import com.google.common.collect.Sets;
import kr.syeyoung.dungeonsguide.DungeonsGuide;
+import kr.syeyoung.dungeonsguide.SkyblockStatus;
import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom;
import kr.syeyoung.dungeonsguide.dungeon.doorfinder.DoorFinderRegistry;
import kr.syeyoung.dungeonsguide.dungeon.doorfinder.StartDoorFinder;
@@ -97,15 +98,15 @@ public class MapProcessor {
}
// determine door location based on npc, and determine map min from there
{
- StartDoorFinder doorFinder = DoorFinderRegistry.getDoorFinder(DungeonsGuide.getDungeonsGuide().getSkyblockStatus().getDungeonName());
+ StartDoorFinder doorFinder = DoorFinderRegistry.getDoorFinder(((SkyblockStatus) DungeonsGuide.getDungeonsGuide().getSkyblockStatus()).getDungeonName());
if (doorFinder == null) {
- DungeonsGuide.sendDebugChat(new ChatComponentText("Couldn't find door finder for :: "+DungeonsGuide.getDungeonsGuide().getSkyblockStatus().getDungeonName()));
+ DungeonsGuide.sendDebugChat(new ChatComponentText("Couldn't find door finder for :: "+((SkyblockStatus) DungeonsGuide.getDungeonsGuide().getSkyblockStatus()).getDungeonName()));
bugged = true;
return;
}
BlockPos door = doorFinder.find(context.getWorld());
if (door == null) {
- DungeonsGuide.sendDebugChat(new ChatComponentText("Couldn't find door :: "+DungeonsGuide.getDungeonsGuide().getSkyblockStatus().getDungeonName()));
+ DungeonsGuide.sendDebugChat(new ChatComponentText("Couldn't find door :: "+((SkyblockStatus) DungeonsGuide.getDungeonsGuide().getSkyblockStatus()).getDungeonName()));
bugged = true;
return;
}