From be21b40cff8968259d5e5edeb044722b2718cda2 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 29 Oct 2022 20:59:28 +0200 Subject: [PATCH] Moved Datagen --- src/main/java/org/betterx/bclib/BCLib.java | 78 ---------------- .../BCLibDatagen.java} | 93 +++++++++++++++++-- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 88 insertions(+), 85 deletions(-) rename src/main/java/org/betterx/{worlds/together/WorldsTogetherDatagen.java => bclib/BCLibDatagen.java} (61%) diff --git a/src/main/java/org/betterx/bclib/BCLib.java b/src/main/java/org/betterx/bclib/BCLib.java index c4389436..8b2afb0f 100644 --- a/src/main/java/org/betterx/bclib/BCLib.java +++ b/src/main/java/org/betterx/bclib/BCLib.java @@ -6,10 +6,7 @@ import org.betterx.bclib.api.v2.generator.BCLibEndBiomeSource; import org.betterx.bclib.api.v2.generator.BCLibNetherBiomeSource; import org.betterx.bclib.api.v2.generator.GeneratorOptions; import org.betterx.bclib.api.v2.levelgen.LevelGenEvents; -import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; -import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeRegistry; -import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.api.v2.levelgen.structures.TemplatePiece; import org.betterx.bclib.api.v2.levelgen.surface.rules.Conditions; import org.betterx.bclib.api.v2.poi.PoiManager; @@ -27,8 +24,6 @@ import org.betterx.worlds.together.util.Logger; import org.betterx.worlds.together.world.WorldConfig; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.block.Blocks; import net.fabricmc.api.EnvType; import net.fabricmc.api.ModInitializer; @@ -79,79 +74,6 @@ public class BCLib implements ModInitializer { WorldsTogether.FORCE_SERVER_TO_BETTERX_PRESET = Configs.SERVER_CONFIG.forceBetterXPreset(); VersionChecker.registerMod(MOD_ID); - - - if (true && isDevEnvironment()) { - BCLBiome theYellow = BCLBiomeBuilder - .start(makeID("the_yellow")) - .precipitation(Biome.Precipitation.NONE) - .temperature(1.0f) - .wetness(1.0f) - .fogColor(0xFFFF00) - .waterColor(0x777700) - .waterFogColor(0xFFFF00) - .skyColor(0xAAAA00) - .addNetherClimateParamater(-1, 1) - .surface(Blocks.YELLOW_CONCRETE) - .build(); - BiomeAPI.registerEndLandBiome(theYellow); - - BCLBiome theBlue = BCLBiomeBuilder - .start(makeID("the_blue")) - .precipitation(Biome.Precipitation.NONE) - .temperature(1.0f) - .wetness(1.0f) - .fogColor(0x0000FF) - .waterColor(0x000077) - .waterFogColor(0x0000FF) - .skyColor(0x0000AA) - .addNetherClimateParamater(-1, 1) - .surface(Blocks.LIGHT_BLUE_CONCRETE) - .build(); - BiomeAPI.registerEndLandBiome(theBlue); - - BCLBiome theGray = BCLBiomeBuilder - .start(makeID("the_gray")) - .precipitation(Biome.Precipitation.NONE) - .temperature(1.0f) - .wetness(1.0f) - .fogColor(0xFFFFFF) - .waterColor(0x777777) - .waterFogColor(0xFFFFFF) - .skyColor(0xAAAAAA) - .addNetherClimateParamater(-1, 1) - .surface(Blocks.GRAY_CONCRETE) - .build(); - BiomeAPI.registerEndVoidBiome(theGray); - - BCLBiome theOrange = BCLBiomeBuilder - .start(makeID("the_orange")) - .precipitation(Biome.Precipitation.NONE) - .temperature(1.0f) - .wetness(1.0f) - .fogColor(0xFF7700) - .waterColor(0x773300) - .waterFogColor(0xFF7700) - .skyColor(0xAA7700) - .addNetherClimateParamater(-1, 1.1f) - .surface(Blocks.ORANGE_CONCRETE) - .build(); - BiomeAPI.registerNetherBiome(theOrange); - - BCLBiome thePurple = BCLBiomeBuilder - .start(makeID("the_purple")) - .precipitation(Biome.Precipitation.NONE) - .temperature(1.0f) - .wetness(1.0f) - .fogColor(0xFF00FF) - .waterColor(0x770077) - .waterFogColor(0xFF00FF) - .skyColor(0xAA00AA) - .addNetherClimateParamater(-1.1f, 1) - .surface(Blocks.PURPLE_CONCRETE) - .build(); - BiomeAPI.registerNetherBiome(thePurple); - } } public static boolean isDevEnvironment() { diff --git a/src/main/java/org/betterx/worlds/together/WorldsTogetherDatagen.java b/src/main/java/org/betterx/bclib/BCLibDatagen.java similarity index 61% rename from src/main/java/org/betterx/worlds/together/WorldsTogetherDatagen.java rename to src/main/java/org/betterx/bclib/BCLibDatagen.java index af2a283f..6de6d4e8 100644 --- a/src/main/java/org/betterx/worlds/together/WorldsTogetherDatagen.java +++ b/src/main/java/org/betterx/bclib/BCLibDatagen.java @@ -1,7 +1,7 @@ -package org.betterx.worlds.together; +package org.betterx.bclib; -import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeRegistry; -import org.betterx.bclib.api.v2.levelgen.biomes.BiomeData; +import org.betterx.bclib.api.v2.levelgen.biomes.*; +import org.betterx.worlds.together.WorldsTogether; import org.betterx.worlds.together.surfaceRules.AssignedSurfaceRule; import org.betterx.worlds.together.surfaceRules.SurfaceRuleRegistry; @@ -17,6 +17,8 @@ import net.minecraft.data.PackOutput; import net.minecraft.resources.RegistryDataLoader; import net.minecraft.resources.RegistryOps; import net.minecraft.resources.ResourceKey; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.block.Blocks; import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; @@ -32,12 +34,91 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.CompletableFuture; -public class WorldsTogetherDatagen implements DataGeneratorEntrypoint { +public class BCLibDatagen implements DataGeneratorEntrypoint { + @Override public void onInitializeDataGenerator(FabricDataGenerator dataGenerator) { + registerTestBiomes(); + final FabricDataGenerator.Pack pack = dataGenerator.create(); - pack.addProvider(FabricBuiltinRegistriesProvider.forCurrentMod()); pack.addProvider(CustomRegistriesDataProvider::new); + pack.addProvider(FabricBuiltinRegistriesProvider.forCurrentMod()); + + } + + private void registerTestBiomes() { + + if (true && BCLib.isDevEnvironment()) { + BCLBiome theYellow = BCLBiomeBuilder + .start(BCLib.makeID("the_yellow")) + .precipitation(Biome.Precipitation.NONE) + .temperature(1.0f) + .wetness(1.0f) + .fogColor(0xFFFF00) + .waterColor(0x777700) + .waterFogColor(0xFFFF00) + .skyColor(0xAAAA00) + .addNetherClimateParamater(-1, 1) + .surface(Blocks.YELLOW_CONCRETE) + .build(); + BiomeAPI.registerEndLandBiome(theYellow); + + BCLBiome theBlue = BCLBiomeBuilder + .start(BCLib.makeID("the_blue")) + .precipitation(Biome.Precipitation.NONE) + .temperature(1.0f) + .wetness(1.0f) + .fogColor(0x0000FF) + .waterColor(0x000077) + .waterFogColor(0x0000FF) + .skyColor(0x0000AA) + .addNetherClimateParamater(-1, 1) + .surface(Blocks.LIGHT_BLUE_CONCRETE) + .build(); + BiomeAPI.registerEndLandBiome(theBlue); + + BCLBiome theGray = BCLBiomeBuilder + .start(BCLib.makeID("the_gray")) + .precipitation(Biome.Precipitation.NONE) + .temperature(1.0f) + .wetness(1.0f) + .fogColor(0xFFFFFF) + .waterColor(0x777777) + .waterFogColor(0xFFFFFF) + .skyColor(0xAAAAAA) + .addNetherClimateParamater(-1, 1) + .surface(Blocks.GRAY_CONCRETE) + .build(); + BiomeAPI.registerEndVoidBiome(theGray); + + BCLBiome theOrange = BCLBiomeBuilder + .start(BCLib.makeID("the_orange")) + .precipitation(Biome.Precipitation.NONE) + .temperature(1.0f) + .wetness(1.0f) + .fogColor(0xFF7700) + .waterColor(0x773300) + .waterFogColor(0xFF7700) + .skyColor(0xAA7700) + .addNetherClimateParamater(-1, 1.1f) + .surface(Blocks.ORANGE_CONCRETE) + .build(); + BiomeAPI.registerNetherBiome(theOrange); + + BCLBiome thePurple = BCLBiomeBuilder + .start(BCLib.makeID("the_purple")) + .precipitation(Biome.Precipitation.NONE) + .temperature(1.0f) + .wetness(1.0f) + .fogColor(0xFF00FF) + .waterColor(0x770077) + .waterFogColor(0xFF00FF) + .skyColor(0xAA00AA) + .addNetherClimateParamater(-1.1f, 1) + .surface(Blocks.PURPLE_CONCRETE) + .build(); + BiomeAPI.registerNetherBiome(thePurple); + } } public static class CustomRegistriesDataProvider implements DataProvider { @@ -135,4 +216,4 @@ public class WorldsTogetherDatagen implements DataGeneratorEntrypoint { return "BCL Registries"; } } -} \ No newline at end of file +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 969f6bc9..14ebb4ad 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -37,7 +37,7 @@ "org.betterx.bclib.integration.emi.EMIPlugin" ], "fabric-datagen": [ - "org.betterx.worlds.together.WorldsTogetherDatagen" + "org.betterx.bclib.BCLibDatagen" ] }, "accessWidener": "bclib.accesswidener",