remove old stuff

46 files changed, 3993 insertions, 3995 deletions

diff --git a/src/main/java/at/lorenz/mod/LorenzMod.java b/src/main/java/at/lorenz/mod/LorenzMod.java
index 0e0d625f8..75396d94d 100644
--- a/src/main/java/at/lorenz/mod/LorenzMod.java
+++ b/src/main/java/at/lorenz/mod/LorenzMod.java
@@ -11,10 +11,6 @@ import at.lorenz.mod.dungeon.DungeonHighlightClickedBlocks;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.thatgravyboat.skyblockhud.commands.Commands;
-import com.thatgravyboat.skyblockhud.config.SBHConfig;
-import com.thatgravyboat.skyblockhud.textures.Textures;
-import java.io.*;
-import java.nio.charset.StandardCharsets;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.resources.IReloadableResourceManager;
@@ -25,14 +21,16 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+
 @Mod(modid = LorenzMod.MODID, version = LorenzMod.VERSION)
 public class LorenzMod {
 
     public static final String MODID = "lorenzmod";
     public static final String VERSION = "0.2.1";
 
-    @Deprecated
-    public static SBHConfig config; //TODO delete
+//    public static SBHConfig config; //TODO delete
 
     public static Features feature;
     private File configFile;
@@ -86,20 +84,22 @@ public class LorenzMod {
 
         //
         //        ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new NpcDialogue());
-        ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new Textures());
+//        ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new Textures());
         //
         configDirectory = new File("mods/LorenzMod/config");
         try {
             //noinspection ResultOfMethodCallIgnored
             configDirectory.mkdir();
-        } catch (Exception ignored) {}
+        } catch (Exception ignored) {
+        }
 
         configFile = new File(configDirectory, "config.json");
 
         if (configFile.exists()) {
             try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8))) {
                 feature = gson.fromJson(reader, Features.class);
-            } catch (Exception ignored) {}
+            } catch (Exception ignored) {
+            }
         }
 
         if (feature == null) {
@@ -125,7 +125,8 @@ public class LorenzMod {
             try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8))) {
                 writer.write(gson.toJson(feature));
             }
-        } catch (IOException ignored) {}
+        } catch (IOException ignored) {
+        }
     }
 
     //    @EventHandler
diff --git a/src/main/java/at/lorenz/mod/config/Features.java b/src/main/java/at/lorenz/mod/config/Features.java
index c35639491..e195f1d1b 100644
--- a/src/main/java/at/lorenz/mod/config/Features.java
+++ b/src/main/java/at/lorenz/mod/config/Features.java
@@ -4,7 +4,6 @@ import com.google.gson.annotations.Expose;
 import at.lorenz.mod.LorenzMod;
 import com.thatgravyboat.skyblockhud.config.SBHConfigEditor;
 import com.thatgravyboat.skyblockhud.core.GuiScreenElementWrapper;
-import com.thatgravyboat.skyblockhud.core.config.Config;
 import com.thatgravyboat.skyblockhud.core.config.Position;
 import com.thatgravyboat.skyblockhud.core.config.annotations.Category;
 import com.thatgravyboat.skyblockhud.core.config.annotations.ConfigEditorBoolean;
@@ -12,13 +11,12 @@ import com.thatgravyboat.skyblockhud.core.config.annotations.ConfigOption;
 import com.thatgravyboat.skyblockhud.core.config.gui.GuiPositionEditor;
 import net.minecraft.client.Minecraft;
 
-public class Features extends Config {
+public class Features  {
 
     private void editOverlay(String activeConfig, int width, int height, Position position) {
-        Minecraft.getMinecraft().displayGuiScreen(new GuiPositionEditor(position, width, height, () -> {}, () -> {}, () -> LorenzMod.screenToOpen = new GuiScreenElementWrapper(new SBHConfigEditor(LorenzMod.config, activeConfig))));
+        Minecraft.getMinecraft().displayGuiScreen(new GuiPositionEditor(position, width, height, () -> {}, () -> {}, () -> LorenzMod.screenToOpen = new GuiScreenElementWrapper(new SBHConfigEditor(LorenzMod.feature, activeConfig))));
     }
 
-    @Override
     public void executeRunnable(String runnableId) {
         //        String activeConfigCategory = null;
         //        if (Minecraft.getMinecraft().currentScreen instanceof GuiScreenElementWrapper) {
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
index eba20ea4d..5677a7382 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
@@ -1,124 +1,124 @@
-package com.thatgravyboat.skyblockhud;
-
-import at.lorenz.mod.LorenzMod;
-import com.google.common.collect.ComparisonChain;
-import com.google.common.collect.Ordering;
-import com.thatgravyboat.skyblockhud.dungeons.DungeonHandler;
-import com.thatgravyboat.skyblockhud.location.*;
-import com.thatgravyboat.skyblockhud.seasons.SeasonDateHandler;
-import com.thatgravyboat.skyblockhud.utils.Utils;
-import java.util.Comparator;
-import java.util.List;
-import java.util.regex.Pattern;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.network.NetworkPlayerInfo;
-import net.minecraft.scoreboard.ScorePlayerTeam;
-import net.minecraft.world.WorldSettings;
-import net.minecraftforge.client.GuiIngameForge;
-import net.minecraftforge.client.event.ClientChatReceivedEvent;
-import net.minecraftforge.fml.common.eventhandler.EventPriority;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-public class ComponentHandler {
-
-    public static final Pattern SCOREBOARD_CHARACTERS = Pattern.compile("[^]\\[a-z A-Z:0-9/'.()+\\d-§?]");
-    private static final Ordering<NetworkPlayerInfo> sortingList = Ordering.from(new PlayerComparator());
-    private static int ticksExisted = 0;
-
-    @SubscribeEvent
-    public void onClientTick(TickEvent.ClientTickEvent event) {
-        Minecraft mc = Minecraft.getMinecraft();
-        ticksExisted++;
-        boolean eventPass = false;
-        if (mc.theWorld != null) {
-            List<NetworkPlayerInfo> players = sortingList.sortedCopy(mc.thePlayer.sendQueue.getPlayerInfoMap());
-            GuiIngameForge.renderObjective = !LorenzMod.hasSkyblockScoreboard() || !LorenzMod.config.misc.hideScoreboard;
-            if (players != null && LorenzMod.hasSkyblockScoreboard()) {
-                if (ticksExisted % 60 == 0) {
-                    for (NetworkPlayerInfo player : players) {
-                        if (player.getDisplayName() != null) {
-                            String formattedTabListPlayer = SCOREBOARD_CHARACTERS.matcher(Utils.removeColor(player.getDisplayName().getFormattedText())).replaceAll("");
-                            if (LocationHandler.getCurrentLocation().equals(Locations.CATACOMBS)) {
-                                if (formattedTabListPlayer.toLowerCase().contains("secrets found:")) DungeonHandler.parseTotalSecrets(formattedTabListPlayer);
-                                if (formattedTabListPlayer.toLowerCase().contains("deaths:")) DungeonHandler.parseDeaths(formattedTabListPlayer);
-                                if (formattedTabListPlayer.toLowerCase().contains("crypts:")) DungeonHandler.parseCrypts(formattedTabListPlayer);
-                            } else if (LocationHandler.getCurrentLocation().getCategory().isMiningCategory()) {
-                                if (formattedTabListPlayer.toLowerCase().contains("mithril powder:")) {
-                                    MinesHandler.parseMithril(formattedTabListPlayer);
-                                }
-                                if (formattedTabListPlayer.toLowerCase().contains("gemstone powder:")) {
-                                    MinesHandler.parseGemstone(formattedTabListPlayer);
-                                }
-                            } else if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.MUSHROOMDESERT)) {
-                                if (formattedTabListPlayer.toLowerCase().contains("pelts:")) {
-                                    try {
-                                        FarmingIslandHandler.pelts = Integer.parseInt(formattedTabListPlayer.toLowerCase().replace("pelts:", "").trim());
-                                    } catch (Exception ignored) {}
-                                }
-                            }
-                        }
-                    }
-                    if (players.size() > 80) {
-                        for (int i = 61; i <= 80; i++) {
-                            if (players.get(i).getDisplayName() != null) {
-                                String formattedTabListPlayer = SCOREBOARD_CHARACTERS.matcher(Utils.removeColor(players.get(i).getDisplayName().getFormattedText())).replaceAll("");
-                                if (formattedTabListPlayer.toLowerCase().contains("event:")) {
-                                    if (i < 80) {
-                                        if (players.get(i + 1).getDisplayName() != null) {
-                                            String secondLine = SCOREBOARD_CHARACTERS.matcher(Utils.removeColor(players.get(i + 1).getDisplayName().getFormattedText())).replaceAll("");
-                                            if (!formattedTabListPlayer.contains("N/A")) {
-                                                SeasonDateHandler.setCurrentEvent(formattedTabListPlayer.replace("Event:", ""), secondLine);
-                                                eventPass = true;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                            if (i == 80 && !eventPass) {
-                                SeasonDateHandler.setCurrentEvent("", "");
-                            }
-                        }
-                    }
-                }
-                if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.PARK)) {
-                    if (players.size() >= 80) {
-                        for (int i = 41; i <= 60; i++) {
-                            if (players.get(i).getDisplayName() != null) {
-                                String formattedTabListPlayer = SCOREBOARD_CHARACTERS.matcher(Utils.removeColor(players.get(i).getDisplayName().getFormattedText())).replaceAll("");
-                                if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.PARK)) {
-                                    if (formattedTabListPlayer.toLowerCase().contains("rain:")) {
-                                        ParkIslandHandler.parseRain(formattedTabListPlayer.toLowerCase());
-                                    }
-                                }
-                            }
-                        }
-                    }
-                } else if (ParkIslandHandler.isRaining()) {
-                    ParkIslandHandler.parseRain(null);
-                }
-            }
-        }
-    }
-
-    @SubscribeEvent(priority = EventPriority.HIGHEST)
-    public void onStatusBar(ClientChatReceivedEvent event) {
-        if (event.type == 2) {
-            if (LocationHandler.getCurrentLocation().equals(Locations.CATACOMBS)) DungeonHandler.parseSecrets(event.message.getFormattedText());
-        }
-    }
-
-    @SideOnly(Side.CLIENT)
-    static class PlayerComparator implements Comparator<NetworkPlayerInfo> {
-
-        private PlayerComparator() {}
-
-        public int compare(NetworkPlayerInfo p_compare_1_, NetworkPlayerInfo p_compare_2_) {
-            ScorePlayerTeam scoreplayerteam = p_compare_1_.getPlayerTeam();
-            ScorePlayerTeam scoreplayerteam1 = p_compare_2_.getPlayerTeam();
-            return ComparisonChain.start().compareTrueFirst(p_compare_1_.getGameType() != WorldSettings.GameType.SPECTATOR, p_compare_2_.getGameType() != WorldSettings.GameType.SPECTATOR).compare(scoreplayerteam != null ? scoreplayerteam.getRegisteredName() : "", scoreplayerteam1 != null ? scoreplayerteam1.getRegisteredName() : "").compare(p_compare_1_.getGameProfile().getName(), p_compare_2_.getGameProfile().getName()).result();
-        }
-    }
-}
+//package com.thatgravyboat.skyblockhud;
+//
+//import at.lorenz.mod.LorenzMod;
+//import com.google.common.collect.ComparisonChain;
+//import com.google.common.collect.Ordering;
+//import com.thatgravyboat.skyblockhud.dungeons.DungeonHandler;
+//import com.thatgravyboat.skyblockhud.location.*;
+//import com.thatgravyboat.skyblockhud.seasons.SeasonDateHandler;
+//import com.thatgravyboat.skyblockhud.utils.Utils;
+//import java.util.Comparator;
+//import java.util.List;
+//import java.util.regex.Pattern;
+//import net.minecraft.client.Minecraft;
+//import net.minecraft.client.network.NetworkPlayerInfo;
+//import net.minecraft.scoreboard.ScorePlayerTeam;
+//import net.minecraft.world.WorldSettings;
+//import net.minecraftforge.client.GuiIngameForge;
+//import net.minecraftforge.client.event.ClientChatReceivedEvent;
+//import net.minecraftforge.fml.common.eventhandler.EventPriority;
+//import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+//import net.minecraftforge.fml.common.gameevent.TickEvent;
+//import net.minecraftforge.fml.relauncher.Side;
+//import net.minecraftforge.fml.relauncher.SideOnly;
+//
+//public class ComponentHandler {
+//
+//    public static final Pattern SCOREBOARD_CHARACTERS = Pattern.compile("[^]\\[a-z A-Z:0-9/'.()+\\d-§?]");
+//    private static final Ordering<NetworkPlayerInfo> sortingList = Ordering.from(new PlayerComparator());
+//    private static int ticksExisted = 0;
+//
+//    @SubscribeEvent
+//    public void onClientTick(TickEvent.ClientTickEvent event) {
+//        Minecraft mc = Minecraft.getMinecraft();
+//        ticksExisted++;
+//        boolean eventPass = false;
+//        if (mc.theWorld != null) {
+//            List<NetworkPlayerInfo> players = sortingList.sortedCopy(mc.thePlayer.sendQueue.getPlayerInfoMap());
+//            GuiIngameForge.renderObjective = !LorenzMod.hasSkyblockScoreboard() || !LorenzMod.config.misc.hideScoreboard;
+//            if (players != null && LorenzMod.hasSkyblockScoreboard()) {
+//                if (ticksExisted % 60 == 0) {
+//                    for (NetworkPlayerInfo player : players) {
+//                        if (player.getDisplayName() != null) {
+//                            String formattedTabListPlayer = SCOREBOARD_CHARACTERS.matcher(Utils.removeColor(player.getDisplayName().getFormattedText())).replaceAll("");
+//                            if (LocationHandler.getCurrentLocation().equals(Locations.CATACOMBS)) {
+//                                if (formattedTabListPlayer.toLowerCase().contains("secrets found:")) DungeonHandler.parseTotalSecrets(formattedTabListPlayer);
+//                                if (formattedTabListPlayer.toLowerCase().contains("deaths:")) DungeonHandler.parseDeaths(formattedTabListPlayer);
+//                                if (formattedTabListPlayer.toLowerCase().contains("crypts:")) DungeonHandler.parseCrypts(formattedTabListPlayer);
+//                            } else if (LocationHandler.getCurrentLocation().getCategory().isMiningCategory()) {
+//                                if (formattedTabListPlayer.toLowerCase().contains("mithril powder:")) {
+//                                    MinesHandler.parseMithril(formattedTabListPlayer);
+//                                }
+//                                if (formattedTabListPlayer.toLowerCase().contains("gemstone powder:")) {
+//                                    MinesHandler.parseGemstone(formattedTabListPlayer);
+//                                }
+//                            } else if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.MUSHROOMDESERT)) {
+//                                if (formattedTabListPlayer.toLowerCase().contains("pelts:")) {
+//                                    try {
+//                                        FarmingIslandHandler.pelts = Integer.parseInt(formattedTabListPlayer.toLowerCase().replace("pelts:", "").trim());
+//                                    } catch (Exception ignored) {}
+//                                }
+//                            }
+//                        }
+//                    }
+//                    if (players.size() > 80) {
+//                        for (int i = 61; i <= 80; i++) {
+//                            if (players.get(i).getDisplayName() != null) {
+//                                String formattedTabListPlayer = SCOREBOARD_CHARACTERS.matcher(Utils.removeColor(players.get(i).getDisplayName().getFormattedText())).replaceAll("");
+//                                if (formattedTabListPlayer.toLowerCase().contains("event:")) {
+//                                    if (i < 80) {
+//                                        if (players.get(i + 1).getDisplayName() != null) {
+//                                            String secondLine = SCOREBOARD_CHARACTERS.matcher(Utils.removeColor(players.get(i + 1).getDisplayName().getFormattedText())).replaceAll("");
+//                                            if (!formattedTabListPlayer.contains("N/A")) {
+//                                                SeasonDateHandler.setCurrentEvent(formattedTabListPlayer.replace("Event:", ""), secondLine);
+//                                                eventPass = true;
+//                                            }
+//                                        }
+//                                    }
+//                                }
+//                            }
+//                            if (i == 80 && !eventPass) {
+//                                SeasonDateHandler.setCurrentEvent("", "");
+//                            }
+//                        }
+//                    }
+//                }
+//                if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.PARK)) {
+//                    if (players.size() >= 80) {
+//                        for (int i = 41; i <= 60; i++) {
+//                            if (players.get(i).getDisplayName() != null) {
+//                                String formattedTabListPlayer = SCOREBOARD_CHARACTERS.matcher(Utils.removeColor(players.get(i).getDisplayName().getFormattedText())).replaceAll("");
+//                                if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.PARK)) {
+//                                    if (formattedTabListPlayer.toLowerCase().contains("rain:")) {
+//                                        ParkIslandHandler.parseRain(formattedTabListPlayer.toLowerCase());
+//                                    }
+//                                }
+//                            }
+//                        }
+//                    }
+//                } else if (ParkIslandHandler.isRaining()) {
+//                    ParkIslandHandler.parseRain(null);
+//                }
+//            }
+//        }
+//    }
+//
+//    @SubscribeEvent(priority = EventPriority.HIGHEST)
+//    public void onStatusBar(ClientChatReceivedEvent event) {
+//        if (event.type == 2) {
+//            if (LocationHandler.getCurrentLocation().equals(Locations.CATACOMBS)) DungeonHandler.parseSecrets(event.message.getFormattedText());
+//        }
+//    }
+//
+//    @SideOnly(Side.CLIENT)
+//    static class PlayerComparator implements Comparator<NetworkPlayerInfo> {
+//
+//        private PlayerComparator() {}
+//
+//        public int compare(NetworkPlayerInfo p_compare_1_, NetworkPlayerInfo p_compare_2_) {
+//            ScorePlayerTeam scoreplayerteam = p_compare_1_.getPlayerTeam();
+//            ScorePlayerTeam scoreplayerteam1 = p_compare_2_.getPlayerTeam();
+//            return ComparisonChain.start().compareTrueFirst(p_compare_1_.getGameType() != WorldSettings.GameType.SPECTATOR, p_compare_2_.getGameType() != WorldSettings.GameType.SPECTATOR).compare(scoreplayerteam != null ? scoreplayerteam.getRegisteredName() : "", scoreplayerteam1 != null ? scoreplayerteam1.getRegisteredName() : "").compare(p_compare_1_.getGameProfile().getName(), p_compare_2_.getGameProfile().getName()).result();
+//        }
+//    }
+//}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/KillTracking.java b/src/main/java/com/thatgravyboat/skyblockhud/api/KillTracking.java
index bc98672d8..84882e1f4 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/KillTracking.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/api/KillTracking.java
@@ -1,61 +1,61 @@
-package com.thatgravyboat.skyblockhud.api;
-
-import com.thatgravyboat.skyblockhud.DevModeConstants;
-import com.thatgravyboat.skyblockhud.api.events.SkyBlockEntityKilled;
-import com.thatgravyboat.skyblockhud.api.sbentities.EntityTypeRegistry;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-import net.minecraft.client.Minecraft;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.DamageSource;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.EntityJoinWorldEvent;
-import net.minecraftforge.event.entity.living.LivingDeathEvent;
-import net.minecraftforge.event.entity.player.AttackEntityEvent;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-
-public class KillTracking {
-
-    public static final Set<UUID> attackedEntities = new HashSet<>();
-
-    @SubscribeEvent
-    public void onAttack(AttackEntityEvent event) {
-        if (event.target != null) {
-            attackedEntities.add(event.target.getUniqueID());
-        }
-    }
-
-    @SubscribeEvent
-    public void onDeath(LivingDeathEvent event) {
-        if (DevModeConstants.mobDeathLogging) {
-            //Used for testing
-            System.out.println("----------------------------------------------------------------------------------------------------------------");
-            System.out.println("Name : " + event.entity.getName());
-            System.out.println("UUID : " + event.entity.getUniqueID());
-            NBTTagCompound compound = new NBTTagCompound();
-            event.entity.writeToNBT(compound);
-            System.out.println("Tag : " + compound);
-            System.out.println("Damage : " + getDamageSourceString(event.source));
-            System.out.println("SBH Entity ID: " + EntityTypeRegistry.getEntityId(event.entity));
-            System.out.println("---------------------------------------------------------------------------------