refactoring
/
SLC-1.8.9
mirror of https://github.com/refactorinqq/SLC-1.8.9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes

This commit is contained in:
kirillsaint 2023-07-27 14:20:33 +06:00
parent 655c37daa8
commit fba96fa175
4 changed files with 21 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/net/silentclient/client/gui/GuiMultiplayerInGame.java
View File

@ -6,12 +6,9 @@ import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.GuiScreenServerList; import net.minecraft.client.gui.GuiScreenServerList;
import net.minecraft.client.multiplayer.ServerData; import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.silentclient.client.Client; import net.silentclient.client.mixin.ducks.GuiMultiplayerExt;
import net.silentclient.client.mixin.accessors.GuiMultiplayerAccessor;
import net.silentclient.client.utils.ClientUtils;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Field;
public class GuiMultiplayerInGame extends GuiMultiplayer { public class GuiMultiplayerInGame extends GuiMultiplayer {
@ -26,17 +23,9 @@ public class GuiMultiplayerInGame extends GuiMultiplayer {
} }
if(button.id == 4) { if(button.id == 4) {
((GuiMultiplayerAccessor) this).silent$setDirectConnect(true); ((GuiMultiplayerExt) this).silent$setDirectConnect(true);
try { ((GuiMultiplayerExt) this).silent$setSelectedServer(new ServerData(I18n.format("selectServer.defaultName"), "", false));
Class<?> clazz = this.getClass(); this.mc.displayGuiScreen(new GuiScreenServerList(this, new ServerData(I18n.format("selectServer.defaultName"), "", false)));
Object cc = clazz.newInstance();
Field f1 = cc.getClass().getSuperclass().getDeclaredField(ClientUtils.isDevelopment() ? "selectedServer" : "z");
f1.setAccessible(true);
f1.set(cc, new ServerData(I18n.format("selectServer.defaultName"), "", false));
this.mc.displayGuiScreen(new GuiScreenServerList(this, (ServerData) f1.get(cc)));
} catch (Exception err) {
Client.logger.catching(err);
}
} }
super.actionPerformed(button); super.actionPerformed(button);
@ -53,15 +42,7 @@ public class GuiMultiplayerInGame extends GuiMultiplayer {
this.mc.theWorld.sendQuittingDisconnectingPacket(); this.mc.theWorld.sendQuittingDisconnectingPacket();
this.mc.loadWorld(null); this.mc.loadWorld(null);
this.mc.displayGuiScreen(null); this.mc.displayGuiScreen(null);
try { ((GuiMultiplayerExt) this).silent$setParentScreen(null);
Class<?> clazz = this.getClass();
Object cc = clazz.newInstance();
Field f1 = cc.getClass().getSuperclass().getDeclaredField(ClientUtils.isDevelopment() ? "parentScreen" : "g");
f1.setAccessible(true);
f1.set(cc, null);
} catch (Exception err) {
Client.logger.catching(err);
}
} }
} }

12
src/main/java/net/silentclient/client/mixin/accessors/GuiMultiplayerAccessor.java
View File

@ -1,12 +0,0 @@
package net.silentclient.client.mixin.accessors;
import net.minecraft.client.multiplayer.ServerData;
import net.silentclient.client.mixin.wrappers.GuiScreenWrapper;
import net.silentclient.client.mixin.wrappers.ServerDataWrapper;
public interface GuiMultiplayerAccessor {
void silent$setParentScreen(GuiScreenWrapper a);
void silent$setDirectConnect(boolean a);
void silent$setSelectedServer(ServerDataWrapper a);
ServerDataWrapper silent$getSelectedServer();
}

8
src/main/java/net/silentclient/client/mixin/ducks/GuiMultiplayerExt.java Normal file
View File

@ -0,0 +1,8 @@
package net.silentclient.client.mixin.ducks;
public interface GuiMultiplayerExt {
void silent$setParentScreen(Object a);
void silent$setDirectConnect(boolean a);
void silent$setSelectedServer(Object a);
Object silent$getSelectedServer();
}

18
src/main/java/net/silentclient/client/mixin/mixins/GuiMultiplayerMixin.java
View File

@ -4,15 +4,13 @@ import net.minecraft.client.gui.GuiMultiplayer;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.multiplayer.ServerData; import net.minecraft.client.multiplayer.ServerData;
import net.silentclient.client.gui.minecraft.GuiConnecting; import net.silentclient.client.gui.minecraft.GuiConnecting;
import net.silentclient.client.mixin.accessors.GuiMultiplayerAccessor; import net.silentclient.client.mixin.ducks.GuiMultiplayerExt;
import net.silentclient.client.mixin.wrappers.GuiScreenWrapper;
import net.silentclient.client.mixin.wrappers.ServerDataWrapper;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@Mixin(GuiMultiplayer.class) @Mixin(GuiMultiplayer.class)
public abstract class GuiMultiplayerMixin extends GuiScreen implements GuiMultiplayerAccessor { public abstract class GuiMultiplayerMixin extends GuiScreen implements GuiMultiplayerExt {
@Shadow private GuiScreen parentScreen; @Shadow private GuiScreen parentScreen;
@Shadow private boolean directConnect; @Shadow private boolean directConnect;
@ -28,12 +26,12 @@ public abstract class GuiMultiplayerMixin extends GuiScreen implements GuiMultip
} }
@Override @Override
public void silent$setParentScreen(GuiScreenWrapper a) { public void silent$setParentScreen(Object a) {
if(a == null) { if(a == null) {
this.parentScreen = null; this.parentScreen = null;
return; return;
} }
this.parentScreen = a.getScreen(); this.parentScreen = (GuiScreen) a;
} }
@Override @Override
@ -42,16 +40,16 @@ public abstract class GuiMultiplayerMixin extends GuiScreen implements GuiMultip
} }
@Override @Override
public ServerDataWrapper silent$getSelectedServer() { public Object silent$getSelectedServer() {
return new ServerDataWrapper(selectedServer); return selectedServer;
} }
@Override @Override
public void silent$setSelectedServer(ServerDataWrapper a) { public void silent$setSelectedServer(Object a) {
if(a == null) { if(a == null) {
this.selectedServer = null; this.selectedServer = null;
return; return;
} }
this.selectedServer = a.getServerData(); this.selectedServer = (ServerData) a;
} }
} }