diff options
| author | Matthias Luger <malua007@live.de> | 2023-10-18 12:36:20 +0200 |
|---|---|---|
| committer | Matthias Luger <malua007@live.de> | 2023-10-18 12:36:20 +0200 |
| commit | 2088cda8b5a9d17047ddc1efd8a5c328795aa58d (patch) | |
| tree | c1614ea83de563001e8e981b32874aad6bd604b9 | |
| parent | 6f8a927b8022491aa5bb26dfb0900d207c99956d (diff) | |
| parent | 6bc4461a163f32bb5059a75e1afaabd55e026ad9 (diff) | |
| download | COFL-2088cda8b5a9d17047ddc1efd8a5c328795aa58d.tar.gz COFL-2088cda8b5a9d17047ddc1efd8a5c328795aa58d.tar.bz2 COFL-2088cda8b5a9d17047ddc1efd8a5c328795aa58d.zip | |
Merge remote-tracking branch 'origin/main' into main
| -rw-r--r-- | src/main/java/de/torui/coflsky/CoflSky.java | 7 | ||||
| -rw-r--r-- | src/main/java/de/torui/coflsky/gui/bingui/BinGuiCurrent.java | 4 | ||||
| -rw-r--r-- | src/main/java/de/torui/coflsky/gui/tfm/ButtonRemapper.java | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/main/java/de/torui/coflsky/CoflSky.java b/src/main/java/de/torui/coflsky/CoflSky.java index eb26d21..8389676 100644 --- a/src/main/java/de/torui/coflsky/CoflSky.java +++ b/src/main/java/de/torui/coflsky/CoflSky.java @@ -40,10 +40,9 @@ public class CoflSky { public static LocalConfig config; public static final String[] webSocketURIPrefix = new String[]{ - "wss://sky.coflnet.com/modsocket", - "wss://sky-mod.coflnet.com/modsocket", - "ws://sky.coflnet.com/modsocket", - "ws://sky-mod.coflnet.com/modsocket", + "wss://sky.coflnet.com/modsocket", + // fallback for old java versions not supporting new tls certificates + "ws://sky-mod.coflnet.com/modsocket", }; public static String CommandUri = Config.BaseUrl + "/api/mod/commands"; diff --git a/src/main/java/de/torui/coflsky/gui/bingui/BinGuiCurrent.java b/src/main/java/de/torui/coflsky/gui/bingui/BinGuiCurrent.java index d860fe3..e742ba0 100644 --- a/src/main/java/de/torui/coflsky/gui/bingui/BinGuiCurrent.java +++ b/src/main/java/de/torui/coflsky/gui/bingui/BinGuiCurrent.java @@ -146,12 +146,12 @@ public class BinGuiCurrent extends GuiChest { Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("[§1C§6oflnet§f]§7: §cBed is not purchasable yet.")); buyState = BuyState.INIT; } else { - mc.playerController.windowClick(this.chestGui.inventorySlots.windowId, 31, 2, 3, mc.thePlayer); + mc.playerController.windowClick(this.chestGui.inventorySlots.windowId, 31, 0, 0, mc.thePlayer); wasMouseDown = false; buyState = BuyState.CONFIRM; } } else if (guiName.equalsIgnoreCase("Confirm Purchase") && buyState == BuyState.BUYING) { - mc.playerController.windowClick(this.chestGui.inventorySlots.windowId, 11, 2, 3, mc.thePlayer); + mc.playerController.windowClick(this.chestGui.inventorySlots.windowId, 11, 0, 0, mc.thePlayer); resetGUI(); } } diff --git a/src/main/java/de/torui/coflsky/gui/tfm/ButtonRemapper.java b/src/main/java/de/torui/coflsky/gui/tfm/ButtonRemapper.java index 2d48434..7d64c64 100644 --- a/src/main/java/de/torui/coflsky/gui/tfm/ButtonRemapper.java +++ b/src/main/java/de/torui/coflsky/gui/tfm/ButtonRemapper.java @@ -264,7 +264,7 @@ public class ButtonRemapper { private void clickSlot(int windowId, int slot) { Minecraft.getMinecraft().playerController.windowClick(windowId, - slot, 2, 3, Minecraft.getMinecraft().thePlayer); + slot, 0, 0, Minecraft.getMinecraft().thePlayer); } private void handleBuyClick(GuiChest currentScreen, GuiScreenEvent.MouseInputEvent.Pre event) { |