Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions src/main/java/com/lambda/mixin/gui/MixinGuiIngameMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.lambda.client.util.Wrapper;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiIngameMenu;
import net.minecraft.client.gui.GuiMultiplayer;
import net.minecraft.client.gui.GuiScreen;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
Expand All @@ -15,11 +16,26 @@
public class MixinGuiIngameMenu extends GuiScreen {
@Inject(method = "actionPerformed", at = @At("HEAD"), cancellable = true)
public void actionPerformed(GuiButton button, CallbackInfo callbackInfo) {
if (button.id == 1) {
if (AntiDisconnect.INSTANCE.isEnabled()) {
Wrapper.getMinecraft().displayGuiScreen(new LambdaGuiAntiDisconnect());
callbackInfo.cancel();
}
switch (button.id) {
case 1:
if (AntiDisconnect.INSTANCE.isEnabled()) {
Wrapper.getMinecraft().displayGuiScreen(new LambdaGuiAntiDisconnect());
callbackInfo.cancel();
}
break;
case Integer.MIN_VALUE:
Wrapper.getMinecraft().displayGuiScreen(new GuiMultiplayer(this));
break;
default:
break;
}
}

@Inject(method = "initGui", at = @At("RETURN"))
public void initGui(CallbackInfo ci) {
if (!mc.isSingleplayer()) {
GuiButton openToLanButton = buttonList.remove(4);
buttonList.add(new GuiButton(Integer.MIN_VALUE, openToLanButton.x, openToLanButton.y, openToLanButton.width, openToLanButton.height, "Server List"));
}
}
}
22 changes: 22 additions & 0 deletions src/main/java/com/lambda/mixin/gui/MixinGuiMultiplayer.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.lambda.mixin.gui;

import net.minecraft.client.gui.GuiMultiplayer;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.multiplayer.ServerData;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(GuiMultiplayer.class)
public class MixinGuiMultiplayer extends GuiScreen {

@Inject(method = "connectToServer", at = @At("HEAD"))
public void connectToServer(ServerData serverData, CallbackInfo ci) {
if (mc.getCurrentServerData() != null && mc.world != null) {
mc.world.sendQuittingDisconnectingPacket();
mc.loadWorld(null);
}
}

}
1 change: 1 addition & 0 deletions src/main/resources/mixins.lambda.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"gui.MixinGuiIngameMenu",
"gui.MixinGuiInventory",
"gui.MixinGuiMainMenu",
"gui.MixinGuiMultiplayer",
"gui.MixinGuiNewChat",
"gui.MixinGuiPlayerTabOverlay",
"gui.MixinGuiScreen",
Expand Down