R3944Realms/ExDeorum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix overriding Superflat world type

Browse Source
This commit is contained in:
thedarkcolour 2024-06-10 11:57:17 -07:00
parent d606669a58
commit 8fe0d3202a
No known key found for this signature in database
GPG Key ID: 6599A8E0516C8F38
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/thedarkcolour/exdeorum/client/ClientHandler.java
View File

@ -27,9 +27,11 @@ import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState;
import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.ItemBlockRenderTypes;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.ShaderInstance; import net.minecraft.client.renderer.ShaderInstance;
import net.minecraft.core.Holder;
import net.minecraft.core.registries.Registries; import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Unit; import net.minecraft.util.Unit;
import net.minecraft.world.level.levelgen.presets.WorldPreset;
import net.minecraftforge.client.event.ClientPlayerNetworkEvent; import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
import net.minecraftforge.client.event.EntityRenderersEvent; import net.minecraftforge.client.event.EntityRenderersEvent;
import net.minecraftforge.client.event.ModelEvent; import net.minecraftforge.client.event.ModelEvent;
@ -62,6 +64,8 @@ public class ClientHandler {
public static final ResourceLocation OAK_BARREL_COMPOSTING = new ResourceLocation(ExDeorum.ID, "item/oak_barrel_composting"); public static final ResourceLocation OAK_BARREL_COMPOSTING = new ResourceLocation(ExDeorum.ID, "item/oak_barrel_composting");
// This is set to true whenever the server tells a client to do so, then set back to false after cache is refreshed. // This is set to true whenever the server tells a client to do so, then set back to false after cache is refreshed.
public static boolean needsRecipeCacheRefresh; public static boolean needsRecipeCacheRefresh;
// This is used to prevent Ex Deorum from resetting world type when trying to configure Superflat, Single Biome, etc.
public static Holder<WorldPreset> originalDefaultWorldPreset;
public static void register() { public static void register() {
var modBus = FMLJavaModLoadingContext.get().getModEventBus(); var modBus = FMLJavaModLoadingContext.get().getModEventBus();
@ -152,8 +156,18 @@ public class ClientHandler {
// Sets Ex Deorum world type as default, or use SkyBlock Builder if it is installed // Sets Ex Deorum world type as default, or use SkyBlock Builder if it is installed
private static void onScreenOpen(ScreenEvent.Opening event) { private static void onScreenOpen(ScreenEvent.Opening event) {
if (event.getNewScreen() instanceof CreateWorldScreen screen && EConfig.COMMON.setVoidWorldAsDefault.get()) { if (event.getNewScreen() instanceof CreateWorldScreen screen && EConfig.COMMON.setVoidWorldAsDefault.get()) {
var ctx = screen.getUiState().getSettings(); var uiState = screen.getUiState();
screen.getUiState().setWorldType(new WorldCreationUiState.WorldTypeEntry(ctx.worldgenLoadContext().registryOrThrow(Registries.WORLD_PRESET).getHolder(ASMHooks.overrideDefaultWorldPreset()).orElse(null)));
var originalPreset = uiState.getWorldType().preset();
if (originalPreset != null) {
if (originalDefaultWorldPreset == null) {
originalDefaultWorldPreset = originalPreset;
}
if (originalDefaultWorldPreset.unwrapKey().equals(originalPreset.unwrapKey())) {
var voidWorldPreset = uiState.getSettings().worldgenLoadContext().registryOrThrow(Registries.WORLD_PRESET).getHolder(ASMHooks.overrideDefaultWorldPreset()).orElse(null);
uiState.setWorldType(new WorldCreationUiState.WorldTypeEntry(voidWorldPreset));
}
}
} }
} }