From e303ac6323e523a60f37a61afadc64a8e23c0aaf Mon Sep 17 00:00:00 2001
From: hannibal00212 <hannibal00212@users.noreply.github.com>
Date: Thu, 7 Jul 2022 20:28:20 +0000
Subject: Prettified Code!
---
.../at/lorenz/mod/mixins/MixinGuiContainer.java | 2 -
.../com/thatgravyboat/skyblockhud/SkyblockHud.java | 292 ++++++++++-----------
2 files changed, 144 insertions(+), 150 deletions(-)
(limited to 'src')
diff --git a/src/main/java/at/lorenz/mod/mixins/MixinGuiContainer.java b/src/main/java/at/lorenz/mod/mixins/MixinGuiContainer.java
index c9dc12fc5..a0cf8fdbe 100644
--- a/src/main/java/at/lorenz/mod/mixins/MixinGuiContainer.java
+++ b/src/main/java/at/lorenz/mod/mixins/MixinGuiContainer.java
@@ -41,10 +41,8 @@ public abstract class MixinGuiContainer extends GuiScreen {
hook.onDrawSlotPost(slot, ci);
}
-
@Inject(method = "handleMouseClick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/PlayerControllerMP;windowClick(IIIILnet/minecraft/entity/player/EntityPlayer;)Lnet/minecraft/item/ItemStack;"), cancellable = true)
private void onMouseClick(Slot slot, int slotId, int clickedButton, int clickType, CallbackInfo ci) {
hook.onMouseClick(slot, slotId, clickedButton, clickType, ci);
}
-
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java b/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
index fa55cf3ad..320a2b2e6 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
@@ -1,20 +1,19 @@
package com.thatgravyboat.skyblockhud;
-import at.lorenz.mod.bazaar.BazaarApi;
import at.lorenz.mod.HideNotClickableItems;
+import at.lorenz.mod.bazaar.BazaarApi;
import at.lorenz.mod.bazaar.BazaarOrderHelper;
import at.lorenz.mod.chat.ChatFilter;
import at.lorenz.mod.chat.ChatManager;
import at.lorenz.mod.dungeon.DungeonChatFilter;
import com.thatgravyboat.skyblockhud.config.SBHConfig;
+import java.io.File;
import net.minecraft.client.gui.GuiScreen;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import java.io.File;
-
@Mod(modid = SkyblockHud.MODID, version = SkyblockHud.VERSION)
public class SkyblockHud {
@@ -23,17 +22,16 @@ public class SkyblockHud {
public static SBHConfig config;
-// private File configFile;
+ // private File configFile;
-// private static final Set<String> SKYBLOCK_IN_ALL_LANGUAGES = Sets.newHashSet("SKYBLOCK", "\u7A7A\u5C9B\u751F\u5B58");
+ // private static final Set<String> SKYBLOCK_IN_ALL_LANGUAGES = Sets.newHashSet("SKYBLOCK", "\u7A7A\u5C9B\u751F\u5B58");
-// private final Gson gson = new GsonBuilder().setPrettyPrinting().excludeFieldsWithoutExposeAnnotation().create();
+ // private final Gson gson = new GsonBuilder().setPrettyPrinting().excludeFieldsWithoutExposeAnnotation().create();
public static File configDirectory;
@EventHandler
public void preInit(FMLPreInitializationEvent event) {
-
new BazaarApi();
MinecraftForge.EVENT_BUS.register(new BazaarOrderHelper());
@@ -41,155 +39,153 @@ public class SkyblockHud {
MinecraftForge.EVENT_BUS.register(new ChatFilter());
MinecraftForge.EVENT_BUS.register(new DungeonChatFilter());
MinecraftForge.EVENT_BUS.register(new HideNotClickableItems());
-
-
-// MinecraftForge.EVENT_BUS.register(new LeaderboardGetter());
-// MinecraftForge.EVENT_BUS.register(new SeasonDateHandler());
-// MinecraftForge.EVENT_BUS.register(new LocationHandler());
-// MinecraftForge.EVENT_BUS.register(new IslandHandler());
-// MinecraftForge.EVENT_BUS.register(new TimeHandler());
-// MinecraftForge.EVENT_BUS.register(new CurrencyHandler());
-// MinecraftForge.EVENT_BUS.register(new SlayerHandler());
-// MinecraftForge.EVENT_BUS.register(new DungeonHandler());
-// MinecraftForge.EVENT_BUS.register(new MinesHandler());
-// MinecraftForge.EVENT_BUS.register(new FarmingIslandHandler());
-//
-// MinecraftForge.EVENT_BUS.register(new TrackerHandler());
-// MinecraftForge.EVENT_BUS.register(new KillTracking());
-//
-// MinecraftForge.EVENT_BUS.register(new HeldItemHandler());
-//
-// ClientRegistry.registerKeyBinding(KeyBindings.map);
-//
-// MinecraftForge.EVENT_BUS.register(new ComponentHandler());
-// MinecraftForge.EVENT_BUS.register(new ActionBarParsing());
-// MinecraftForge.EVENT_BUS.register(new CrystalWaypoints());
-// MinecraftForge.EVENT_BUS.register(new FarmHouseHandler());
-// MinecraftForge.EVENT_BUS.register(new WarpHandler());
-// MinecraftForge.EVENT_BUS.register(new CooldownHandler());
-// Commands.init();
-//
-// ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new NpcDialogue());
-// ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new Textures());
-//
-// configDirectory = new File(event.getModConfigurationDirectory(), "skyblockhud");
-// try {
-// configDirectory.mkdir();
-// } catch (Exception ignored) {}
-//
-// configFile = new File(configDirectory, "sbh-config.json");
-//
-// if (configFile.exists()) {
-// try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8))) {
-// config = gson.fromJson(reader, SBHConfig.class);
-// } catch (Exception ignored) {}
-// }
-//
-// if (config == null) {
-// config = new SBHConfig();
-// saveConfig();
-// }
-//
-// Textures.setTexture(config.misc.style);
-//
-// if (WarpHandler.load()) {
-// WarpHandler.save();
-// }
-//
-// Runtime.getRuntime().addShutdownHook(new Thread(this::saveConfig));
-// Runtime.getRuntime().addShutdownHook(new Thread(TrackerFileLoader::saveTrackerStatsFile));
+ // MinecraftForge.EVENT_BUS.register(new LeaderboardGetter());
+ // MinecraftForge.EVENT_BUS.register(new SeasonDateHandler());
+ // MinecraftForge.EVENT_BUS.register(new LocationHandler());
+ // MinecraftForge.EVENT_BUS.register(new IslandHandler());
+ // MinecraftForge.EVENT_BUS.register(new TimeHandler());
+ // MinecraftForge.EVENT_BUS.register(new CurrencyHandler());
+ // MinecraftForge.EVENT_BUS.register(new SlayerHandler());
+ // MinecraftForge.EVENT_BUS.register(new DungeonHandler());
+ // MinecraftForge.EVENT_BUS.register(new MinesHandler());
+ // MinecraftForge.EVENT_BUS.register(new FarmingIslandHandler());
+ //
+ // MinecraftForge.EVENT_BUS.register(new TrackerHandler());
+ // MinecraftForge.EVENT_BUS.register(new KillTracking());
+ //
+ // MinecraftForge.EVENT_BUS.register(new HeldItemHandler());
+ //
+ // ClientRegistry.registerKeyBinding(KeyBindings.map);
+ //
+ // MinecraftForge.EVENT_BUS.register(new ComponentHandler());
+ // MinecraftForge.EVENT_BUS.register(new ActionBarParsing());
+ // MinecraftForge.EVENT_BUS.register(new CrystalWaypoints());
+ // MinecraftForge.EVENT_BUS.register(new FarmHouseHandler());
+ // MinecraftForge.EVENT_BUS.register(new WarpHandler());
+ // MinecraftForge.EVENT_BUS.register(new CooldownHandler());
+ // Commands.init();
+ //
+ // ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new NpcDialogue());
+ // ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new Textures());
+ //
+ // configDirectory = new File(event.getModConfigurationDirectory(), "skyblockhud");
+ // try {
+ // configDirectory.mkdir();
+ // } catch (Exception ignored) {}
+ //
+ // configFile = new File(configDirectory, "sbh-config.json");
+ //
+ // if (configFile.exists()) {
+ // try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8))) {
+ // config = gson.fromJson(reader, SBHConfig.class);
+ // } catch (Exception ignored) {}
+ // }
+ //
+ // if (config == null) {
+ // config = new SBHConfig();
+ // saveConfig();
+ // }
+ //
+ // Textures.setTexture(config.misc.style);
+ //
+ // if (WarpHandler.load()) {
+ // WarpHandler.save();
+ // }
+ //
+ // Runtime.getRuntime().addShutdownHook(new Thread(this::saveConfig));
+ // Runtime.getRuntime().addShutdownHook(new Thread(TrackerFileLoader::saveTrackerStatsFile));
}
-// public void saveConfig() {
-// try {
-// configFile.createNewFile();
-//
-// try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8))) {
-// writer.write(gson.toJson(config));
-// }
-// } catch (IOException ignored) {}
-// }
-
-// @EventHandler
-// public void postInit(FMLPostInitializationEvent event) {
-// MinecraftForge.EVENT_BUS.register(new OverlayHud());
-// MinecraftForge.EVENT_BUS.register(new RPGHud());
-// MinecraftForge.EVENT_BUS.register(new DungeonOverlay());
-// MinecraftForge.EVENT_BUS.register(new BossbarHandler());
-// MinecraftForge.EVENT_BUS.register(new MapHandler());
-// MinecraftForge.EVENT_BUS.register(new MiningHud());
-// MinecraftForge.EVENT_BUS.register(new NpcDialogue());
-// }
-
-// @EventHandler
-// public void loadComplete(FMLLoadCompleteEvent event) {
-// TrackerFileLoader.loadTrackersFile();
-//
-// if (TrackerFileLoader.loadTrackerStatsFile()) {
-// TrackerFileLoader.saveTrackerStatsFile();
-// }
-// }
-
-// @SubscribeEvent
-// public void onLeaveServer(FMLNetworkEvent.ClientDisconnectionFromServerEvent event) {
-// TrackerFileLoader.saveTrackerStatsFile();
-// }
+ // public void saveConfig() {
+ // try {
+ // configFile.createNewFile();
+ //
+ // try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8))) {
+ // writer.write(gson.toJson(config));
+ // }
+ // } catch (IOException ignored) {}
+ // }
+
+ // @EventHandler
+ // public void postInit(FMLPostInitializationEvent event) {
+ // MinecraftForge.EVENT_BUS.register(new OverlayHud());
+ // MinecraftForge.EVENT_BUS.register(new RPGHud());
+ // MinecraftForge.EVENT_BUS.register(new DungeonOverlay());
+ // MinecraftForge.EVENT_BUS.register(new BossbarHandler());
+ // MinecraftForge.EVENT_BUS.register(new MapHandler());
+ // MinecraftForge.EVENT_BUS.register(new MiningHud());
+ // MinecraftForge.EVENT_BUS.register(new NpcDialogue());
+ // }
+
+ // @EventHandler
+ // public void loadComplete(FMLLoadCompleteEvent event) {
+ // TrackerFileLoader.loadTrackersFile();
+ //
+ // if (TrackerFileLoader.loadTrackerStatsFile()) {
+ // TrackerFileLoader.saveTrackerStatsFile();
+ // }
+ // }
+
+ // @SubscribeEvent
+ // public void onLeaveServer(FMLNetworkEvent.ClientDisconnectionFromServerEvent event) {
+ // TrackerFileLoader.saveTrackerStatsFile();
+ // }
public static boolean hasSkyblockScoreboard() {
-// Minecraft mc = Minecraft.getMinecraft();
-//
-// if (mc != null && mc.theWorld != null) {
-// Scoreboard scoreboard = mc.theWorld.getScoreboard();
-// ScoreObjective sidebarObjective = scoreboard.getObjectiveInDisplaySlot(1);
-// if (sidebarObjective != null) {
-// String objectiveName = sidebarObjective.getDisplayName().replaceAll("(?i)\\u00A7.", "");
-// for (String skyblock : SKYBLOCK_IN_ALL_LANGUAGES) {
-// if (objectiveName.startsWith(skyblock)) {
-// return true;
-// }
-// }
-// }
-// }
+ // Minecraft mc = Minecraft.getMinecraft();
+ //
+ // if (mc != null && mc.theWorld != null) {
+ // Scoreboard scoreboard = mc.theWorld.getScoreboard();
+ // ScoreObjective sidebarObjective = scoreboard.getObjectiveInDisplaySlot(1);
+ // if (sidebarObjective != null) {
+ // String objectiveName = sidebarObjective.getDisplayName().replaceAll("(?i)\\u00A7.", "");
+ // for (String skyblock : SKYBLOCK_IN_ALL_LANGUAGES) {
+ // if (objectiveName.startsWith(skyblock)) {
+ // return true;
+ // }
+ // }
+ // }
+ // }
return false;
}
-// @SubscribeEvent
-// public void onTooltip(ItemTooltipEvent event) {
-// if (event.itemStack != null && Keyboard.isKeyDown(Keyboard.KEY_BACKSLASH)) {
-// try {
-// StringSelection clipboard = new StringSelection(event.itemStack.serializeNBT().toString());
-// Toolkit.getDefaultToolkit().getSystemClipboard().setContents(clipboard, clipboard);
-// } catch (Exception ignored) {}
-// }
-// }
-
-// @SubscribeEvent(priority = EventPriority.HIGHEST)
-// public void onStatusBar(ClientChatReceivedEvent event) {
-// String message = Utils.removeColor(event.message.getUnformattedText()).toLowerCase().trim();
-//
-// if (message.startsWith("your profile was changed to:")) {
-// String stripped = message.replace("your profile was changed to:", "").replace("(co-op)", "").trim();
-// MinecraftForge.EVENT_BUS.post(new ProfileSwitchedEvent(stripped));
-// }
-// if (message.startsWith("you are playing on profile:")) {
-// String stripped = message.replace("you are playing on profile:", "").replace("(co-op)", "").trim();
-// MinecraftForge.EVENT_BUS.post(new ProfileJoinedEvent(stripped));
-// }
-// }
+ // @SubscribeEvent
+ // public void onTooltip(ItemTooltipEvent event) {
+ // if (event.itemStack != null && Keyboard.isKeyDown(Keyboard.KEY_BACKSLASH)) {
+ // try {
+ // StringSelection clipboard = new StringSelection(event.itemStack.serializeNBT().toString());
+ // Toolkit.getDefaultToolkit().getSystemClipboard().setContents(clipboard, clipboard);
+ // } catch (Exception ignored) {}
+ // }
+ // }
+
+ // @SubscribeEvent(priority = EventPriority.HIGHEST)
+ // public void onStatusBar(ClientChatReceivedEvent event) {
+ // String message = Utils.removeColor(event.message.getUnformattedText()).toLowerCase().trim();
+ //
+ // if (message.startsWith("your profile was changed to:")) {
+ // String stripped = message.replace("your profile was changed to:", "").replace("(co-op)", "").trim();
+ // MinecraftForge.EVENT_BUS.post(new ProfileSwitchedEvent(stripped));
+ // }
+ // if (message.startsWith("you are playing on profile:")) {
+ // String stripped = message.replace("you are playing on profile:", "").replace("(co-op)", "").trim();
+ // MinecraftForge.EVENT_BUS.post(new ProfileJoinedEvent(stripped));
+ // }
+ // }
public static GuiScreen screenToOpen = null;
-// private static int screenTicks = 0;
-
-// @SubscribeEvent
-// public void onClientTick(TickEvent.ClientTickEvent event) {
-// if (screenToOpen != null) {
-// screenTicks++;
-// if (screenTicks == 5) {
-// Minecraft.getMinecraft().displayGuiScreen(screenToOpen);
-// screenTicks = 0;
-// screenToOpen = null;
-// }
-// }
-// }
+ // private static int screenTicks = 0;
+
+ // @SubscribeEvent
+ // public void onClientTick(TickEvent.ClientTickEvent event) {
+ // if (screenToOpen != null) {
+ // screenTicks++;
+ // if (screenTicks == 5) {
+ // Minecraft.getMinecraft().displayGuiScreen(screenToOpen);
+ // screenTicks = 0;
+ // screenToOpen = null;
+ // }
+ // }
+ // }
}
--
cgit