BaseBand/BaseBandRewrite
3
0
Fork 0
Code Issues 4 Pull requests Projects 3 Releases Packages Wiki Activity Actions

jess-refactor #11

Closed
TudbuT wants to merge 7 commits from jess-refactor into main
pull from: jess-refactor
merge into: BaseBand:main
Conversation 1 Commits 7 Files changed 53 +10 -12
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1ac147fabe - Show all commits

2
Client/src/main/java/com/baseband/client/BaseBand.java
View file

@ -33,8 +33,6 @@ public class BaseBand {
public static boolean finishedDisabling = false;
public static Minecraft mc;
public void onInit() {
String[] banned = {"0836f9ee-4c5d-45e4-b39c-954880199acb", "18f87992-6459-43b8-8d26-6a4c74bee7ec", "f84e53c5-9143-4934-860c-ea44c9ad0e9f"};

4
Client/src/main/java/com/baseband/client/event/FMLEventHandler.java
View file

@ -22,7 +22,7 @@ import static com.baseband.client.BaseBand.mc;
//forge mod loader more like fuck my life this shit BLOWS
public class FMLEventHandler {
static FeatureManager FeatureManager = FeatureManager.get();
static FeatureManager featureManager = FeatureManager.get();
@SubscribeEvent
public void chat(ClientChatEvent event) {
@ -40,7 +40,7 @@ public class FMLEventHandler {
} catch (Exception e) {
ImplUtil.LOGGER.error("Error executing command {}", event.getMessage());
ImplUtil.LOGGER.error((Object) "The error: ", e);
IngameLogger.chatPrint("Error executing this command. Please send your latest.log to the " + FeatureManager.Name + " developers.");
IngameLogger.chatPrint("Error executing this command. Please send your latest.log to the " + featureManager.Name + " developers.");
}
}
}

12
Client/src/main/java/com/baseband/client/event/remote/RemoteEventManager.java
View file

@ -22,7 +22,7 @@ import java.util.LinkedList;
import java.util.Queue;
public class RemoteEventManager {
private static final FeatureManager FeatureManager = FeatureManager.get();
private static final FeatureManager featureManager = FeatureManager.get();
public Socket head = null;
public final ArrayList<Socket> clients = new ArrayList<>();
@ -37,12 +37,12 @@ public class RemoteEventManager {
if(isConnected())
end();
try {
head = new Socket(ip, FeatureManager.Port);
head = new Socket(ip, featureManager.Port);
initClient();
IngameLogger.notify("[Remote] Started as client.");
} catch (IOException ex) {
try {
server = new ServerSocket(FeatureManager.Port);
server = new ServerSocket(featureManager.Port);
initServer();
IngameLogger.notify("[Remote] Started as server.");
} catch (IOException e) {
@ -72,17 +72,17 @@ public class RemoteEventManager {
head.close();
}
} catch (IOException ignored) {}
FeatureManager.ifFeatureEnabled(AltControl.class, f -> f.setEnabled(false));
featureManager.ifFeatureEnabled(AltControl.class, f -> f.setEnabled(false));
}
Thread thread;
private void initServer() {
thread = new Thread(this::runServer, FeatureManager.Name + " RemoteEvent server");
thread = new Thread(this::runServer, featureManager.Name + " RemoteEvent server");
thread.start();
}
private void initClient() {
thread = new Thread(this::runClient, FeatureManager.Name + " RemoteEvent client");
thread = new Thread(this::runClient, featureManager.Name + " RemoteEvent client");
thread.start();
}

4
Client/src/main/java/com/baseband/client/feature/command/Connect.java
View file

@ -2,7 +2,7 @@ package com.baseband.client.feature.command;
import com.baseband.client.feature.Feature;
import com.baseband.client.feature.category.Command;
import com.baseband.client.util.misc.GlobalUtil;
import com.baseband.client.util.misc.ImplUtil;
import net.minecraft.client.multiplayer.GuiConnecting;
@Command
@ -19,7 +19,7 @@ public class Connect extends Feature {
try {
mc.displayGuiScreen(new GuiConnecting(mc.currentScreen, mc, args[0], args.length == 2 ? Integer.parseInt(args[1]) : 25565));
} catch (NumberFormatException e) {
GlobalUtil.LOGGER.warn("Port invalid");
ImplUtil.LOGGER.warn("Port invalid");
}
}
}