-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Minor modifications to #5 for code style, etc.
- Resolved crash with bclib during startup (thanks quiqueck) - WARNING: Biolith still does not work reliably when bclib is present
- Loading branch information
1 parent
b666d7d
commit cb05393
Showing
2 changed files
with
11 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 10 additions & 15 deletions
25
src/main/java/com/terraformersmc/biolith/impl/mixin/MixinSaveLoader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,22 @@ | ||
package com.terraformersmc.biolith.impl.mixin; | ||
|
||
import com.terraformersmc.biolith.impl.biome.BiomeCoordinator; | ||
import net.minecraft.registry.CombinedDynamicRegistries; | ||
import net.minecraft.registry.ServerDynamicRegistryType; | ||
import net.minecraft.resource.LifecycledResourceManager; | ||
import net.minecraft.server.DataPackContents; | ||
import net.minecraft.server.SaveLoader; | ||
|
||
import com.terraformersmc.biolith.impl.biome.BiomeCoordinator; | ||
import org.spongepowered.asm.mixin.Final; | ||
import net.minecraft.world.SaveProperties; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.Shadow; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
import org.spongepowered.asm.mixin.injection.ModifyVariable; | ||
import org.spongepowered.asm.mixin.injection.Inject; | ||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
||
@Mixin(value=SaveLoader.class, priority = 500) | ||
@Mixin(value= SaveLoader.class, priority = 500) | ||
public class MixinSaveLoader { | ||
@Shadow @Final private CombinedDynamicRegistries<ServerDynamicRegistryType> combinedDynamicRegistries; | ||
|
||
@ModifyVariable(method = "<init>", argsOnly = true, at = @At(value = "INVOKE", target = "Ljava/lang/Record;<init>()V", shift = At.Shift.AFTER)) | ||
private CombinedDynamicRegistries<ServerDynamicRegistryType> biolith$earlyCaptureRegistries( | ||
CombinedDynamicRegistries<ServerDynamicRegistryType> combinedDynamicRegistries | ||
) { | ||
System.out.println("Biolith: early capture registries"); | ||
// We need the registries really early in case TerraBlender calls us before the Fabric server start event. | ||
@Inject(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/lang/Record;<init>()V", shift = At.Shift.AFTER)) | ||
private void biolith$earlyCaptureRegistries(LifecycledResourceManager lifecycledResourceManager, DataPackContents dataPackContents, CombinedDynamicRegistries<ServerDynamicRegistryType> combinedDynamicRegistries, SaveProperties saveProperties, CallbackInfo ci) { | ||
// We need the registries really early in case BClib or TerraBlender call us before the Fabric server start event. | ||
BiomeCoordinator.setRegistryManager(combinedDynamicRegistries); | ||
return combinedDynamicRegistries; | ||
} | ||
} |