Skip to content

Commit 942b7cb

Browse files
embeddedtembeddedt
committed
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2 parents 26998e9 + 88e0016 commit 942b7cb

File tree

10 files changed

+76
-25
lines changed

10 files changed

+76
-25
lines changed

‎common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
public class ModernFixClient {
2828
public static ModernFixClient INSTANCE;
29-
public static long worldLoadStartTime;
29+
public static long worldLoadStartTime = -1;
3030
private static int numRenderTicks;
3131

3232
public static float gameStartTimeSeconds = -1;

‎common/src/main/java/org/embeddedt/modernfix/blockstate/FerriteCorePostProcess.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,13 @@ public class FerriteCorePostProcess {
3535
toKeyIndex = keyIndex;
3636
}
3737

38-
private static final Object2IntMap<?> EMPTY_MAP = Object2IntMaps.unmodifiable(new Object2IntArrayMap<>());
38+
private static final Object2IntMap<?> EMPTY_MAP;
39+
40+
static {
41+
Object2IntArrayMap<?> map = new Object2IntArrayMap<>();
42+
map.defaultReturnValue(-1);
43+
EMPTY_MAP = Object2IntMaps.unmodifiable(map);
44+
}
3945

4046
public static <O, S extends StateHolder<O, S>> void postProcess(StateDefinition<O, S> state) {
4147
if(!willPostProcess)

‎fabric/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ dependencies {
3232
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
3333
testImplementation "net.fabricmc:fabric-loader-junit:${rootProject.fabric_loader_version}"
3434

35-
modIncludeImplementation(fabricApi.module("fabric-api-base", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
36-
modIncludeImplementation(fabricApi.module("fabric-lifecycle-events-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
35+
modImplementation(fabricApi.module("fabric-api-base", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
36+
modImplementation(fabricApi.module("fabric-lifecycle-events-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
3737
modImplementation(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
38-
modIncludeImplementation(fabricApi.module("fabric-command-api-v2", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
38+
modImplementation(fabricApi.module("fabric-command-api-v2", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
3939
modImplementation(fabricApi.module("fabric-models-v0", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
4040
modImplementation(fabricApi.module("fabric-resource-loader-v0", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
4141
modImplementation(fabricApi.module("fabric-data-generation-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }

‎fabric/src/main/java/org/embeddedt/modernfix/ModernFixClientFabric.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package org.embeddedt.modernfix;
22

33
import net.fabricmc.api.ClientModInitializer;
4-
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
5-
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
64
import net.fabricmc.loader.api.FabricLoader;
75
import org.embeddedt.modernfix.fabric.datagen.RuntimeDatagen;
86

@@ -13,10 +11,6 @@ public class ModernFixClientFabric implements ClientModInitializer {
1311
public void onInitializeClient() {
1412
commonMod = new ModernFixClient();
1513

16-
ClientTickEvents.END_CLIENT_TICK.register((mc) -> commonMod.onRenderTickEnd());
17-
ServerLifecycleEvents.SERVER_STARTED.register(server -> {
18-
commonMod.onServerStarted(server);
19-
});
2014
if(FabricLoader.getInstance().isModLoaded("fabric-data-generation-api-v1")) {
2115
RuntimeDatagen.init();
2216
}

‎fabric/src/main/java/org/embeddedt/modernfix/ModernFixFabric.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.embeddedt.modernfix;
22

33
import net.fabricmc.api.ModInitializer;
4-
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
54
import net.minecraft.server.MinecraftServer;
65

76
import java.lang.ref.WeakReference;
@@ -13,16 +12,6 @@ public class ModernFixFabric implements ModInitializer {
1312
public void onInitialize() {
1413
commonMod = new ModernFix();
1514

16-
ServerLifecycleEvents.SERVER_STARTING.register(server -> {
17-
theServer = new WeakReference<>(server);
18-
});
19-
ServerLifecycleEvents.SERVER_STARTED.register(server -> {
20-
commonMod.onServerStarted();
21-
});
22-
ServerLifecycleEvents.SERVER_STOPPED.register(server -> {
23-
commonMod.onServerDead(server);
24-
});
25-
2615
// TODO: implement entity ID desync
2716
}
2817

‎fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/ClientMinecraftServerMixin.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package org.embeddedt.modernfix.fabric.mixin.core;
2+
3+
import net.minecraft.server.MinecraftServer;
4+
import org.embeddedt.modernfix.ModernFixClient;
5+
import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
6+
import org.spongepowered.asm.mixin.Mixin;
7+
import org.spongepowered.asm.mixin.injection.At;
8+
import org.spongepowered.asm.mixin.injection.Inject;
9+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
10+
11+
@Mixin(MinecraftServer.class)
12+
@ClientOnlyMixin
13+
public class ClientMinecraftServerMixin {
14+
@Inject(method = "runServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;getMillis()J", ordinal = 0))
15+
private void markServerStarted(CallbackInfo ci) {
16+
ModernFixClient.INSTANCE.onServerStarted((MinecraftServer)(Object)this);
17+
}
18+
}

‎fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/MCMixin_Fabric.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package org.embeddedt.modernfix.fabric.mixin.core;
2+
3+
import net.minecraft.client.Minecraft;
4+
import org.embeddedt.modernfix.ModernFixClient;
5+
import org.spongepowered.asm.mixin.Mixin;
6+
import org.spongepowered.asm.mixin.injection.At;
7+
import org.spongepowered.asm.mixin.injection.Inject;
8+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
9+
10+
@Mixin(Minecraft.class)
11+
public class MCMixin_Fabric {
12+
@Inject(method = "tick", at = @At("RETURN"))
13+
private void onRenderTickEnd(CallbackInfo ci) {
14+
ModernFixClient.INSTANCE.onRenderTickEnd();
15+
}
16+
}

‎fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/MinecraftServerMixin.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package org.embeddedt.modernfix.fabric.mixin.core;
2+
3+
import net.minecraft.server.MinecraftServer;
4+
import org.embeddedt.modernfix.ModernFix;
5+
import org.embeddedt.modernfix.ModernFixFabric;
6+
import org.spongepowered.asm.mixin.Mixin;
7+
import org.spongepowered.asm.mixin.injection.At;
8+
import org.spongepowered.asm.mixin.injection.Inject;
9+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
10+
11+
import java.lang.ref.WeakReference;
12+
13+
@Mixin(MinecraftServer.class)
14+
public class MinecraftServerMixin {
15+
@Inject(method = "runServer", at = @At("HEAD"))
16+
private void changeServerReference(CallbackInfo ci) {
17+
ModernFixFabric.theServer = new WeakReference<>((MinecraftServer)(Object)this);
18+
}
19+
20+
@Inject(method = "runServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;getMillis()J", ordinal = 0))
21+
private void hookServerStarted(CallbackInfo ci) {
22+
ModernFix.INSTANCE.onServerStarted();
23+
}
24+
25+
@Inject(method = "stopServer", at = @At("RETURN"))
26+
private void hookServerShutdown(CallbackInfo ci) {
27+
ModernFix.INSTANCE.onServerDead((MinecraftServer)(Object)this);
28+
}
29+
}

‎fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ public void applyASMTransformers(String mixinClassName, ClassNode targetClass) {
8484
}
8585

8686
public void onServerCommandRegister(Consumer<CommandDispatcher<CommandSourceStack>> handler) {
87-
CommandRegistrationCallback.EVENT.register((dispatcher, arg, env) -> handler.accept(dispatcher));
87+
if(FabricLoader.getInstance().isModLoaded("fabric-command-api-v2"))
88+
CommandRegistrationCallback.EVENT.register((dispatcher, arg, env) -> handler.accept(dispatcher));
8889
}
8990

9091
private static Multimap<String, String> modOptions;

‎fabric/src/main/resources/fabric.mod.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
"modernfix-common.mixins.json"
3434
],
3535
"depends": {
36-
"fabric-lifecycle-events-v1": "*",
37-
"fabric-command-api-v2": "*",
3836
"minecraft": ">=1.16.2"
3937
},
4038
"breaks": {

0 commit comments

Comments
 (0)