some fixes

This commit is contained in:
Zoe Gidiere 2024-09-18 15:43:31 -06:00
parent b63f5f4a8f
commit 06457bf3ce
5 changed files with 12 additions and 2 deletions

View File

@ -10,5 +10,5 @@ import org.spongepowered.asm.mixin.gen.Invoker;
@Mixin(FluidBlock.class)
public interface FluidBlockInvoker {
@Invoker("getFluidState")
public FluidState invokeGetFluidState(BlockState state);
FluidState invokeGetFluidState(BlockState state);
}

View File

@ -36,6 +36,7 @@
"implementations.terra.inventory.meta.ItemStackMetaMixin",
"implementations.terra.world.ChunkRegionMixin",
"implementations.terra.world.ServerWorldMixin",
"invoke.FluidBlockInvoker",
"lifecycle.DataPackContentsMixin"
],
"client": [

View File

@ -16,6 +16,7 @@ import java.net.Proxy;
import com.dfsek.terra.lifecycle.LifecyclePlatform;
import static com.dfsek.terra.lifecycle.util.LifecycleUtil.initialized;
@Mixin(MinecraftServer.class)
public class MinecraftServerMixin {
@ -29,4 +30,9 @@ public class MinecraftServerMixin {
WorldGenerationProgressListenerFactory worldGenerationProgressListenerFactory, CallbackInfo ci) {
LifecyclePlatform.setServer((MinecraftServer) (Object) this);
}
@Inject(method = "shutdown()V", at = @At("RETURN"))
private void injectShutdown(CallbackInfo ci) {
initialized = false;
}
}

View File

@ -28,10 +28,12 @@ import com.dfsek.terra.lifecycle.LifecyclePlatform;
import com.dfsek.terra.lifecycle.util.LifecycleUtil;
import com.dfsek.terra.lifecycle.util.RegistryHack;
import static com.dfsek.terra.lifecycle.util.LifecycleUtil.initialized;
@Mixin(RegistryLoader.class)
public class RegistryLoaderMixin {
private static boolean initialized = false;
@Shadow
@Final
private static Logger LOGGER;

View File

@ -12,6 +12,7 @@ import com.dfsek.terra.mod.CommonPlatform;
public final class LifecycleUtil {
public static boolean initialized = false;
private LifecycleUtil() {
}