mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-03 16:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

some fixes

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/invoke/FluidBlockInvoker.java
View File

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

1
platforms/mixin-common/src/main/resources/terra.common.mixins.json
View File

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

6
platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java
View File

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

4
platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/RegistryLoaderMixin.java
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.LifecycleUtil;
import com.dfsek.terra.lifecycle.util.RegistryHack; import com.dfsek.terra.lifecycle.util.RegistryHack;
import static com.dfsek.terra.lifecycle.util.LifecycleUtil.initialized;
@Mixin(RegistryLoader.class) @Mixin(RegistryLoader.class)
public class RegistryLoaderMixin { public class RegistryLoaderMixin {
private static boolean initialized = false;
@Shadow @Shadow
@Final @Final
private static Logger LOGGER; private static Logger LOGGER;

1
platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleUtil.java
View File

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