Skip to content

Commit

Permalink
1.19.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Owen3H committed Apr 10, 2023
1 parent 532a574 commit 943a9c0
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 95 deletions.
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ org.gradle.parallel=true
org.gradle.workers.max=4

# Fabric properties
minecraft_version=1.19.3
yarn_mappings=1.19.3+build.5
loader_version=0.14.12
fabric_version=0.72.0+1.19.3
minecraft_version=1.19.4
yarn_mappings=1.19.4+build.2
loader_version=0.14.19
fabric_version=0.76.0+1.19.4

# Mod Properties
name = EarthMCEssentials
mod_version = 4.0.0
maven_group = net.emc.emce

# Library versions
cloth_config_version=9.0.94
mod_menu_version=5.0.2
adventure_fabric_version=5.6.1
cloth_config_version=10.0.96
mod_menu_version=6.1.0-rc.4
adventure_fabric_version=5.8.0
wrapper_version=0.10.2
1 change: 1 addition & 0 deletions src/main/java/net/emc/emce/EarthMCEssentials.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public void onInitialize() {
InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_F4, "EarthMC Essentials"));

EventRegistry.RegisterClientTick();
EventRegistry.RegisterConnection(this);

ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) ->
EventRegistry.RegisterCommands(this, dispatcher));
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ private void onInit(RunArgs args, CallbackInfo ci) {
System.out.println(clientPlayer.asString());
}
}
}
}
56 changes: 0 additions & 56 deletions src/main/java/net/emc/emce/mixins/SessionEventListenerMixin.java

This file was deleted.

54 changes: 54 additions & 0 deletions src/main/java/net/emc/emce/modules/EventRegistry.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,16 @@
import net.emc.emce.utils.ModUtils;
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
import net.minecraft.client.gui.screen.Screen;

import static net.emc.emce.EarthMCEssentials.instance;
import static net.emc.emce.utils.EarthMCAPI.fetchEndpoints;
import static net.emc.emce.utils.ModUtils.isConnectedToEMC;
import static net.emc.emce.utils.ModUtils.updateServerName;

public class EventRegistry {
public static void RegisterCommands(EarthMCEssentials instance, CommandDispatcher<FabricClientCommandSource> dispatcher) {
// Register client-sided commands.
Expand Down Expand Up @@ -49,4 +55,52 @@ public static void RegisterHud() {
HudRenderCallback.EVENT.register((matrixStack, tickDelta) ->
OverlayRenderer.Render(matrixStack));
}

public static void RegisterConnection(EarthMCEssentials instance) {
ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
System.out.println("EMCE > New game session detected.");

updateServerName();
OverlayRenderer.Init();

instance.setShouldRender(instance.config().general.enableMod);
instance.setDebugEnabled(instance.config().general.debugLog);

if (instance.sessionCounter == 1) {
RegisterScreen();
RegisterHud();
}

if (isConnectedToEMC()) {
updateSessionCounter('+');
fetchEndpoints();

// Out of queue, begin map check.
if (instance.sessionCounter > 1)
instance.scheduler().initMap();
}

});

ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> {
System.out.println("EMCE > Disconnected.");

ModUtils.setServerName("");
OverlayRenderer.Clear();

instance().sessionCounter = 0;
instance().scheduler().setHasMap(null);
});
}

private static void updateSessionCounter(char type) {
int oldCount = instance().sessionCounter;

if (type == '+') instance().sessionCounter++;
else instance().sessionCounter--;

String debugStr = "Updated session counter from " + oldCount + " to " + instance().sessionCounter;
Messaging.sendDebugMessage(debugStr);
System.out.println("EMCE > " + debugStr);
}
}
4 changes: 1 addition & 3 deletions src/main/resources/emce.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
"package": "net.emc.emce.mixins",
"compatibilityLevel": "JAVA_17",
"client": [
"ClientPlayNetworkHandlerMixin",
"MinecraftClientMixin",
"SessionEventListenerMixin"
"MinecraftClientMixin"
],
"injectors": {
"defaultRequire": 1
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"emce.mixins.json"
],
"depends": {
"fabricloader": ">=0.14",
"fabric-api": "0.72.0",
"fabricloader": ">=0.14.19",
"fabric-api": "0.76.0",
"minecraft": ">=1.19.3",
"java": ">=17"
},
Expand Down

0 comments on commit 943a9c0

Please sign in to comment.