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.

Sign up for GitHub

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

Jump to bottom

External generator settings (new implementation) #10

Closed
wants to merge 17 commits into from
Closed

External generator settings (new implementation) #10

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
55f7093
External generator settings
Foghrye4 Dec 16, 2018
4d76206
No mixin
Foghrye4 Dec 16, 2018
e7a596a
Data fixes
Foghrye4 Dec 16, 2018
ffdac8d
Simplify fixes
Foghrye4 Dec 16, 2018
ded565f
Remove saving on done
Foghrye4 Dec 16, 2018
4bd1b8f
Saving settings only using provided World instance path
Foghrye4 Dec 16, 2018
da1e965
Expanded transversion json fixer
Foghrye4 Dec 18, 2018
9d35601
Half-assed fixer for JSON preset
Foghrye4 Dec 18, 2018
bfeaf97
False
Foghrye4 Dec 18, 2018
6a572b7
Full-assed generator settings fixer
Foghrye4 Dec 22, 2018
23b470c
Fixing Unit Test
Foghrye4 Dec 22, 2018
aeeded6
Removing minimization code
Foghrye4 Dec 22, 2018
a1e01bf
Expanding test to expected conversion case
Foghrye4 Dec 22, 2018
0f9f5ff
Fix creating file writer before creating directories
Foghrye4 Jan 4, 2019
a7c572a
Extend hardcoded limit of char buffer to accept presets with any size…
Foghrye4 Jan 19, 2019
b819ef2
Creating copy of a world will copy generator settings
Foghrye4 Jan 20, 2019
c79512f
Remove unnecessary Malisiscore dependency, fix missing ore entries on…
Foghrye4 Jan 20, 2019
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
9 changes: 1 addition & 8 deletions src/main/java/io/github/opencubicchunks/cubicchunks/cubicgen/CustomCubicMod.java
View file
Open in desktop
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 Down Expand Up @@ -63,9 +62,7 @@
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.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
Expand Down Expand Up @@ -102,17 +99,13 @@ public void preInit(FMLPreInitializationEvent e) {
FlatCubicWorldType.create();
CustomCubicWorldType.create();
DebugWorldType.create();


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

@Mod.EventHandler
public void preInit(FMLPostInitializationEvent e) {
CubicBiome.postInit();
}

@SubscribeEvent
public static void registerRegistries(RegistryEvent.NewRegistry evt) {
CubicBiome.init();
Expand Down
15 changes: 11 additions & 4 deletions ...java/io/github/opencubicchunks/cubicchunks/cubicgen/customcubic/CustomCubicWorldType.java
View file
Open in desktop
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,10 @@
@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 = "";

private CustomCubicWorldType() {
super("CustomCubic");
}
Expand All @@ -65,8 +67,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 +95,12 @@ public ICubeGenerator createCubeGenerator(World world) {
public boolean isCustomizable() {
return true;
}

@Override
public void onGUICreateWorldPress() {
pendingCustomCubicSettingsJsonString = CustomCubicGui.settingsJsonString;
CustomCubicGui.settingsJsonString = "";
}

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