Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

External generator settings (new implementation) #10

Closed
wants to merge 17 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -32,7 +32,6 @@
import io.github.opencubicchunks.cubicchunks.cubicgen.common.biome.replacer.SwampWaterWithLilypadReplacer;
import io.github.opencubicchunks.cubicchunks.cubicgen.common.biome.replacer.TaigaSurfaceReplacer;
import io.github.opencubicchunks.cubicchunks.cubicgen.customcubic.CustomCubicWorldType;
import io.github.opencubicchunks.cubicchunks.cubicgen.customcubic.CustomGeneratorSettings;
import io.github.opencubicchunks.cubicchunks.cubicgen.customcubic.populator.DefaultDecorator;
import io.github.opencubicchunks.cubicchunks.cubicgen.customcubic.populator.DesertDecorator;
import io.github.opencubicchunks.cubicchunks.cubicgen.customcubic.populator.ForestDecorator;
Expand All @@ -43,6 +42,7 @@
import io.github.opencubicchunks.cubicchunks.cubicgen.customcubic.populator.SwampDecorator;
import io.github.opencubicchunks.cubicchunks.cubicgen.customcubic.populator.TaigaDecorator;
import io.github.opencubicchunks.cubicchunks.cubicgen.flat.FlatCubicWorldType;
import io.github.opencubicchunks.cubicchunks.cubicgen.proxy.CommonProxy;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.biome.Biome;
Expand All @@ -63,10 +63,9 @@
import net.minecraft.world.biome.BiomeStoneBeach;
import net.minecraft.world.biome.BiomeSwamp;
import net.minecraft.world.biome.BiomeTaiga;
import net.minecraftforge.common.util.ModFixs;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
Expand All @@ -93,6 +92,10 @@ public class CustomCubicMod {
public static final int FIXER_VERSION = 2;
public static final boolean DEBUG_ENABLED = false;
public static Logger LOGGER = null;

@SidedProxy(clientSide = "io.github.opencubicchunks.cubicchunks.cubicgen.proxy.ClientProxy", serverSide = "io.github.opencubicchunks.cubicchunks.cubicgen.proxy.ServerProxy")
public static CommonProxy proxy;


@Mod.EventHandler
public void preInit(FMLPreInitializationEvent e) {
Expand All @@ -102,10 +105,7 @@ public void preInit(FMLPreInitializationEvent e) {
FlatCubicWorldType.create();
CustomCubicWorldType.create();
DebugWorldType.create();


ModFixs fixes = FMLCommonHandler.instance().getDataFixer().init(MODID, FIXER_VERSION);
CustomGeneratorSettings.registerDataFixers(fixes);
proxy.preInit();
}

@Mod.EventHandler
Expand Down
@@ -0,0 +1,68 @@
/*
* This file is part of Cubic World Generation, licensed under the MIT License (MIT).
*
* Copyright (c) 2015 contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package io.github.opencubicchunks.cubicchunks.cubicgen.common.gui;

import io.github.opencubicchunks.cubicchunks.cubicgen.customcubic.CustomCubicWorldType;
import io.github.opencubicchunks.cubicchunks.cubicgen.customcubic.CustomGeneratorSettings;
import io.github.opencubicchunks.cubicchunks.cubicgen.customcubic.gui.CustomCubicGui;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiListWorldSelectionEntry;
import net.minecraft.client.gui.GuiWorldSelection;
import net.minecraft.world.storage.ISaveHandler;
import net.minecraft.world.storage.WorldInfo;
import net.minecraftforge.client.event.GuiScreenEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;

/**
* This GUI handler serve a sole purpose to copy CustomCubic generator settings
* in case if player making a copy of such world
*/
public class GuiEventHandler {

@SubscribeEvent
public void onButtonPressed(GuiScreenEvent.ActionPerformedEvent.Pre action) {
if (action.getGui() instanceof GuiWorldSelection) {
if (!action.getButton().enabled)
return;
// "Recreate world" has button id = 5
if (action.getButton().id != 5)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why a comment instead of making a private static final int field?

return;
GuiWorldSelection gui = (GuiWorldSelection) action.getGui();
if (gui.selectionList.getSelectedWorld() == null)
return;
GuiListWorldSelectionEntry entry = gui.selectionList.getSelectedWorld();
ISaveHandler isavehandler = Minecraft.getMinecraft().getSaveLoader()
.getSaveLoader(entry.worldSummary.getFileName(), false);
WorldInfo worldinfo = isavehandler.loadWorldInfo();

if (worldinfo == null || !(worldinfo.getTerrainType() instanceof CustomCubicWorldType))
return;
String json = CustomGeneratorSettings.loadJsonStringFromSaveFolder(isavehandler);
isavehandler.flush();
if (json != null) {
CustomCubicWorldType.pendingCustomCubicSettingsJsonString = json;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really don't like that static field here. Verifying that this field has the right value at the right time is nearly impossible without actually trying every possibility.

Instead I would suggest just mixing into WorldSettings and WorldInfo (same as what I did in CC itself, with MixinWorldSettings and MixinWorldInfo).

This also should remove the need for createNewWorld variable.

This would also allow to actually store the loaded preset text somewhere instead of loading it from disk each time it's needed.

If you actually inject in the right place, you can almost completely hide the fact that the preset is not saved in level.dat, by just not saving that part into level.dat for CustomCubic worlds, and instead have code somewhere else that saves it.

}
}
}
}
Expand Up @@ -33,9 +33,7 @@
import net.minecraft.client.gui.GuiCreateWorld;
import net.minecraft.client.gui.GuiErrorScreen;
import net.minecraft.init.Biomes;
import net.minecraft.world.DimensionType;
import net.minecraft.world.World;
import net.minecraft.world.WorldProvider;
import net.minecraft.world.WorldProviderSurface;
import net.minecraft.world.WorldServer;
import net.minecraft.world.WorldType;
Expand All @@ -56,6 +54,11 @@
@MethodsReturnNonnullByDefault
public class CustomCubicWorldType extends WorldType implements ICubicWorldType {

// This string is not empty when and only when someone used a CustomCubicGUI
// and press a Done button both in this CustomCubicGUI and in a WorldCreationGUI
public static String pendingCustomCubicSettingsJsonString = "";
public static boolean createNewWorld = false;

private CustomCubicWorldType() {
super("CustomCubic");
}
Expand All @@ -65,8 +68,7 @@ public static CustomCubicWorldType create() {
}

@Override public IntRange calculateGenerationHeightRange(WorldServer world) {
String string = world.getWorldInfo().getGeneratorOptions();
CustomGeneratorSettings opts = CustomGeneratorSettings.fromJson(string);
CustomGeneratorSettings opts = CustomGeneratorSettings.load(world);
// TODO: better handling of min height
return new IntRange(0, (int) opts.actualHeight);
}
Expand Down Expand Up @@ -94,6 +96,11 @@ public ICubeGenerator createCubeGenerator(World world) {
public boolean isCustomizable() {
return true;
}

@Override
public void onGUICreateWorldPress() {
createNewWorld = true;
}

@SideOnly(Side.CLIENT)
public void onCustomizeButton(Minecraft mc, GuiCreateWorld guiCreateWorld) {
Expand Down