mirror/Wurst7
0
0
Fork 0
mirror of https://github.com/Wurst-Imperium/Wurst7.git synced 2024-09-19 17:02:13 +02:00
Code

Fix WurstClient singleton

Browse Source
This commit is contained in:
Alexander 2019-07-08 18:34:17 +02:00
parent f1fcd4251d
commit 640ba9f3b4
5 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/wurstclient/Feature.java
View File

@ -12,5 +12,5 @@ import net.minecraft.client.MinecraftClient;
public abstract class Feature
{
protected static final MinecraftClient MC = MinecraftClient.getInstance();
protected static final WurstClient WURST = WurstInitializer.getWurst();
protected static final WurstClient WURST = WurstClient.INSTANCE;
}

14
src/main/java/net/wurstclient/WurstClient.java
View File

@ -19,18 +19,20 @@ import net.wurstclient.event.EventManager;
import net.wurstclient.events.ChatOutputListener;
import net.wurstclient.hack.HackList;
public final class WurstClient
public enum WurstClient
{
INSTANCE;
public static final String VERSION = "7.0";
private final WurstAnalytics analytics;
private final EventManager eventManager;
private final HackList hax;
private final CmdList cmds;
private WurstAnalytics analytics;
private EventManager eventManager;
private HackList hax;
private CmdList cmds;
private boolean enabled = true;
public WurstClient()
public void initialize()
{
Path wurstFolder = createWurstFolder();

13
src/main/java/net/wurstclient/WurstInitializer.java
View File

@ -11,7 +11,7 @@ import net.fabricmc.api.ModInitializer;
public final class WurstInitializer implements ModInitializer
{
private static WurstClient WURST;
private static boolean initialized;
@Override
public void onInitialize()
@ -20,16 +20,11 @@ public final class WurstInitializer implements ModInitializer
// However, some things (like resources) may still be uninitialized.
// Proceed with mild caution.
if(WURST != null)
if(initialized)
throw new RuntimeException(
"WurstInitializer.onInitialize() ran twice!");
System.out.println("Hello Fabric world!");
WURST = new WurstClient();
}
public static WurstClient getWurst()
{
return WURST;
WurstClient.INSTANCE.initialize();
initialized = true;
}
}

4
src/main/java/net/wurstclient/command/CmdProcessor.java
View File

@ -12,7 +12,7 @@ import java.util.Arrays;
import net.minecraft.util.crash.CrashException;
import net.minecraft.util.crash.CrashReport;
import net.minecraft.util.crash.CrashReportSection;
import net.wurstclient.WurstInitializer;
import net.wurstclient.WurstClient;
import net.wurstclient.events.ChatOutputListener;
import net.wurstclient.util.ChatUtils;
@ -28,7 +28,7 @@ public final class CmdProcessor implements ChatOutputListener
@Override
public void onSentMessage(ChatOutputEvent event)
{
if(!WurstInitializer.getWurst().isEnabled())
if(!WurstClient.INSTANCE.isEnabled())
return;
String message = event.getMessage().trim();

3
src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java
View File

@ -11,7 +11,6 @@ import net.minecraft.client.network.AbstractClientPlayerEntity;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.world.ClientWorld;
import net.wurstclient.WurstClient;
import net.wurstclient.WurstInitializer;
import net.wurstclient.events.ChatOutputListener.ChatOutputEvent;
@Mixin(ClientPlayerEntity.class)
@ -29,7 +28,7 @@ public class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
private void onSendChatMessage(String message, CallbackInfo ci)
{
ChatOutputEvent event = new ChatOutputEvent(message, false);
WurstInitializer.getWurst().getEventManager().fire(event);
WurstClient.INSTANCE.getEventManager().fire(event);
if(event.isCancelled())
ci.cancel();