diff --git a/src/main/java/fr/openmc/core/OMCBootstrap.java b/src/main/java/fr/openmc/core/OMCBootstrap.java index f4382cf46..e34281060 100644 --- a/src/main/java/fr/openmc/core/OMCBootstrap.java +++ b/src/main/java/fr/openmc/core/OMCBootstrap.java @@ -1,6 +1,7 @@ package fr.openmc.core; import fr.openmc.core.registry.enchantments.CustomEnchantmentRegistry; +import fr.openmc.core.utils.bootstrap.DatapackRegistry; import io.papermc.paper.plugin.bootstrap.BootstrapContext; import io.papermc.paper.plugin.bootstrap.PluginBootstrap; import io.papermc.paper.plugin.bootstrap.PluginProviderContext; @@ -9,27 +10,14 @@ import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Objects; - @SuppressWarnings("UnstableApiUsage") public class OMCBootstrap implements PluginBootstrap { @Override public void bootstrap(@NotNull BootstrapContext context) { - // ** LOAD DATAPACK ** + // ** LOAD DATAPACKS ** context.getLifecycleManager().registerEventHandler(LifecycleEvents.DATAPACK_DISCOVERY.newHandler( - event -> { - try { - URI uri = Objects.requireNonNull(getClass().getResource("/datapack")).toURI(); - - event.registrar().discoverPack(uri, "omc"); - } catch (URISyntaxException | IOException e) { - throw new RuntimeException(e); - } - } + event -> DatapackRegistry.load(event, DatapackRegistry.extractDatapacks(context.getPluginSource())) )); // ** ENCHANTMENT IMPL ** diff --git a/src/main/java/fr/openmc/core/OMCPlugin.java b/src/main/java/fr/openmc/core/OMCPlugin.java index 3518e9882..8a0b7621c 100644 --- a/src/main/java/fr/openmc/core/OMCPlugin.java +++ b/src/main/java/fr/openmc/core/OMCPlugin.java @@ -22,7 +22,7 @@ import fr.openmc.core.features.displays.holograms.HologramLoader; import fr.openmc.core.features.displays.scoreboards.ScoreboardManager; import fr.openmc.core.features.dream.DreamManager; -import fr.openmc.core.features.dream.generation.DreamDimensionManager; +import fr.openmc.core.features.dream.dimension.DreamDimensionManager; import fr.openmc.core.features.economy.BankManager; import fr.openmc.core.features.economy.EconomyManager; import fr.openmc.core.features.events.halloween.managers.HalloweenManager; diff --git a/src/main/java/fr/openmc/core/features/city/actions/CityUnclaimAction.java b/src/main/java/fr/openmc/core/features/city/actions/CityUnclaimAction.java index 0d59ae137..645c34a33 100644 --- a/src/main/java/fr/openmc/core/features/city/actions/CityUnclaimAction.java +++ b/src/main/java/fr/openmc/core/features/city/actions/CityUnclaimAction.java @@ -9,6 +9,7 @@ import fr.openmc.core.utils.messages.MessagesManager; import fr.openmc.core.utils.messages.Prefix; import net.kyori.adventure.text.Component; +import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -26,7 +27,7 @@ public static int calculateAywenite(int chunkCount) { public static void startUnclaim(Player sender, int chunkX, int chunkZ) { City city = CityManager.getPlayerCity(sender.getUniqueId()); - org.bukkit.World bWorld = sender.getWorld(); + World bWorld = sender.getWorld(); if (!bWorld.getName().equals("world")) { MessagesManager.sendMessage(sender, Component.text("Tu ne peux pas étendre ta ville ici"), Prefix.CITY, MessageType.ERROR, false); return; @@ -42,14 +43,17 @@ public static void startUnclaim(Player sender, int chunkX, int chunkZ) { return; } - int price = calculatePrice(city.getChunks().size()); - int ayweniteNb = calculateAywenite(city.getChunks().size()); - - EconomyManager.addBalance(sender.getUniqueId(), price, "Unclaim de chunk de ville"); - ItemStack aywenite = ayweniteItemStack.clone(); - aywenite.setAmount(ayweniteNb); - for (ItemStack item : ItemUtils.splitAmountIntoStack(aywenite)) { - sender.dropItem(item); + // si on unclaim des claims gratuits on ne rend rien, sinon on rend une partie de l'argent et d'aywenite + if (city.getChunks().size() > CityCreateAction.FREE_CLAIMS+1) { + int price = calculatePrice(city.getChunks().size()); + int ayweniteNb = calculateAywenite(city.getChunks().size()); + + EconomyManager.addBalance(sender.getUniqueId(), price, "Unclaim de chunk de ville"); + ItemStack aywenite = ayweniteItemStack.clone(); + aywenite.setAmount(ayweniteNb); + for (ItemStack item : ItemUtils.splitAmountIntoStack(aywenite)) { + sender.dropItem(item); + } } city.removeChunk(chunkX, chunkZ); diff --git a/src/main/java/fr/openmc/core/features/city/menu/CityChunkMenu.java b/src/main/java/fr/openmc/core/features/city/menu/CityChunkMenu.java index 553bf95fa..b444fdaa2 100644 --- a/src/main/java/fr/openmc/core/features/city/menu/CityChunkMenu.java +++ b/src/main/java/fr/openmc/core/features/city/menu/CityChunkMenu.java @@ -11,6 +11,7 @@ import fr.openmc.core.features.city.CityManager; import fr.openmc.core.features.city.CityPermission; import fr.openmc.core.features.city.actions.CityClaimAction; +import fr.openmc.core.features.city.actions.CityCreateAction; import fr.openmc.core.features.city.actions.CityUnclaimAction; import fr.openmc.core.features.economy.EconomyManager; import fr.openmc.core.utils.ChunkInfo; @@ -264,9 +265,9 @@ private ItemBuilder createProtectedChunkItem(Material material, int chunkX, int } private ItemBuilder createPlayerCityChunkItem(Material material, City city, int chunkX, int chunkZ) { - return new ItemBuilder(this, material, itemMeta -> { - itemMeta.displayName(Component.text("§9Claim de votre ville")); - itemMeta.lore(List.of( + List lore; + if (city.getChunks().size() > CityCreateAction.FREE_CLAIMS+1) { + lore = List.of( Component.text("§7Ville : §d" + city.getName()), Component.text("§7Position : §f" + chunkX + ", " + chunkZ), Component.empty(), @@ -275,7 +276,19 @@ private ItemBuilder createPlayerCityChunkItem(Material material, City city, int Component.text("§8- §d" + CityUnclaimAction.calculateAywenite(playerCity.getChunks().size()) + " d'Aywenite"), Component.empty(), Component.text("§e§lCLIQUEZ POUR UNCLAIM") - )); + ); + } else { + lore = List.of( + Component.text("§7Ville : §d" + city.getName()), + Component.text("§7Position : §f" + chunkX + ", " + chunkZ), + Component.empty(), + Component.text("§e§lCLIQUEZ POUR UNCLAIM") + ); + } + + return new ItemBuilder(this, material, itemMeta -> { + itemMeta.displayName(Component.text("§9Claim de votre ville")); + itemMeta.lore(lore); }).setOnClick(event -> handleChunkUnclaimClick(player, chunkX, chunkZ, hasPermissionClaim)); } diff --git a/src/main/java/fr/openmc/core/features/cube/multiblocks/MultiBlockManager.java b/src/main/java/fr/openmc/core/features/cube/multiblocks/MultiBlockManager.java index b1adcf75c..72dea84f2 100644 --- a/src/main/java/fr/openmc/core/features/cube/multiblocks/MultiBlockManager.java +++ b/src/main/java/fr/openmc/core/features/cube/multiblocks/MultiBlockManager.java @@ -3,7 +3,7 @@ import fr.openmc.core.OMCPlugin; import fr.openmc.core.features.cube.Cube; import fr.openmc.core.features.dream.DreamUtils; -import fr.openmc.core.features.dream.generation.DreamDimensionManager; +import fr.openmc.core.features.dream.dimension.DreamDimensionManager; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/java/fr/openmc/core/features/dream/DreamManager.java b/src/main/java/fr/openmc/core/features/dream/DreamManager.java index 991b0dc94..2ec236b73 100644 --- a/src/main/java/fr/openmc/core/features/dream/DreamManager.java +++ b/src/main/java/fr/openmc/core/features/dream/DreamManager.java @@ -13,11 +13,9 @@ import fr.openmc.core.features.city.sub.mayor.perks.Perks; import fr.openmc.core.features.dream.commands.AdminDreamCommands; import fr.openmc.core.features.dream.commands.DreamCommands; -import fr.openmc.core.features.dream.generation.DreamBiome; -import fr.openmc.core.features.dream.generation.DreamDimensionManager; -import fr.openmc.core.features.dream.generation.listeners.CloudStructureDispenserListener; -import fr.openmc.core.features.dream.generation.listeners.ReplaceBlockListener; -import fr.openmc.core.features.dream.generation.structures.DreamStructuresManager; +import fr.openmc.core.features.dream.dimension.DreamDimensionManager; +import fr.openmc.core.features.dream.dimension.listeners.CloudStructureDispenserListener; +import fr.openmc.core.features.dream.dimension.listeners.ReplaceBlockListener; import fr.openmc.core.features.dream.listeners.biomes.PlayerEnteredBiome; import fr.openmc.core.features.dream.listeners.dream.*; import fr.openmc.core.features.dream.listeners.orb.PlayerObtainOrb; @@ -33,6 +31,7 @@ import fr.openmc.core.features.dream.models.db.DBDreamPlayer; import fr.openmc.core.features.dream.models.db.DBPlayerSave; import fr.openmc.core.features.dream.models.db.DreamPlayer; +import fr.openmc.core.features.dream.models.registry.DreamBiome; import fr.openmc.core.features.dream.models.registry.items.DreamItem; import fr.openmc.core.features.dream.registries.*; import fr.openmc.core.utils.LocationUtils; @@ -86,7 +85,6 @@ public static void init() { // ** MANAGERS ** DreamDimensionManager.init(); GlaciteNpcManager.init(); - DreamStructuresManager.init(); DreamItemRegistry.init(); DreamBlocksRegistry.init(); DreamMobsRegistry.init(); @@ -231,6 +229,7 @@ public static void addDreamPlayer(Player player, Location oldLocation) throws IO } public static void removeDreamPlayer(Player player, Location dreamLocation) { + player.closeInventory(); player.clearActivePotionEffects(); // supprime les effets des armures des reves DreamPlayer dreamPlayer = dreamPlayerData.remove(player.getUniqueId()); diff --git a/src/main/java/fr/openmc/core/features/dream/DreamUtils.java b/src/main/java/fr/openmc/core/features/dream/DreamUtils.java index 6ffa02da0..5ea72e51f 100644 --- a/src/main/java/fr/openmc/core/features/dream/DreamUtils.java +++ b/src/main/java/fr/openmc/core/features/dream/DreamUtils.java @@ -1,6 +1,6 @@ package fr.openmc.core.features.dream; -import fr.openmc.core.features.dream.generation.DreamDimensionManager; +import fr.openmc.core.features.dream.dimension.DreamDimensionManager; import fr.openmc.core.features.dream.models.db.DreamPlayer; import fr.openmc.core.utils.DateUtils; import fr.openmc.core.utils.messages.MessageType; @@ -35,7 +35,7 @@ public static void addDreamTime(Player player, Long timeToAdd, boolean sendMessa if (dreamPlayer == null) return; dreamPlayer.addTime(timeToAdd); if (sendMessage) - MessagesManager.sendMessage(player, Component.text("Vous avez perdu §a" + DateUtils.convertSecondToTime(timeToAdd) + " §fcar vous avez pris des dégats !"), Prefix.DREAM, MessageType.WARNING, false); + MessagesManager.sendMessage(player, Component.text("Vous avez gagné §a" + DateUtils.convertSecondToTime(timeToAdd)), Prefix.DREAM, MessageType.INFO, false); } diff --git a/src/main/java/fr/openmc/core/features/dream/dimension/DreamDimensionManager.java b/src/main/java/fr/openmc/core/features/dream/dimension/DreamDimensionManager.java new file mode 100644 index 000000000..057a95dea --- /dev/null +++ b/src/main/java/fr/openmc/core/features/dream/dimension/DreamDimensionManager.java @@ -0,0 +1,79 @@ +package fr.openmc.core.features.dream.dimension; + +import fr.openmc.core.OMCPlugin; +import org.bukkit.Bukkit; +import org.bukkit.GameRule; +import org.bukkit.World; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.SpawnCategory; + +import java.io.File; +import java.io.IOException; + +public class DreamDimensionManager { + + public static final String DIMENSION_NAME = "dream"; + private static OMCPlugin plugin; + + private static File seedFile; + private static FileConfiguration seedConfig; + private static boolean seedChanged = false; + + public static void init() { + plugin = OMCPlugin.getInstance(); + + seedFile = new File(OMCPlugin.getInstance().getDataFolder() + "/data/dream", "seed.yml"); + loadSeed(); + } + + public static void postInit() { + World dream = Bukkit.getWorld(DIMENSION_NAME); + if (dream == null) return; + + OMCPlugin.getInstance().getSLF4JLogger().info("[DreamDimensionManager] Saving seed: {}", dream.getSeed()); + saveSeed(dream.getSeed()); + } + + private static void loadSeed() { + if (!seedFile.exists()) { + OMCPlugin.getInstance().getSLF4JLogger().info("Fichier seed.yml manquant, il sera créé au saveSeed()."); + } + seedConfig = YamlConfiguration.loadConfiguration(seedFile); + } + + private static void saveSeed(long seed) { + seedConfig.set("world_seed", seed); + try { + seedConfig.save(seedFile); + } catch (IOException e) { + OMCPlugin.getInstance().getSLF4JLogger().error("Cannot save seed dream_world", e); + } + } + + public static void checkSeed() { + long saved = seedConfig.getLong("world_seed", -1); + + World dream = Bukkit.getWorld(DIMENSION_NAME); + if (dream == null) return; + + long current = dream.getSeed(); + + if (saved == -1) { + saveSeed(current); + seedChanged = false; + return; + } + + seedChanged = saved != current; + + if (seedChanged) { + saveSeed(current); + } + } + + public static boolean hasSeedChanged() { + return seedChanged; + } +} + diff --git a/src/main/java/fr/openmc/core/features/dream/generation/listeners/CloudStructureDispenserListener.java b/src/main/java/fr/openmc/core/features/dream/dimension/listeners/CloudStructureDispenserListener.java similarity index 63% rename from src/main/java/fr/openmc/core/features/dream/generation/listeners/CloudStructureDispenserListener.java rename to src/main/java/fr/openmc/core/features/dream/dimension/listeners/CloudStructureDispenserListener.java index 7f5a6f0ff..101e8e59c 100644 --- a/src/main/java/fr/openmc/core/features/dream/generation/listeners/CloudStructureDispenserListener.java +++ b/src/main/java/fr/openmc/core/features/dream/dimension/listeners/CloudStructureDispenserListener.java @@ -1,7 +1,7 @@ -package fr.openmc.core.features.dream.generation.listeners; +package fr.openmc.core.features.dream.dimension.listeners; -import fr.openmc.core.features.dream.generation.structures.DreamStructure; -import fr.openmc.core.features.dream.generation.structures.DreamStructuresManager; +import fr.openmc.core.features.dream.models.registry.DreamStructure; +import fr.openmc.core.features.dream.registries.DreamStructuresRegistry; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.event.EventHandler; @@ -17,10 +17,7 @@ public void onDispenserInteract(PlayerInteractEvent event) { if (block.getType() != Material.DISPENSER) return; - if (DreamStructuresManager.isInsideStructure( - block.getLocation(), - DreamStructure.DreamType.CLOUD_CASTLE - )) + if (!event.getPlayer().getLocation().getChunk().getStructures(DreamStructure.CLOUD_CASTLE.getStructure()).isEmpty()) event.setCancelled(true); } @@ -29,7 +26,7 @@ public void onDispenserInteract(PlayerInteractEvent event) { public void onBlockBreak(BlockBreakEvent event) { Block block = event.getBlock(); - if (block.getType() == Material.DISPENSER && DreamStructuresManager.isInsideStructure(block.getLocation(), DreamStructure.DreamType.CLOUD_CASTLE)) { + if (block.getType() == Material.DISPENSER && DreamStructuresRegistry.isInDreamStructure(event.getPlayer(), DreamStructure.CLOUD_CASTLE)) { event.setCancelled(true); } } diff --git a/src/main/java/fr/openmc/core/features/dream/generation/listeners/ReplaceBlockListener.java b/src/main/java/fr/openmc/core/features/dream/dimension/listeners/ReplaceBlockListener.java similarity index 85% rename from src/main/java/fr/openmc/core/features/dream/generation/listeners/ReplaceBlockListener.java rename to src/main/java/fr/openmc/core/features/dream/dimension/listeners/ReplaceBlockListener.java index 2e3c34ecd..13752acf3 100644 --- a/src/main/java/fr/openmc/core/features/dream/generation/listeners/ReplaceBlockListener.java +++ b/src/main/java/fr/openmc/core/features/dream/dimension/listeners/ReplaceBlockListener.java @@ -1,9 +1,7 @@ -package fr.openmc.core.features.dream.generation.listeners; +package fr.openmc.core.features.dream.dimension.listeners; import fr.openmc.core.OMCPlugin; import fr.openmc.core.features.dream.DreamUtils; -import fr.openmc.core.features.dream.generation.biomes.CloudChunkGenerator; -import fr.openmc.core.features.dream.generation.biomes.GlaciteCaveChunkGenerator; import fr.openmc.core.features.dream.mecanism.cloudcastle.BossCloudSpawner; import fr.openmc.core.features.dream.mecanism.cloudcastle.CloudVault; import fr.openmc.core.features.dream.mecanism.cloudcastle.PhantomCloudSpawner; @@ -33,26 +31,26 @@ public void onChunkLoad(ChunkLoadEvent event) { for (int x = 0; x < 16; x++) { for (int z = 0; z < 16; z++) { - for (int y = GlaciteCaveChunkGenerator.MIN_CAVE_HEIGHT; y <= GlaciteCaveChunkGenerator.MAX_CAVE_HEIGHT; y++) { + for (int y = -64; y <= 40; y++) { if (chunkSnapshot.getBlockType(x, y, z) == Material.SEA_LANTERN) { - toReplaces.add(new ToReplace(x, y, z, Material.SEA_LANTERN)); + toReplaces.add(new ToReplace(x, y, z, Material.SEA_LANTERN)); // position GlaciteTrader NPC } } - for (int y = GlaciteCaveChunkGenerator.MAX_CAVE_HEIGHT; y <= CloudChunkGenerator.MIN_HEIGHT_CLOUD; y++) { + for (int y = 40; y <= 120; y++) { Material mat = chunkSnapshot.getBlockType(x, y, z); if (mat.equals(Material.GRAY_GLAZED_TERRACOTTA)) { - toReplaces.add(new ToReplace(x, y, z, mat)); + toReplaces.add(new ToReplace(x, y, z, mat)); // soul altar } } - for (int y = CloudChunkGenerator.MAX_HEIGHT_CLOUD; y <= CloudChunkGenerator.MAX_HEIGHT_CLOUD + 85; y++) { + for (int y = 125; y <= 125 + 100; y++) { Material mat = chunkSnapshot.getBlockType(x, y, z); if (mat.equals(Material.NETHERITE_BLOCK) || mat.equals(Material.COAL_BLOCK) || mat.equals(Material.LAPIS_BLOCK) || mat.equals(Material.DIAMOND_BLOCK)) { - toReplaces.add(new ToReplace(x, y, z, mat)); + toReplaces.add(new ToReplace(x, y, z, mat)); // spawner, vault } } } @@ -87,6 +85,5 @@ public void onChunkLoad(ChunkLoadEvent event) { }); } - public record ToReplace(int x, int y, int z, Material material) { - } + public record ToReplace(int x, int y, int z, Material material) {} } diff --git a/src/main/java/fr/openmc/core/features/dream/dimension/listeners/SetupDreamDimensionListener.java b/src/main/java/fr/openmc/core/features/dream/dimension/listeners/SetupDreamDimensionListener.java new file mode 100644 index 000000000..d9bdde169 --- /dev/null +++ b/src/main/java/fr/openmc/core/features/dream/dimension/listeners/SetupDreamDimensionListener.java @@ -0,0 +1,45 @@ +package fr.openmc.core.features.dream.dimension.listeners; + +import fr.openmc.core.features.dream.dimension.DreamDimensionManager; +import org.bukkit.GameRule; +import org.bukkit.World; +import org.bukkit.entity.SpawnCategory; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.world.WorldInitEvent; + +public class SetupDreamDimensionListener implements Listener { + @EventHandler + public void onWorldLoad(WorldInitEvent event) { + World world = event.getWorld(); + if (!world.getName().equals(DreamDimensionManager.DIMENSION_NAME)) return; + + DreamDimensionManager.checkSeed(); + + if (DreamDimensionManager.hasSeedChanged()) { + // ** SPAWNING RULES ** + world.setSpawnLimit(SpawnCategory.MONSTER, 10); + world.setSpawnLimit(SpawnCategory.AMBIENT, 10); + world.setSpawnLimit(SpawnCategory.ANIMAL, 6); + + world.setTicksPerSpawns(SpawnCategory.MONSTER, 30); + world.setTicksPerSpawns(SpawnCategory.AMBIENT, 15); + world.setTicksPerSpawns(SpawnCategory.ANIMAL, 30); + + // ** SET GAMERULE FOR THE WORLD ** + world.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, false); + world.setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, false); + world.setGameRule(GameRule.DO_WEATHER_CYCLE, false); + world.setGameRule(GameRule.DISABLE_RAIDS, true); + world.setGameRule(GameRule.DO_PATROL_SPAWNING, false); + world.setGameRule(GameRule.DO_TRADER_SPAWNING, false); + world.setGameRule(GameRule.NATURAL_REGENERATION, false); + world.setGameRule(GameRule.LOCATOR_BAR, false); + world.setGameRule(GameRule.ALLOW_ENTERING_NETHER_USING_PORTALS, false); + + // ** SET WORLD BORDER AND TIME ** + world.getWorldBorder().setSize(10000); + world.setTime(18000); + } + } +} diff --git a/src/main/java/fr/openmc/core/features/dream/displays/DreamScoreboard.java b/src/main/java/fr/openmc/core/features/dream/displays/DreamScoreboard.java index 53108870e..fdfe570ff 100644 --- a/src/main/java/fr/openmc/core/features/dream/displays/DreamScoreboard.java +++ b/src/main/java/fr/openmc/core/features/dream/displays/DreamScoreboard.java @@ -5,17 +5,18 @@ import fr.openmc.core.features.displays.scoreboards.BaseScoreboard; import fr.openmc.core.features.dream.DreamManager; import fr.openmc.core.features.dream.DreamUtils; -import fr.openmc.core.features.dream.generation.DreamBiome; -import fr.openmc.core.features.dream.generation.DreamDimensionManager; -import fr.openmc.core.features.dream.generation.structures.DreamStructure; -import fr.openmc.core.features.dream.generation.structures.DreamStructuresManager; import fr.openmc.core.features.dream.models.db.DreamPlayer; +import fr.openmc.core.features.dream.models.registry.DreamBiome; +import fr.openmc.core.features.dream.models.registry.DreamStructure; +import fr.openmc.core.features.dream.registries.DreamBiomesRegistry; +import fr.openmc.core.features.dream.registries.DreamStructuresRegistry; import fr.openmc.core.utils.DateUtils; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.text.format.TextDecoration; import net.kyori.adventure.text.minimessage.MiniMessage; +import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import org.bukkit.entity.Player; import java.util.ArrayList; @@ -41,7 +42,7 @@ protected void updateTitle(Player player, SternalBoard board) { @Override public void update(Player player, SternalBoard board) { - DreamBiome dreamBiome = DreamDimensionManager.getDreamBiome(player); + DreamBiome dreamBiome = DreamBiomesRegistry.getDreamBiome(player); DreamPlayer dreamPlayer = DreamManager.getDreamPlayer(player); List lines = new ArrayList<>(); @@ -78,9 +79,9 @@ public void update(Player player, SternalBoard board) { ); } - DreamStructure dreamStructure = DreamStructuresManager.getStructureAt(player.getLocation()); + DreamStructure dreamStructure = DreamStructuresRegistry.getDreamStructure(player); if (dreamStructure != null) { - String nameLocation = dreamStructure.type().getName(); + String nameLocation = PlainTextComponentSerializer.plainText().serialize(dreamStructure.getName()); lines.add(text(" • ", NamedTextColor.DARK_GRAY) .append(text(textToSmall("location:"), NamedTextColor.GRAY)) .appendSpace() diff --git a/src/main/java/fr/openmc/core/features/dream/generation/DreamBiomeProvider.java b/src/main/java/fr/openmc/core/features/dream/generation/DreamBiomeProvider.java deleted file mode 100644 index 503085bd1..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/DreamBiomeProvider.java +++ /dev/null @@ -1,73 +0,0 @@ -package fr.openmc.core.features.dream.generation; - -import org.bukkit.block.Biome; -import org.bukkit.generator.BiomeProvider; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.noise.PerlinNoiseGenerator; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import static fr.openmc.core.features.dream.generation.biomes.CloudChunkGenerator.MIN_HEIGHT_CLOUD; -import static fr.openmc.core.features.dream.generation.biomes.MudBeachChunkGenerator.MAX_HEIGHT_MUD; -import static fr.openmc.core.features.dream.generation.biomes.MudBeachChunkGenerator.MIN_HEIGHT_MUD; - -public class DreamBiomeProvider extends BiomeProvider { - private final PerlinNoiseGenerator noiseGenerator; - private final List biomes; - private final int octaves = 5; - private final double scale = 0.0025; - - public DreamBiomeProvider(long seed) { - this.noiseGenerator = new PerlinNoiseGenerator(new Random(seed)); - - this.biomes = new ArrayList<>(); - this.biomes.add(DreamBiome.SCULK_PLAINS.getBiome()); - this.biomes.add(DreamBiome.SOUL_FOREST.getBiome()); - this.biomes.add(DreamBiome.MUD_BEACH.getBiome()); - } - - @Override - public @NotNull Biome getBiome(@NotNull WorldInfo worldInfo, int x, int y, int z) { - - if (y >= MIN_HEIGHT_CLOUD) { - return DreamBiome.CLOUD_LAND.getBiome(); - } - - if (y <= MAX_HEIGHT_MUD && y > MIN_HEIGHT_MUD) { - return DreamBiome.MUD_BEACH.getBiome(); - } - - if (y <= MIN_HEIGHT_MUD) { - return DreamBiome.GLACITE_GROTTO.getBiome(); - } - - double noise = 0; - double amplitude = 1; - double frequency = 1; - double maxValue = 0; - - for (int i = 0; i < octaves; i++) { - noise += noiseGenerator.noise(x * scale * frequency, z * scale * frequency, 0.0) * amplitude; - maxValue += amplitude; - amplitude *= 0.5; - frequency *= 2; - } - - noise = noise / maxValue; - - List landBiomes = biomes.stream() - .filter(b -> b != DreamBiome.MUD_BEACH.getBiome()) - .toList(); - - int biomeIndex = (int) ((noise + 1) * landBiomes.size() / 2) % landBiomes.size(); - return landBiomes.get(biomeIndex); - } - - @Override - public @NotNull List getBiomes(@NotNull WorldInfo worldInfo) { - return biomes; - } -} \ No newline at end of file diff --git a/src/main/java/fr/openmc/core/features/dream/generation/DreamChunkGenerator.java b/src/main/java/fr/openmc/core/features/dream/generation/DreamChunkGenerator.java deleted file mode 100644 index 060e5669d..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/DreamChunkGenerator.java +++ /dev/null @@ -1,79 +0,0 @@ -package fr.openmc.core.features.dream.generation; - -import fr.openmc.core.features.dream.generation.biomes.*; -import org.bukkit.Material; -import org.bukkit.block.Biome; -import org.bukkit.generator.BiomeProvider; -import org.bukkit.generator.ChunkGenerator; -import org.bukkit.generator.WorldInfo; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -import static fr.openmc.core.features.dream.generation.biomes.GlaciteCaveChunkGenerator.MAX_CAVE_HEIGHT; -import static fr.openmc.core.features.dream.generation.biomes.GlaciteCaveChunkGenerator.MIN_CAVE_HEIGHT; - -public class DreamChunkGenerator extends ChunkGenerator { - public static final Material FLOOR_MATERIAL = Material.BEDROCK; - private final DreamBiomeProvider biomeProvider; - - public DreamChunkGenerator(long seed) { - this.biomeProvider = new DreamBiomeProvider(seed); - } - - /* https://www.spigotmc.org/threads/545616/ */ - - @Override - public BiomeProvider getDefaultBiomeProvider(@NotNull WorldInfo worldInfo) { - return biomeProvider; - } - - @Override - public boolean shouldGenerateMobs() { - return true; - } - - @Override - public void generateNoise(@NotNull WorldInfo worldInfo, @NotNull Random random, int chunkX, int chunkZ, ChunkData chunkData) { - for (int y = chunkData.getMinHeight(); y < 130 && y < chunkData.getMaxHeight(); y++) { - for (int x = 0; x < 16; x++) { - for (int z = 0; z < 16; z++) { - Biome biome = chunkData.getBiome(x, y, z); - - if (biome.equals(DreamBiome.SCULK_PLAINS.getBiome())) { - PlainsChunkGenerator.generateBlock(random, chunkX, chunkZ, chunkData, x, y, z); - } else if (biome.equals(DreamBiome.SOUL_FOREST.getBiome())) { - SoulForestChunkGenerator.generateBlock(random, chunkX, chunkZ, chunkData, x, y, z); - } else if (biome.equals(DreamBiome.MUD_BEACH.getBiome())) { - MudBeachChunkGenerator.generateBlock(random, chunkX, chunkZ, chunkData, x, y, z); - } else if (biome.equals(DreamBiome.CLOUD_LAND.getBiome())) { - CloudChunkGenerator.generateBlock(random, chunkX, chunkZ, chunkData, x, y, z); - } - } - } - } - - for (int y = MIN_CAVE_HEIGHT; y < MAX_CAVE_HEIGHT; y++) { - for (int x = 0; x < 16; x++) { - for (int z = 0; z < 16; z++) { - GlaciteCaveChunkGenerator.generateBlock(random, chunkX, chunkZ, chunkData, x, y, z); - } - } - } - - // sol avant la bedrock - for (int y = MIN_CAVE_HEIGHT + 1; y < MIN_CAVE_HEIGHT + 4; y++) { - for (int x = 0; x < 16; x++) { - for (int z = 0; z < 16; z++) { - if (y == MIN_CAVE_HEIGHT + 1) { - if (chunkData.getType(x, y, z).isAir()) - chunkData.setBlock(x, y, z, Material.BLUE_ICE); - } else { - if (chunkData.getType(x, y, z).isAir()) - chunkData.setBlock(x, y, z, Material.ICE); - } - } - } - } - } -} \ No newline at end of file diff --git a/src/main/java/fr/openmc/core/features/dream/generation/DreamDimensionManager.java b/src/main/java/fr/openmc/core/features/dream/generation/DreamDimensionManager.java deleted file mode 100644 index a16972a62..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/DreamDimensionManager.java +++ /dev/null @@ -1,200 +0,0 @@ -package fr.openmc.core.features.dream.generation; - -import fr.openmc.core.OMCPlugin; -import fr.openmc.core.features.dream.DreamUtils; -import fr.openmc.core.features.dream.generation.biomes.*; -import fr.openmc.core.features.dream.generation.populators.glacite.GlaciteGeodePopulator; -import fr.openmc.core.features.dream.generation.populators.glacite.GroundSpikePopulator; -import fr.openmc.core.features.dream.generation.populators.glacite.VerticalSpikePopulator; -import fr.openmc.core.features.dream.generation.populators.mud.RockPopulator; -import fr.openmc.core.features.dream.generation.populators.plains.PlainsTreePopulator; -import fr.openmc.core.features.dream.generation.populators.soulforest.PillarPopulator; -import fr.openmc.core.features.dream.generation.populators.soulforest.SoulTreePopulator; -import fr.openmc.core.features.dream.generation.structures.cloud.CloudCastleStructure; -import fr.openmc.core.features.dream.generation.structures.glacite.BaseCampStructure; -import fr.openmc.core.features.dream.generation.structures.soulforest.SoulAltarStructure; -import fr.openmc.core.utils.structure.FeaturesPopulator; -import fr.openmc.core.utils.structure.SchematicsUtils; -import org.bukkit.Bukkit; -import org.bukkit.GameRule; -import org.bukkit.World; -import org.bukkit.WorldCreator; -import org.bukkit.block.Biome; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.entity.Player; -import org.bukkit.entity.SpawnCategory; - -import java.io.File; -import java.io.IOException; -import java.util.HashSet; -import java.util.Random; -import java.util.Set; -import java.util.concurrent.ThreadLocalRandom; - -public class DreamDimensionManager { - - public static final String DIMENSION_NAME = "world_dream"; - private static OMCPlugin plugin; - - private static File seedFile; - private static FileConfiguration seedConfig; - - private static final Set registeredFeatures = new HashSet<>(); - - public static void init() { - plugin = OMCPlugin.getInstance(); - - // ** STRUCTURES SCHEMATICS REGISTER ** - SchematicsUtils.extractSchematic(CloudCastleStructure.STRUCTURE_NAME); - SchematicsUtils.extractSchematic(BaseCampStructure.STRUCTURE_NAME); - SchematicsUtils.extractSchematic(SoulAltarStructure.STRUCTURE_NAME); - - // ** REGISTER STRUCTURES NBT ** - registrerFeatures(new RockPopulator()); - registrerFeatures(new PlainsTreePopulator()); - registrerFeatures(new SoulTreePopulator()); - registrerFeatures(new PillarPopulator()); - registrerFeatures(new VerticalSpikePopulator()); - registrerFeatures(new GroundSpikePopulator()); - registrerFeatures(new GlaciteGeodePopulator()); - - createDimension(); - - seedFile = new File(OMCPlugin.getInstance().getDataFolder() + "/data/dream", "seed.yml"); - loadSeed(); - } - - public static void postInit() { - World dream = Bukkit.getWorld(DIMENSION_NAME); - if (dream == null) return; - - OMCPlugin.getInstance().getSLF4JLogger().info("Saving seed: {}", dream.getSeed()); - saveSeed(dream.getSeed()); - } - - // ** DIMENSION MANAGING ** - - public static void createDimension() { - WorldCreator creator = new WorldCreator(DIMENSION_NAME); - - File worldFolder = new File(Bukkit.getWorldContainer(), DIMENSION_NAME); - long seed; - - if (!worldFolder.exists()) { - seed = createSeed(); - creator.seed(seed); - plugin.getSLF4JLogger().info("New Dream world created with seed: {}", seed); - } else { - World existing = Bukkit.getWorld(DIMENSION_NAME); - seed = (existing != null) ? existing.getSeed() : creator.seed(); - plugin.getSLF4JLogger().info("Loading existing Dream world with seed: {}", seed); - } - - creator.generator(new DreamChunkGenerator(seed)); - SoulForestChunkGenerator.init(seed); - PlainsChunkGenerator.init(seed); - MudBeachChunkGenerator.init(seed); - CloudChunkGenerator.init(seed); - GlaciteCaveChunkGenerator.init(seed); - - creator.environment(World.Environment.NORMAL); - - World dream = creator.createWorld(); - - dream.getWorldBorder().setSize(10000); - - // ** SPAWNING RULES ** - dream.setSpawnLimit(SpawnCategory.MONSTER, 10); - dream.setSpawnLimit(SpawnCategory.AMBIENT, 10); - dream.setSpawnLimit(SpawnCategory.ANIMAL, 6); - - dream.setTicksPerSpawns(SpawnCategory.MONSTER, 30); - dream.setTicksPerSpawns(SpawnCategory.AMBIENT, 15); - dream.setTicksPerSpawns(SpawnCategory.ANIMAL, 30); - - // ** STRUCTURES POPULATORS REGISTER ** - dream.getPopulators().add(new CloudCastleStructure()); - dream.getPopulators().add(new BaseCampStructure()); - dream.getPopulators().add(new SoulAltarStructure()); - - // ** POPULATORS REGISTER ** - registeredFeatures.forEach(populator -> dream.getPopulators().add(populator)); - - // ** SET GAMERULE FOR THE WORLD ** - dream.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, false); - dream.setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, false); - dream.setGameRule(GameRule.DO_WEATHER_CYCLE, false); - dream.setGameRule(GameRule.DISABLE_RAIDS, true); - dream.setGameRule(GameRule.DO_PATROL_SPAWNING, false); - dream.setGameRule(GameRule.DO_TRADER_SPAWNING, false); - dream.setGameRule(GameRule.NATURAL_REGENERATION, false); - dream.setGameRule(GameRule.LOCATOR_BAR, false); - dream.setGameRule(GameRule.ALLOW_ENTERING_NETHER_USING_PORTALS, false); - - dream.setTime(18000); - - plugin.getSLF4JLogger().info("Dream Dimension ready!"); - } - - // ** STRUCTURE NBT MANAGING ** - private static void registrerFeatures(FeaturesPopulator populator) { - registeredFeatures.add(populator); - } - - // ** BIOME MANAGING ** - public static DreamBiome getDreamBiome(Biome biome) { - for (DreamBiome dreamBiome : DreamBiome.values()) { - if (!dreamBiome.getBiome().equals(biome)) continue; - - return dreamBiome; - } - - return DreamBiome.SCULK_PLAINS; - } - - public static DreamBiome getDreamBiome(Player player) { - World world = player.getWorld(); - - if (!DreamUtils.isDreamWorld(world)) return null; - - return getDreamBiome(world.getBiome(player.getLocation())); - } - - // ** SEED MANAGING ** - private static long createSeed() { - Random random = ThreadLocalRandom.current(); - long seed = random.nextLong(); - - while (seed == 0) { - seed = random.nextLong(); - } - - return seed; - } - - private static void loadSeed() { - if (!seedFile.exists()) { - OMCPlugin.getInstance().getSLF4JLogger().info("Fichier seed.yml manquant, il sera créé au saveSeed()."); - } - seedConfig = YamlConfiguration.loadConfiguration(seedFile); - } - - private static void saveSeed(long seed) { - seedConfig.set("world_seed", seed); - try { - seedConfig.save(seedFile); - } catch (IOException e) { - OMCPlugin.getInstance().getSLF4JLogger().error("Cannot save seed dream_world", e); - } - } - - public static boolean hasSeedChanged() { - long saved = seedConfig.getLong("world_seed", -1); - World dream = Bukkit.getWorld(DIMENSION_NAME); - if (dream == null) return false; - long current = dream.getSeed(); - return saved != current; - } -} - diff --git a/src/main/java/fr/openmc/core/features/dream/generation/biomes/CloudChunkGenerator.java b/src/main/java/fr/openmc/core/features/dream/generation/biomes/CloudChunkGenerator.java deleted file mode 100644 index 956d21ca8..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/biomes/CloudChunkGenerator.java +++ /dev/null @@ -1,43 +0,0 @@ -package fr.openmc.core.features.dream.generation.biomes; - -import fr.openmc.core.utils.FastNoiseLite; -import org.bukkit.Material; -import org.bukkit.generator.ChunkGenerator; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class CloudChunkGenerator { - public static final int MIN_HEIGHT_CLOUD = 120; - public static final int MAX_HEIGHT_CLOUD = 124; - - public static final FastNoiseLite cloudNoise = new FastNoiseLite(); - - public static void init(long seed) { - cloudNoise.SetSeed((int) seed); - cloudNoise.SetFrequency(0.06f); - } - - public static void generateBlock(@NotNull Random random, int chunkX, int chunkZ, ChunkGenerator.ChunkData chunkData, int x, int y, int z) { - if (y >= MIN_HEIGHT_CLOUD && y <= MAX_HEIGHT_CLOUD) { - // noise principal pour la densité des nuages - float cloudNoiseValue = cloudNoise.GetNoise( - (x + (chunkX * 16)) * 0.8f, - (z + (chunkZ * 16)) * 0.8f - ); - - float normalized = (cloudNoiseValue + 1) / 2f; - - if (normalized > 0.5f) { - float distToCenter = Math.abs(y - 112.5f); - float verticalFactor = Math.max(0.2f, 1.5f - (distToCenter / 2f)); - float baseDensity = 0.65f; - float finalDensity = Math.max(baseDensity, normalized * verticalFactor); - - if (random.nextFloat() < finalDensity) { - chunkData.setBlock(x, y, z, Material.POWDER_SNOW); - } - } - } - } -} diff --git a/src/main/java/fr/openmc/core/features/dream/generation/biomes/GlaciteCaveChunkGenerator.java b/src/main/java/fr/openmc/core/features/dream/generation/biomes/GlaciteCaveChunkGenerator.java deleted file mode 100644 index 93928d677..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/biomes/GlaciteCaveChunkGenerator.java +++ /dev/null @@ -1,119 +0,0 @@ -package fr.openmc.core.features.dream.generation.biomes; - -import fr.openmc.core.features.dream.generation.DreamBiome; -import fr.openmc.core.utils.FastNoiseLite; -import org.bukkit.Material; -import org.bukkit.block.data.type.Snow; -import org.bukkit.generator.ChunkGenerator; -import org.jetbrains.annotations.NotNull; - -import java.util.Arrays; -import java.util.List; -import java.util.Random; - -import static fr.openmc.core.features.dream.generation.DreamChunkGenerator.FLOOR_MATERIAL; -import static fr.openmc.core.features.dream.generation.biomes.MudBeachChunkGenerator.MIN_HEIGHT_MUD; - -public class GlaciteCaveChunkGenerator { - - private static final List MINERALS = Arrays.asList( - Material.DEEPSLATE_COAL_ORE - ); - public static final List CAVE_MATERIALS = Arrays.asList( - Material.DEEPSLATE, - Material.SMOOTH_BASALT - ); - - private static final Material SURFACE_MATERIAL = Material.SNOW_BLOCK; - private static final int NUMBER_SURFACE_BLOCK = 2; - - public static final int MAX_CAVE_HEIGHT = 64; - public static final int MIN_CAVE_HEIGHT = -64; - - private static final FastNoiseLite noiseA = new FastNoiseLite(); - private static final FastNoiseLite noiseB = new FastNoiseLite(); - - public static void init(long seed) { - noiseA.SetSeed((int) seed); - noiseA.SetNoiseType(FastNoiseLite.NoiseType.OpenSimplex2); - noiseA.SetFractalType(FastNoiseLite.FractalType.Ridged); - noiseA.SetFrequency(0.006f); - noiseA.SetFractalOctaves(3); - - noiseB.SetSeed((int) seed); - noiseB.SetNoiseType(FastNoiseLite.NoiseType.OpenSimplex2); - noiseB.SetFractalType(FastNoiseLite.FractalType.Ridged); - noiseB.SetFrequency(0.006f); - noiseB.SetFractalOctaves(3); - } - - public static void generateBlock(@NotNull Random random, int chunkX, int chunkZ, ChunkGenerator.ChunkData chunkData, int x, int y, int z) { - if (y == MIN_CAVE_HEIGHT) { - chunkData.setBlock(x, y, z, FLOOR_MATERIAL); - return; - } - - int worldX = (chunkX << 4) + x; - int worldZ = (chunkZ << 4) + z; - - if (chunkData.getBiome(x, y, z) == DreamBiome.MUD_BEACH.getBiome()) { - if (y > MIN_HEIGHT_MUD) return; - } - - if (y < MIN_CAVE_HEIGHT || y > MAX_CAVE_HEIGHT) return; - - double vA = noiseA.GetNoise(worldX, y, worldZ); - double vB = noiseB.GetNoise(worldX, y, worldZ); - - // petite valeur, petit tunnel - grosse valeur, gros tunnel - double threshold = 0.42; - boolean isCave = (vA * vA + vB * vB) < threshold * threshold; - - if (!isCave) { - Material wallMat = CAVE_MATERIALS.get(random.nextInt(CAVE_MATERIALS.size())); - if (random.nextFloat() < 0.01) { - wallMat = MINERALS.get(random.nextInt(MINERALS.size())); - } - chunkData.setBlock(x, y, z, wallMat); - return; - } - - chunkData.setBlock(x, y, z, Material.AIR); - - if (y - 4 >= MIN_CAVE_HEIGHT) { - Material below = chunkData.getType(x, y - 1, z); - if (below != Material.AIR && below != Material.SNOW && below != SURFACE_MATERIAL) { - - for (int i = 0; i < NUMBER_SURFACE_BLOCK; i++) { - int snowY = y - 1 + i; - if (snowY <= MAX_CAVE_HEIGHT) { - chunkData.setBlock(x, snowY, z, SURFACE_MATERIAL); - } - } - - int solidCount = 0; - for (int dx = -1; dx <= 1; dx++) { - for (int dz = -1; dz <= 1; dz++) { - if (dx == 0 && dz == 0) continue; - Material around = chunkData.getType(x + dx, y - 1, z + dz); - if (around.isSolid()) - solidCount++; - } - } - - int layers; - if (solidCount >= 6) { - layers = 6; - } else if (solidCount >= 3) { - layers = 4; - } else { - layers = 2; - } - - Snow snowData = (Snow) Material.SNOW.createBlockData(); - snowData.setLayers(layers); - chunkData.setBlock(x, y, z, snowData); - } - } - } -} \ No newline at end of file diff --git a/src/main/java/fr/openmc/core/features/dream/generation/biomes/MudBeachChunkGenerator.java b/src/main/java/fr/openmc/core/features/dream/generation/biomes/MudBeachChunkGenerator.java deleted file mode 100644 index 337f66c1c..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/biomes/MudBeachChunkGenerator.java +++ /dev/null @@ -1,63 +0,0 @@ -package fr.openmc.core.features.dream.generation.biomes; - -import fr.openmc.core.utils.FastNoiseLite; -import org.bukkit.Material; -import org.bukkit.generator.ChunkGenerator; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -import static fr.openmc.core.features.dream.generation.biomes.GlaciteCaveChunkGenerator.CAVE_MATERIALS; -import static fr.openmc.core.features.dream.generation.biomes.PlainsChunkGenerator.PLAINS_SURFACE_MATERIAL; - -public class MudBeachChunkGenerator { - public static final int MIN_HEIGHT_MUD = 34; - public static final int MAX_HEIGHT_MUD = 67; - - private static final Material BEACH_SURFACE_MATERIAL = Material.MUD; - - public static final FastNoiseLite terrainNoise = new FastNoiseLite(); - public static final FastNoiseLite detailNoise = new FastNoiseLite(); - - public static void init(long seed) { - terrainNoise.SetSeed((int) seed); - terrainNoise.SetFrequency(0.003f); - detailNoise.SetSeed((int) seed); - detailNoise.SetFrequency(0.05f); - - terrainNoise.SetFractalType(FastNoiseLite.FractalType.FBm); - terrainNoise.SetFractalOctaves(13); - } - - public static void generateBlock(@NotNull Random random, int chunkX, int chunkZ, ChunkGenerator.ChunkData chunkData, int x, int y, int z) { - float noise2 = (terrainNoise.GetNoise(x + (chunkX * 16), z + (chunkZ * 16)) * 2) + (detailNoise.GetNoise(x + (chunkX * 16), z + (chunkZ * 16)) / 10); - float noise3 = detailNoise.GetNoise(x + (chunkX * 16), y, z + (chunkZ * 16)); - float currentY = (65 + (noise2 * 15)); - - - if (y >= currentY) return; - - float distanceToSurface = Math.abs(y - currentY); // The absolute y distance to the world surface. - double function = .1 * Math.pow(distanceToSurface, 2) - 1; // A second grade polynomial offset to the noise max and min (1, -1). - - if (noise3 > Math.min(function, -.3)) { - if (y <= MAX_HEIGHT_MUD) { - int distance = MAX_HEIGHT_MUD - y; - - int plainsSurfaceChance = 80 - (distance * 20); - - if (plainsSurfaceChance > 0) { - if (random.nextInt(100) < plainsSurfaceChance) { - chunkData.setBlock(x, y, z, PLAINS_SURFACE_MATERIAL); - } else { - chunkData.setBlock(x, y, z, BEACH_SURFACE_MATERIAL); - } - } else { - chunkData.setBlock(x, y, z, BEACH_SURFACE_MATERIAL); - } - } else { - chunkData.setBlock(x, y, z, CAVE_MATERIALS.get(random.nextInt(CAVE_MATERIALS.size()))); - } - } - } -} diff --git a/src/main/java/fr/openmc/core/features/dream/generation/biomes/PlainsChunkGenerator.java b/src/main/java/fr/openmc/core/features/dream/generation/biomes/PlainsChunkGenerator.java deleted file mode 100644 index 14c7856cc..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/biomes/PlainsChunkGenerator.java +++ /dev/null @@ -1,48 +0,0 @@ -package fr.openmc.core.features.dream.generation.biomes; - -import fr.openmc.core.utils.FastNoiseLite; -import org.bukkit.Material; -import org.bukkit.generator.ChunkGenerator; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -import static fr.openmc.core.features.dream.generation.biomes.GlaciteCaveChunkGenerator.CAVE_MATERIALS; - -public class PlainsChunkGenerator { - - public static final Material PLAINS_SURFACE_MATERIAL = Material.SCULK; - - public static final FastNoiseLite terrainNoise = new FastNoiseLite(); - public static final FastNoiseLite detailNoise = new FastNoiseLite(); - - public static void init(long seed) { - terrainNoise.SetSeed((int) seed); - terrainNoise.SetFrequency(0.003f); - detailNoise.SetSeed((int) seed); - detailNoise.SetFrequency(0.05f); - - terrainNoise.SetFractalType(FastNoiseLite.FractalType.FBm); - terrainNoise.SetFractalOctaves(13); - } - - public static void generateBlock(@NotNull Random random, int chunkX, int chunkZ, ChunkGenerator.ChunkData chunkData, int x, int y, int z) { - float noise2 = (terrainNoise.GetNoise(x + (chunkX * 16), z + (chunkZ * 16)) * 2) + (detailNoise.GetNoise(x + (chunkX * 16), z + (chunkZ * 16)) / 10); - float noise3 = detailNoise.GetNoise(x + (chunkX * 16), y, z + (chunkZ * 16)); - float currentY = (65 + (noise2 * 15)); - - if (y >= currentY) return; - - float distanceToSurface = Math.abs(y - currentY); // The absolute y distance to the world surface. - double function = .1 * Math.pow(distanceToSurface, 2) - 1; // A second grade polynomial offset to the noise max and min (1, -1). - - if (noise3 > Math.min(function, -.3)) { - // Set sculk if the block closest to the surface. - if (distanceToSurface < 6 && y > 63) { - chunkData.setBlock(x, y, z, PLAINS_SURFACE_MATERIAL); - } else { - chunkData.setBlock(x, y, z, CAVE_MATERIALS.get(random.nextInt(CAVE_MATERIALS.size()))); - } - } - } -} diff --git a/src/main/java/fr/openmc/core/features/dream/generation/biomes/SoulForestChunkGenerator.java b/src/main/java/fr/openmc/core/features/dream/generation/biomes/SoulForestChunkGenerator.java deleted file mode 100644 index 48789cf5b..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/biomes/SoulForestChunkGenerator.java +++ /dev/null @@ -1,47 +0,0 @@ -package fr.openmc.core.features.dream.generation.biomes; - -import fr.openmc.core.utils.FastNoiseLite; -import org.bukkit.Material; -import org.bukkit.generator.ChunkGenerator; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -import static fr.openmc.core.features.dream.generation.biomes.GlaciteCaveChunkGenerator.CAVE_MATERIALS; - -public class SoulForestChunkGenerator { - - public static final Material FOREST_SURFACE_MATERIAL = Material.SCULK; - - public static final FastNoiseLite terrainNoise = new FastNoiseLite(); - public static final FastNoiseLite detailNoise = new FastNoiseLite(); - - public static void init(long seed) { - terrainNoise.SetSeed((int) seed); - terrainNoise.SetFrequency(0.003f); - detailNoise.SetSeed((int) seed); - detailNoise.SetFrequency(0.05f); - - terrainNoise.SetFractalType(FastNoiseLite.FractalType.FBm); - terrainNoise.SetFractalOctaves(13); - } - - public static void generateBlock(@NotNull Random random, int chunkX, int chunkZ, ChunkGenerator.ChunkData chunkData, int x, int y, int z) { - float noise2 = (terrainNoise.GetNoise(x + (chunkX * 16), z + (chunkZ * 16)) * 2) + (detailNoise.GetNoise(x + (chunkX * 16), z + (chunkZ * 16)) / 10); - float noise3 = detailNoise.GetNoise(x + (chunkX * 16), y, z + (chunkZ * 16)); - float currentY = (65 + (noise2 * 15)); - - if (y >= currentY) return; - - float distanceToSurface = Math.abs(y - currentY); // The absolute y distance to the world surface. - double function = .1 * Math.pow(distanceToSurface, 2) - 1; // A second grade polynomial offset to the noise max and min (1, -1). - - if (noise3 > Math.min(function, -.3)) { - if (distanceToSurface < 3 && y > 63) { - chunkData.setBlock(x, y, z, FOREST_SURFACE_MATERIAL); - } else { - chunkData.setBlock(x, y, z, CAVE_MATERIALS.get(random.nextInt(CAVE_MATERIALS.size()))); - } - } - } -} diff --git a/src/main/java/fr/openmc/core/features/dream/generation/populators/glacite/CavePopulator.java b/src/main/java/fr/openmc/core/features/dream/generation/populators/glacite/CavePopulator.java deleted file mode 100644 index 066c42ed3..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/populators/glacite/CavePopulator.java +++ /dev/null @@ -1,57 +0,0 @@ -package fr.openmc.core.features.dream.generation.populators.glacite; - -import fr.openmc.core.utils.structure.FeaturesPopulator; -import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.World; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.jetbrains.annotations.NotNull; - -import java.util.List; -import java.util.Random; - -import static fr.openmc.core.features.dream.generation.biomes.GlaciteCaveChunkGenerator.MIN_CAVE_HEIGHT; -import static fr.openmc.core.features.dream.generation.biomes.MudBeachChunkGenerator.MIN_HEIGHT_MUD; - -public class CavePopulator extends FeaturesPopulator { - - private final double chunkProbability; - private final double perSolProbability; - - public CavePopulator(double chunkProbability, double perSolProbability, List features) { - super("omc_dream", features); - this.chunkProbability = chunkProbability; - this.perSolProbability = perSolProbability; - } - - @Override - public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) { - if (random.nextDouble() >= chunkProbability) return; - - int startX = chunk.getX() << 4; - int startZ = chunk.getZ() << 4; - int attempts = 32; - - for (int i = 0; i < attempts; i++) { - int x = startX + random.nextInt(16); - int z = startZ + random.nextInt(16); - - for (int y = MIN_HEIGHT_MUD - 1; y > MIN_CAVE_HEIGHT; y--) { - Block block = world.getBlockAt(x, y, z); - - if (!block.getType().isAir() || !block.getRelative(BlockFace.DOWN).getType().equals(Material.ICE)) { - Block above = block.getRelative(BlockFace.UP); - - if (above.isEmpty() || above.getType() == Material.SNOW) { - if (random.nextDouble() < perSolProbability) { - Location loc = new Location(world, x, y + 1, z); - placeFeatures(getRandomFeatures(random), loc, random.nextBoolean(), random.nextBoolean(), false); - } - } - } - } - } - } -} diff --git a/src/main/java/fr/openmc/core/features/dream/generation/populators/glacite/GlaciteGeodePopulator.java b/src/main/java/fr/openmc/core/features/dream/generation/populators/glacite/GlaciteGeodePopulator.java deleted file mode 100644 index f4105cb73..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/populators/glacite/GlaciteGeodePopulator.java +++ /dev/null @@ -1,37 +0,0 @@ -package fr.openmc.core.features.dream.generation.populators.glacite; - -import fr.openmc.core.utils.structure.FeaturesPopulator; -import fr.openmc.core.utils.structure.StructureUtils; -import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.World; -import org.jetbrains.annotations.NotNull; - -import java.util.List; -import java.util.Random; - -import static fr.openmc.core.features.dream.generation.biomes.GlaciteCaveChunkGenerator.MIN_CAVE_HEIGHT; -import static fr.openmc.core.features.dream.generation.biomes.MudBeachChunkGenerator.MIN_HEIGHT_MUD; - - -public class GlaciteGeodePopulator extends FeaturesPopulator { - private static final double CHUNK_GEODE_PROBABILITY = 0.1; - - public GlaciteGeodePopulator() { - super("omc_dream", List.of("glacite/geode")); - } - - @Override - public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) { - if (random.nextDouble() >= CHUNK_GEODE_PROBABILITY) return; - - int x = (chunk.getX() << 4) + random.nextInt(16); - int z = (chunk.getZ() << 4) + random.nextInt(16); - int y = MIN_CAVE_HEIGHT + random.nextInt(MIN_HEIGHT_MUD - MIN_CAVE_HEIGHT); - - Location loc = new Location(world, x, y, z); - - StructureUtils.CachedStructure structure = getRandomFeatures(random); - placeFeatures(structure, loc, random.nextBoolean(), random.nextBoolean(), true); - } -} diff --git a/src/main/java/fr/openmc/core/features/dream/generation/populators/glacite/GroundSpikePopulator.java b/src/main/java/fr/openmc/core/features/dream/generation/populators/glacite/GroundSpikePopulator.java deleted file mode 100644 index 19c0aa2e6..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/populators/glacite/GroundSpikePopulator.java +++ /dev/null @@ -1,15 +0,0 @@ -package fr.openmc.core.features.dream.generation.populators.glacite; - -import java.util.List; - -public class GroundSpikePopulator extends CavePopulator { - public GroundSpikePopulator() { - super(0.8, 0.03, List.of( - "glacite/spike_normal_1", - "glacite/spike_normal_2", - "glacite/spike_normal_3", - "glacite/spike_normal_4" - )); - } -} - diff --git a/src/main/java/fr/openmc/core/features/dream/generation/populators/glacite/VerticalSpikePopulator.java b/src/main/java/fr/openmc/core/features/dream/generation/populators/glacite/VerticalSpikePopulator.java deleted file mode 100644 index 1535a6376..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/populators/glacite/VerticalSpikePopulator.java +++ /dev/null @@ -1,16 +0,0 @@ -package fr.openmc.core.features.dream.generation.populators.glacite; - -import java.util.List; - -public class VerticalSpikePopulator extends CavePopulator { - public VerticalSpikePopulator() { - super(0.4, 0.007, List.of( - "glacite/spike_vertical_1", - "glacite/spike_vertical_2", - "glacite/spike_vertical_3", - "glacite/spike_vertical_4", - "glacite/spike_vertical_5" - )); - } -} - diff --git a/src/main/java/fr/openmc/core/features/dream/generation/populators/mud/RockPopulator.java b/src/main/java/fr/openmc/core/features/dream/generation/populators/mud/RockPopulator.java deleted file mode 100644 index cd408611a..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/populators/mud/RockPopulator.java +++ /dev/null @@ -1,45 +0,0 @@ -package fr.openmc.core.features.dream.generation.populators.mud; - -import fr.openmc.core.features.dream.generation.DreamBiome; -import fr.openmc.core.utils.structure.FeaturesPopulator; -import fr.openmc.core.utils.structure.StructureUtils; -import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.World; -import org.jetbrains.annotations.NotNull; - -import java.util.List; -import java.util.Random; - - -public class RockPopulator extends FeaturesPopulator { - private static final double ROCK_PROBABILITY = 0.6; - - public RockPopulator() { - super("omc_dream", List.of( - "mud/rock_1", - "mud/rock_2", - "mud/rock_3", - "mud/rock_4", - "mud/rock_5", - "mud/rock_6", - "mud/rock_7" - )); - } - - @Override - public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) { - if (random.nextDouble() >= ROCK_PROBABILITY) return; - - int x = (chunk.getX() << 4) + random.nextInt(16); - int z = (chunk.getZ() << 4) + random.nextInt(16); - int y = world.getHighestBlockYAt(x, z); - - Location loc = new Location(world, x, y, z); - - if (!world.getBiome(loc).equals(DreamBiome.MUD_BEACH.getBiome())) return; - - StructureUtils.CachedStructure structure = getRandomFeatures(random); - placeFeatures(structure, loc, random.nextBoolean(), random.nextBoolean(), false); - } -} \ No newline at end of file diff --git a/src/main/java/fr/openmc/core/features/dream/generation/populators/plains/PlainsTreePopulator.java b/src/main/java/fr/openmc/core/features/dream/generation/populators/plains/PlainsTreePopulator.java deleted file mode 100644 index 4811d1944..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/populators/plains/PlainsTreePopulator.java +++ /dev/null @@ -1,43 +0,0 @@ -package fr.openmc.core.features.dream.generation.populators.plains; - -import fr.openmc.core.features.dream.generation.DreamBiome; -import fr.openmc.core.utils.structure.FeaturesPopulator; -import fr.openmc.core.utils.structure.StructureUtils; -import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.World; -import org.jetbrains.annotations.NotNull; - -import java.util.List; -import java.util.Random; - - -public class PlainsTreePopulator extends FeaturesPopulator { - private static final double TREE_PROBABILITY = 0.2; - - public PlainsTreePopulator() { - super("omc_dream", List.of( - "plains/tree_1", - "plains/tree_2", - "plains/tree_3", - "plains/tree_4", - "plains/tree_5" - )); - } - - @Override - public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) { - if (random.nextDouble() >= TREE_PROBABILITY) return; - - int x = (chunk.getX() << 4) + random.nextInt(16); - int z = (chunk.getZ() << 4) + random.nextInt(16); - int y = world.getHighestBlockYAt(x, z); - - Location loc = new Location(world, x, y, z); - - if (!world.getBiome(loc).equals(DreamBiome.SCULK_PLAINS.getBiome())) return; - - StructureUtils.CachedStructure structure = getRandomFeatures(random); - placeFeatures(structure, loc, false, false, false); - } -} \ No newline at end of file diff --git a/src/main/java/fr/openmc/core/features/dream/generation/populators/soulforest/PillarPopulator.java b/src/main/java/fr/openmc/core/features/dream/generation/populators/soulforest/PillarPopulator.java deleted file mode 100644 index 5c9ee96bd..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/populators/soulforest/PillarPopulator.java +++ /dev/null @@ -1,39 +0,0 @@ -package fr.openmc.core.features.dream.generation.populators.soulforest; - -import fr.openmc.core.features.dream.generation.DreamBiome; -import fr.openmc.core.utils.structure.FeaturesPopulator; -import fr.openmc.core.utils.structure.StructureUtils; -import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.World; -import org.jetbrains.annotations.NotNull; - -import java.util.List; -import java.util.Random; - - -public class PillarPopulator extends FeaturesPopulator { - private static final double PILLAR_PROBABILITY = 0.07; - - public PillarPopulator() { - super("omc_dream", List.of( - "soul_forest/pillar" - )); - } - - @Override - public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) { - if (random.nextDouble() >= PILLAR_PROBABILITY) return; - - int x = (chunk.getX() << 4) + random.nextInt(16); - int z = (chunk.getZ() << 4) + random.nextInt(16); - int y = world.getHighestBlockYAt(x, z); - - Location loc = new Location(world, x, y, z); - - if (!world.getBiome(loc).equals(DreamBiome.SOUL_FOREST.getBiome())) return; - - StructureUtils.CachedStructure structure = getRandomFeatures(random); - placeFeatures(structure, loc, false, false, false); - } -} \ No newline at end of file diff --git a/src/main/java/fr/openmc/core/features/dream/generation/populators/soulforest/SoulTreePopulator.java b/src/main/java/fr/openmc/core/features/dream/generation/populators/soulforest/SoulTreePopulator.java deleted file mode 100644 index 3a9d79f0c..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/populators/soulforest/SoulTreePopulator.java +++ /dev/null @@ -1,42 +0,0 @@ -package fr.openmc.core.features.dream.generation.populators.soulforest; - -import fr.openmc.core.features.dream.generation.DreamBiome; -import fr.openmc.core.utils.structure.FeaturesPopulator; -import fr.openmc.core.utils.structure.StructureUtils; -import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.World; -import org.jetbrains.annotations.NotNull; - -import java.util.List; -import java.util.Random; - - -public class SoulTreePopulator extends FeaturesPopulator { - private static final double TREE_PROBABILITY = 0.50; - - public SoulTreePopulator() { - super("omc_dream", List.of( - "soul_forest/tree_1", - "soul_forest/tree_2", - "soul_forest/tree_3", - "soul_forest/tree_4" - )); - } - - @Override - public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) { - if (random.nextDouble() >= TREE_PROBABILITY) return; - - int x = (chunk.getX() << 4) + random.nextInt(16); - int z = (chunk.getZ() << 4) + random.nextInt(16); - int y = world.getHighestBlockYAt(x, z); - - Location loc = new Location(world, x, y, z); - - if (!world.getBiome(loc).equals(DreamBiome.SOUL_FOREST.getBiome())) return; - - StructureUtils.CachedStructure structure = getRandomFeatures(random); - placeFeatures(structure, loc, false, false, false); - } -} \ No newline at end of file diff --git a/src/main/java/fr/openmc/core/features/dream/generation/structures/DreamStructure.java b/src/main/java/fr/openmc/core/features/dream/generation/structures/DreamStructure.java deleted file mode 100644 index 7895ee59d..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/structures/DreamStructure.java +++ /dev/null @@ -1,103 +0,0 @@ -package fr.openmc.core.features.dream.generation.structures; - -import com.sk89q.worldedit.math.BlockVector3; -import fr.openmc.core.features.dream.DreamUtils; -import lombok.Getter; -import org.bukkit.Location; -import org.bukkit.configuration.serialization.ConfigurationSerializable; -import org.bukkit.configuration.serialization.SerializableAs; -import org.jetbrains.annotations.NotNull; - -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; - -@SerializableAs("DreamStructure") -public record DreamStructure(DreamType type, BlockVector3 min, BlockVector3 max) implements ConfigurationSerializable { - - public DreamStructure(Map map) { - this( - DreamType.fromId((String) map.get("type")), - BlockVector3.at( - (int) map.get("min_x"), - (int) map.get("min_y"), - (int) map.get("min_z") - ), - BlockVector3.at( - (int) map.get("max_x"), - (int) map.get("max_y"), - (int) map.get("max_z") - ) - ); - } - - @Override - public @NotNull Map serialize() { - Map map = new HashMap<>(); - - map.put("type", type.getId()); - - map.put("min_x", min.x()); - map.put("min_y", min.y()); - map.put("min_z", min.z()); - - map.put("max_x", max.x()); - map.put("max_y", max.y()); - map.put("max_z", max.z()); - - return map; - } - - public boolean isInside(Location loc) { - if (!DreamUtils.isDreamWorld(loc)) return false; - - double x = loc.getX(); - double y = loc.getY(); - double z = loc.getZ(); - - double minX = Math.min(min.x(), max.x()); - double maxX = Math.max(min.x(), max.x()); - double minY = Math.min(min.y(), max.y()); - double maxY = Math.max(min.y(), max.y()); - double minZ = Math.min(min.z(), max.z()); - double maxZ = Math.max(min.z(), max.z()); - - return x >= minX && x <= maxX - && y >= minY && y <= maxY - && z >= minZ && z <= maxZ; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof DreamStructure that)) return false; - return min.equals(that.min) && max.equals(that.max); - } - - @Override - public int hashCode() { - return Objects.hash(min, max); - } - - @Getter - public enum DreamType { - BASE_CAMP("base_camp", "§bCamp de Grotte"), - SOUL_ALTAR("soul_altar", "§5Temple du Cube"), - CLOUD_CASTLE("cloud_castle", "§7Château des Nuages"); - - private final String id; - private final String name; - - DreamType(String id, String name) { - this.id = id; - this.name = name; - } - - public static DreamType fromId(String id) { - for (DreamType type : values()) { - if (type.id.equalsIgnoreCase(id)) return type; - } - return null; - } - } -} \ No newline at end of file diff --git a/src/main/java/fr/openmc/core/features/dream/generation/structures/DreamStructurePopulator.java b/src/main/java/fr/openmc/core/features/dream/generation/structures/DreamStructurePopulator.java deleted file mode 100644 index f23d4e54e..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/structures/DreamStructurePopulator.java +++ /dev/null @@ -1,74 +0,0 @@ -package fr.openmc.core.features.dream.generation.structures; - -import com.sk89q.worldedit.bukkit.BukkitAdapter; -import com.sk89q.worldedit.extent.clipboard.Clipboard; -import com.sk89q.worldedit.math.BlockVector3; -import com.sk89q.worldedit.math.Vector3; -import com.sk89q.worldedit.regions.Region; -import com.sk89q.worldedit.session.ClipboardHolder; -import fr.openmc.core.OMCPlugin; -import fr.openmc.core.utils.structure.SchematicsUtils; -import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.generator.BlockPopulator; -import org.jetbrains.annotations.NotNull; - -import java.util.List; -import java.util.Map; -import java.util.Random; - -public abstract class DreamStructurePopulator extends BlockPopulator { - - protected final String structureGroup; - protected final List schematics; - - public DreamStructurePopulator(String structureGroup, List schematics) { - this.structureGroup = structureGroup; - this.schematics = schematics; - - Map> toPreload = Map.of(structureGroup, schematics); - SchematicsUtils.preloadSchematics(toPreload); - } - - @Override - public abstract void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk); - - protected SchematicsUtils.CachedSchematic getRandomSchematic(Random random) { - if (schematics.isEmpty()) return null; - String name = schematics.get(random.nextInt(schematics.size())); - return SchematicsUtils.getCachedSchematic(structureGroup, name); - } - - protected void placeAndRegisterSchematic(SchematicsUtils.CachedSchematic schematic, Location origin, DreamStructure.DreamType type, boolean checkFloating) { - if (schematic == null) return; - - World world = origin.getWorld(); - Clipboard clipboard = schematic.clipboard(); - ClipboardHolder holder = new ClipboardHolder(clipboard); - - boolean success = SchematicsUtils.pasteSchem(world, schematic, origin, checkFloating); - if (!success) return; - - Region region = clipboard.getRegion(); - BlockVector3 clipboardOffset = region.getMinimumPoint().subtract(clipboard.getOrigin()); - - Vector3 to = BukkitAdapter.asBlockVector(origin).toVector3(); - Vector3 realMin = to.add(holder.getTransform().apply(clipboardOffset.toVector3())); - Vector3 realMax = realMin.add(holder.getTransform().apply(region.getMaximumPoint().subtract(region.getMinimumPoint()).toVector3())); - - BlockVector3 min = BlockVector3.at( - Math.min(realMin.x(), realMax.x()), - Math.min(realMin.y(), realMax.y()), - Math.min(realMin.z(), realMax.z()) - ); - BlockVector3 max = BlockVector3.at( - Math.max(realMin.x(), realMax.x()), - Math.max(realMin.y(), realMax.y()), - Math.max(realMin.z(), realMax.z()) - ); - DreamStructuresManager.addStructure(type, min, max); - - OMCPlugin.getInstance().getSLF4JLogger().info("Structure '{}' placée entre {}, {}, {} et {}, {}, {}", type.getId(), min.x(), min.y(), min.z(), max.x(), max.y(), max.z()); - } -} diff --git a/src/main/java/fr/openmc/core/features/dream/generation/structures/DreamStructuresManager.java b/src/main/java/fr/openmc/core/features/dream/generation/structures/DreamStructuresManager.java deleted file mode 100644 index 3a2433938..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/structures/DreamStructuresManager.java +++ /dev/null @@ -1,96 +0,0 @@ -package fr.openmc.core.features.dream.generation.structures; - -import com.sk89q.worldedit.math.BlockVector3; -import fr.openmc.core.OMCPlugin; -import fr.openmc.core.features.dream.generation.DreamDimensionManager; -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.configuration.serialization.ConfigurationSerialization; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -public class DreamStructuresManager { - - private static File file; - private static FileConfiguration config; - - private static final List structures = new ArrayList<>(); - - public static void init() { - ConfigurationSerialization.registerClass(DreamStructure.class); - file = new File(OMCPlugin.getInstance().getDataFolder() + "/data/dream", "structures.yml"); - load(); - } - - public static void load() { - if (!file.exists()) { - OMCPlugin.getInstance().getSLF4JLogger().info("[DreamStructures] Fichier manquant, il sera créé au save()."); - } - - config = YamlConfiguration.loadConfiguration(file); - - World dream = Bukkit.getWorld(DreamDimensionManager.DIMENSION_NAME); - if (dream == null) { - OMCPlugin.getInstance().getSLF4JLogger().warn("[DreamStructures] Le monde world_dream est introuvable !"); - return; - } - - structures.clear(); - if (DreamDimensionManager.hasSeedChanged()) { - config.set("structures", new ArrayList<>()); - save(); - OMCPlugin.getInstance().getSLF4JLogger().info("[DreamStructures] Seed changée, reset du fichier structures.yml !"); - return; - } - - if (config.contains("structures")) { - for (Object obj : config.getList("structures")) { - if (obj instanceof DreamStructure ds) { - structures.add(ds); - } - } - } - - OMCPlugin.getInstance().getSLF4JLogger().info("[DreamStructures] Chargé {} structures.", structures.size()); - } - - public static void save() { - config.set("structures", structures); - - try { - config.save(file); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - public static void addStructure(DreamStructure.DreamType type, BlockVector3 min, BlockVector3 max) { - DreamStructure entry = new DreamStructure(type, min, max); - if (!structures.contains(entry)) { - structures.add(entry); - save(); - } - } - - public static DreamStructure getStructureAt(Location loc) { - for (DreamStructure s : structures) { - if (s.isInside(loc)) return s; - } - - return null; - } - - public static boolean isInsideStructure(Location loc, DreamStructure.DreamType type) { - DreamStructure structure = getStructureAt(loc); - - if (structure == null) return false; - - return structure.type().equals(type); - } -} diff --git a/src/main/java/fr/openmc/core/features/dream/generation/structures/cloud/CloudCastleStructure.java b/src/main/java/fr/openmc/core/features/dream/generation/structures/cloud/CloudCastleStructure.java deleted file mode 100644 index bfa973a71..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/structures/cloud/CloudCastleStructure.java +++ /dev/null @@ -1,40 +0,0 @@ -package fr.openmc.core.features.dream.generation.structures.cloud; - -import fr.openmc.core.features.dream.DreamUtils; -import fr.openmc.core.features.dream.generation.biomes.CloudChunkGenerator; -import fr.openmc.core.features.dream.generation.structures.DreamStructure; -import fr.openmc.core.features.dream.generation.structures.DreamStructurePopulator; -import fr.openmc.core.utils.structure.SchematicsUtils; -import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.World; -import org.jetbrains.annotations.NotNull; - -import java.util.List; -import java.util.Random; - -public class CloudCastleStructure extends DreamStructurePopulator { - - private static final double CLOUD_CASTLE_PROBABILITY = 0.0007; - public static final String STRUCTURE_NAME = "cloud_castle"; - - public CloudCastleStructure() { - super("dream_structures", List.of(STRUCTURE_NAME)); - } - - @Override - public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) { - if (!DreamUtils.isDreamWorld(world)) return; - if (random.nextDouble() >= CLOUD_CASTLE_PROBABILITY) return; - - int x = (chunk.getX() << 4) + random.nextInt(16); - int z = (chunk.getZ() << 4) + random.nextInt(16); - int y = CloudChunkGenerator.MAX_HEIGHT_CLOUD; - - Location origin = new Location(world, x, y, z); - - SchematicsUtils.CachedSchematic schematic = getRandomSchematic(random); - - placeAndRegisterSchematic(schematic, origin, DreamStructure.DreamType.fromId(STRUCTURE_NAME), false); - } -} \ No newline at end of file diff --git a/src/main/java/fr/openmc/core/features/dream/generation/structures/glacite/BaseCampStructure.java b/src/main/java/fr/openmc/core/features/dream/generation/structures/glacite/BaseCampStructure.java deleted file mode 100644 index 6d8eff4ca..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/structures/glacite/BaseCampStructure.java +++ /dev/null @@ -1,40 +0,0 @@ -package fr.openmc.core.features.dream.generation.structures.glacite; - -import fr.openmc.core.features.dream.DreamUtils; -import fr.openmc.core.features.dream.generation.biomes.GlaciteCaveChunkGenerator; -import fr.openmc.core.features.dream.generation.structures.DreamStructure; -import fr.openmc.core.features.dream.generation.structures.DreamStructurePopulator; -import fr.openmc.core.utils.structure.SchematicsUtils; -import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.World; -import org.jetbrains.annotations.NotNull; - -import java.util.List; -import java.util.Random; - -public class BaseCampStructure extends DreamStructurePopulator { - - private static final double BASE_CAMP_PROBABILITY = 0.001; - public static final String STRUCTURE_NAME = "base_camp"; - - public BaseCampStructure() { - super("dream_structures", List.of(STRUCTURE_NAME)); - } - - @Override - public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) { - if (!DreamUtils.isDreamWorld(world)) return; - if (random.nextDouble() >= BASE_CAMP_PROBABILITY) return; - - int x = (chunk.getX() << 4) + random.nextInt(16); - int z = (chunk.getZ() << 4) + random.nextInt(16); - int y = GlaciteCaveChunkGenerator.MIN_CAVE_HEIGHT + 1; - - Location loc = new Location(world, x, y, z); - - SchematicsUtils.CachedSchematic schematic = getRandomSchematic(random); - - placeAndRegisterSchematic(schematic, loc, DreamStructure.DreamType.fromId(STRUCTURE_NAME), false); - } -} \ No newline at end of file diff --git a/src/main/java/fr/openmc/core/features/dream/generation/structures/soulforest/SoulAltarStructure.java b/src/main/java/fr/openmc/core/features/dream/generation/structures/soulforest/SoulAltarStructure.java deleted file mode 100644 index e758889a5..000000000 --- a/src/main/java/fr/openmc/core/features/dream/generation/structures/soulforest/SoulAltarStructure.java +++ /dev/null @@ -1,42 +0,0 @@ -package fr.openmc.core.features.dream.generation.structures.soulforest; - -import fr.openmc.core.features.dream.DreamUtils; -import fr.openmc.core.features.dream.generation.DreamBiome; -import fr.openmc.core.features.dream.generation.structures.DreamStructure; -import fr.openmc.core.features.dream.generation.structures.DreamStructurePopulator; -import fr.openmc.core.utils.structure.SchematicsUtils; -import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.World; -import org.jetbrains.annotations.NotNull; - -import java.util.List; -import java.util.Random; - -public class SoulAltarStructure extends DreamStructurePopulator { - - private static final double BASE_CAMP_PROBABILITY = 0.005; - public static final String STRUCTURE_NAME = "soul_altar"; - - public SoulAltarStructure() { - super("dream_structures", List.of(STRUCTURE_NAME)); - } - - @Override - public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) { - if (!DreamUtils.isDreamWorld(world)) return; - if (random.nextDouble() >= BASE_CAMP_PROBABILITY) return; - - int x = (chunk.getX() << 4) + random.nextInt(16); - int z = (chunk.getZ() << 4) + random.nextInt(16); - int y = world.getHighestBlockYAt(x, z); - - Location loc = new Location(world, x, y, z); - - if (!world.getBiome(loc).equals(DreamBiome.SOUL_FOREST.getBiome())) return; - - SchematicsUtils.CachedSchematic schematic = getRandomSchematic(random); - - placeAndRegisterSchematic(schematic, loc, DreamStructure.DreamType.fromId(STRUCTURE_NAME), true); - } -} \ No newline at end of file diff --git a/src/main/java/fr/openmc/core/features/dream/listeners/biomes/PlayerEnteredBiome.java b/src/main/java/fr/openmc/core/features/dream/listeners/biomes/PlayerEnteredBiome.java index 6f35dacdf..7e5f5327c 100644 --- a/src/main/java/fr/openmc/core/features/dream/listeners/biomes/PlayerEnteredBiome.java +++ b/src/main/java/fr/openmc/core/features/dream/listeners/biomes/PlayerEnteredBiome.java @@ -3,8 +3,8 @@ import fr.openmc.core.OMCPlugin; import fr.openmc.core.features.dream.DreamManager; import fr.openmc.core.features.dream.DreamUtils; -import fr.openmc.core.features.dream.generation.DreamBiome; import fr.openmc.core.features.dream.models.db.DBDreamPlayer; +import fr.openmc.core.features.dream.models.registry.DreamBiome; import fr.openmc.core.utils.ParticleUtils; import fr.openmc.core.utils.messages.MessageType; import fr.openmc.core.utils.messages.MessagesManager; diff --git a/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerSleepListener.java b/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerSleepListener.java index c3a2a52c0..744175869 100644 --- a/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerSleepListener.java +++ b/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerSleepListener.java @@ -8,62 +8,56 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerBedEnterEvent; +import org.bukkit.event.player.PlayerBedLeaveEvent; import org.bukkit.event.world.TimeSkipEvent; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.scheduler.BukkitRunnable; +import org.bukkit.scheduler.BukkitScheduler; import java.util.HashSet; import java.util.Random; import java.util.Set; import java.util.UUID; +import java.util.concurrent.ThreadLocalRandom; public class PlayerSleepListener implements Listener { - private final Set playersDreaming = new HashSet<>(); + private final Set isPlayerSleeping = new HashSet<>(); @EventHandler - public void onPlayerSleep(PlayerBedEnterEvent event) { + public void onPlayerEnterBed(PlayerBedEnterEvent event) { Player player = event.getPlayer(); if (!event.getBedEnterResult().equals(PlayerBedEnterEvent.BedEnterResult.OK)) return; - if (playersDreaming.contains(player.getUniqueId())) return; - - Random random = new Random(); - double randomValue = random.nextDouble(); - - if (randomValue < DreamManager.calculateDreamProbability(player)) return; - - player.addPotionEffect(new PotionEffect( - PotionEffectType.NAUSEA, - 20 * 10, - 1, - false, - false, - false - )); - playersDreaming.add(player.getUniqueId()); - + if (isPlayerSleeping.contains(player)) return; + isPlayerSleeping.add(player); + } + @EventHandler + public void onPlayerLeaveBed(PlayerBedLeaveEvent event) { + isPlayerSleeping.remove(event.getPlayer()); } @EventHandler public void onNightSkip(TimeSkipEvent event) { - for (UUID uuid : playersDreaming) { - Player player = Bukkit.getPlayer(uuid); - if (player == null) continue; - DBDreamPlayer dbDreamPlayer = DreamManager.getCacheDreamPlayer(player); - new BukkitRunnable() { - @Override - public void run() { + if (event.getSkipReason() == TimeSkipEvent.SkipReason.NIGHT_SKIP) { + if (isPlayerSleeping.isEmpty()) { + return; + } + for (Player player : isPlayerSleeping) { + if (ThreadLocalRandom.current().nextDouble() < DreamManager.calculateDreamProbability(player)) { + Random r = new Random(); + DBDreamPlayer dbDreamPlayer = DreamManager.getCacheDreamPlayer(player); if (dbDreamPlayer == null || (dbDreamPlayer.getDreamX() == null || dbDreamPlayer.getDreamY() == null || dbDreamPlayer.getDreamZ() == null)) { DreamManager.tpPlayerDream(player); } else { DreamManager.tpPlayerToLastDreamLocation(player); } } - }.runTaskLater(OMCPlugin.getInstance(), 20L * 5); + } + + isPlayerSleeping.clear(); } - playersDreaming.clear(); } } diff --git a/src/main/java/fr/openmc/core/features/dream/listeners/orb/PlayerObtainOrb.java b/src/main/java/fr/openmc/core/features/dream/listeners/orb/PlayerObtainOrb.java index 74d3980c4..69ab18c20 100644 --- a/src/main/java/fr/openmc/core/features/dream/listeners/orb/PlayerObtainOrb.java +++ b/src/main/java/fr/openmc/core/features/dream/listeners/orb/PlayerObtainOrb.java @@ -5,11 +5,11 @@ import fr.openmc.core.features.dream.DreamUtils; import fr.openmc.core.features.dream.events.GlaciteTradeEvent; import fr.openmc.core.features.dream.events.MetalDetectorLootEvent; -import fr.openmc.core.features.dream.generation.DreamBiome; import fr.openmc.core.features.dream.mecanism.altar.AltarCraftingEvent; import fr.openmc.core.features.dream.mecanism.tradernpc.GlaciteTrade; import fr.openmc.core.features.dream.models.db.DBDreamPlayer; import fr.openmc.core.features.dream.models.db.DreamPlayer; +import fr.openmc.core.features.dream.models.registry.DreamBiome; import fr.openmc.core.features.dream.models.registry.items.DreamItem; import fr.openmc.core.features.dream.registries.DreamItemRegistry; import fr.openmc.core.utils.messages.MessageType; diff --git a/src/main/java/fr/openmc/core/features/dream/mecanism/cloudcastle/BossCloudSpawner.java b/src/main/java/fr/openmc/core/features/dream/mecanism/cloudcastle/BossCloudSpawner.java index ae19ed03a..a093c0392 100644 --- a/src/main/java/fr/openmc/core/features/dream/mecanism/cloudcastle/BossCloudSpawner.java +++ b/src/main/java/fr/openmc/core/features/dream/mecanism/cloudcastle/BossCloudSpawner.java @@ -30,7 +30,7 @@ public static void replaceBlockWithBossCloudSpawner(Block block) { normal.setSpawnedEntity(new Breezy().createSnapshot()); - NamespacedKey lootKey = new NamespacedKey("openmc", "cloud_castle/boss_spawner"); + NamespacedKey lootKey = new NamespacedKey("omc_dream", "cloud_castle/boss_spawner"); LootTable lootTable = Bukkit.getLootTable(lootKey); if (lootTable != null) { diff --git a/src/main/java/fr/openmc/core/features/dream/mecanism/cloudcastle/PhantomCloudSpawner.java b/src/main/java/fr/openmc/core/features/dream/mecanism/cloudcastle/PhantomCloudSpawner.java index 19f5e617d..e95a1ebeb 100644 --- a/src/main/java/fr/openmc/core/features/dream/mecanism/cloudcastle/PhantomCloudSpawner.java +++ b/src/main/java/fr/openmc/core/features/dream/mecanism/cloudcastle/PhantomCloudSpawner.java @@ -22,7 +22,7 @@ public static void replaceBlockWithMobCloudSpawner(Block block) { normal.setSpawnedEntity(new DreamPhantom().createSnapshot(block.getLocation())); - NamespacedKey lootKey = new NamespacedKey("openmc", "cloud_castle/mob_spawner"); + NamespacedKey lootKey = new NamespacedKey("omc_dream", "cloud_castle/mob_spawner"); LootTable lootTable = Bukkit.getLootTable(lootKey); if (lootTable != null) { diff --git a/src/main/java/fr/openmc/core/features/dream/mecanism/cloudcastle/StrayCloudSpawner.java b/src/main/java/fr/openmc/core/features/dream/mecanism/cloudcastle/StrayCloudSpawner.java index c9e343b56..463cbd2f1 100644 --- a/src/main/java/fr/openmc/core/features/dream/mecanism/cloudcastle/StrayCloudSpawner.java +++ b/src/main/java/fr/openmc/core/features/dream/mecanism/cloudcastle/StrayCloudSpawner.java @@ -21,7 +21,7 @@ public static void replaceBlockWithMobCloudSpawner(Block block) { normal.setSpawnedEntity(new DreamStray().createSnapshot()); - NamespacedKey lootKey = new NamespacedKey("openmc", "cloud_castle/mob_spawner"); + NamespacedKey lootKey = new NamespacedKey("omc_dream", "cloud_castle/mob_spawner"); LootTable lootTable = Bukkit.getLootTable(lootKey); if (lootTable != null) { diff --git a/src/main/java/fr/openmc/core/features/dream/mecanism/cloudfishing/CloudFishingManager.java b/src/main/java/fr/openmc/core/features/dream/mecanism/cloudfishing/CloudFishingManager.java index f0be271ba..efa0554aa 100644 --- a/src/main/java/fr/openmc/core/features/dream/mecanism/cloudfishing/CloudFishingManager.java +++ b/src/main/java/fr/openmc/core/features/dream/mecanism/cloudfishing/CloudFishingManager.java @@ -1,13 +1,10 @@ package fr.openmc.core.features.dream.mecanism.cloudfishing; import fr.openmc.core.OMCPlugin; -import fr.openmc.core.features.dream.generation.biomes.CloudChunkGenerator; import fr.openmc.core.registry.loottable.CustomLootTable; import fr.openmc.core.registry.loottable.CustomLootTableRegistry; import fr.openmc.core.utils.ParticleUtils; import lombok.Getter; -import net.kyori.adventure.key.Key; -import net.minecraft.network.chat.ClickEvent; import org.bukkit.Location; import org.bukkit.Particle; import org.bukkit.Sound; @@ -25,7 +22,7 @@ public class CloudFishingManager { @Getter private static final HashMap hookedPlayers = new HashMap<>(); - public static final double Y_CLOUD_FISHING = CloudChunkGenerator.MIN_HEIGHT_CLOUD - 5; + public static final double Y_CLOUD_FISHING = 120 - 5; public static final CustomLootTable FISHING_LOOT_TABLE = CustomLootTableRegistry.getByName("omc_dream:cloud_fishing"); public static void init() { diff --git a/src/main/java/fr/openmc/core/features/dream/mecanism/cold/ColdListener.java b/src/main/java/fr/openmc/core/features/dream/mecanism/cold/ColdListener.java index 1bf527bbc..62fb1eb74 100644 --- a/src/main/java/fr/openmc/core/features/dream/mecanism/cold/ColdListener.java +++ b/src/main/java/fr/openmc/core/features/dream/mecanism/cold/ColdListener.java @@ -2,9 +2,9 @@ import fr.openmc.core.features.dream.DreamManager; import fr.openmc.core.features.dream.DreamUtils; -import fr.openmc.core.features.dream.generation.DreamBiome; import fr.openmc.core.features.dream.models.db.DreamPlayer; -import org.bukkit.Location; +import fr.openmc.core.features.dream.models.registry.DreamBiome; +import fr.openmc.core.features.dream.registries.DreamBiomesRegistry; import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -17,9 +17,8 @@ public class ColdListener implements Listener { @EventHandler(ignoreCancelled = true) public void onGlaciteGrottoEntered(PlayerMoveEvent event) { Player player = event.getPlayer(); - Location loc = player.getLocation(); - if (loc.getBlock().getBiome().equals(DreamBiome.GLACITE_GROTTO.getBiome())) { + if (DreamBiomesRegistry.isInDreamBiome(player, DreamBiome.GLACITE_GROTTO)) { DreamPlayer dreamPlayer = DreamManager.getDreamPlayer(player); if (dreamPlayer == null) return; diff --git a/src/main/java/fr/openmc/core/features/dream/mecanism/metaldetector/MetalDetectorListener.java b/src/main/java/fr/openmc/core/features/dream/mecanism/metaldetector/MetalDetectorListener.java index ee322b4d2..4369187d6 100644 --- a/src/main/java/fr/openmc/core/features/dream/mecanism/metaldetector/MetalDetectorListener.java +++ b/src/main/java/fr/openmc/core/features/dream/mecanism/metaldetector/MetalDetectorListener.java @@ -3,7 +3,8 @@ import fr.openmc.core.OMCPlugin; import fr.openmc.core.features.dream.DreamUtils; import fr.openmc.core.features.dream.events.MetalDetectorLootEvent; -import fr.openmc.core.features.dream.generation.DreamBiome; +import fr.openmc.core.features.dream.models.registry.DreamBiome; +import fr.openmc.core.features.dream.registries.DreamBiomesRegistry; import fr.openmc.core.registry.loottable.CustomLootTable; import fr.openmc.core.utils.LocationUtils; import fr.openmc.core.utils.messages.MessageType; @@ -36,11 +37,10 @@ public class MetalDetectorListener implements Listener { @EventHandler public void onMove(PlayerMoveEvent event) { Player player = event.getPlayer(); - Location loc = player.getLocation(); - if (loc.getBlock().getBiome().equals(DreamBiome.MUD_BEACH.getBiome())) { + if (DreamBiomesRegistry.isInDreamBiome(player, DreamBiome.MUD_BEACH)) { if (!hiddenChests.containsKey(player.getUniqueId())) { - Location chestLoc = findRandomChestLocation(loc); + Location chestLoc = findRandomChestLocation(player.getLocation()); MetalDetectorTask task = new MetalDetectorTask(player, chestLoc); task.runTaskTimer(OMCPlugin.getInstance(), 0L, 5L); hiddenChests.put(player.getUniqueId(), task); @@ -121,7 +121,7 @@ public static Location findRandomChestLocation(Location origin) { int y = world.getHighestBlockYAt(tryLoc); tryLoc.setY(y); - if (world.getBiome(tryLoc).equals(DreamBiome.MUD_BEACH.getBiome())) { + if (DreamBiomesRegistry.isDreamBiome(tryLoc, DreamBiome.MUD_BEACH)) { return tryLoc; } } diff --git a/src/main/java/fr/openmc/core/features/dream/mecanism/tradernpc/GlaciteNpcManager.java b/src/main/java/fr/openmc/core/features/dream/mecanism/tradernpc/GlaciteNpcManager.java index a7be28927..29fe9f95c 100644 --- a/src/main/java/fr/openmc/core/features/dream/mecanism/tradernpc/GlaciteNpcManager.java +++ b/src/main/java/fr/openmc/core/features/dream/mecanism/tradernpc/GlaciteNpcManager.java @@ -5,7 +5,7 @@ import de.oliver.fancynpcs.api.NpcData; import fr.openmc.api.hooks.FancyNpcsHook; import fr.openmc.core.OMCPlugin; -import fr.openmc.core.features.dream.generation.DreamDimensionManager; +import fr.openmc.core.features.dream.dimension.DreamDimensionManager; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.EntityType; diff --git a/src/main/java/fr/openmc/core/features/dream/models/db/DreamPlayer.java b/src/main/java/fr/openmc/core/features/dream/models/db/DreamPlayer.java index 530c48d22..cb0c96708 100644 --- a/src/main/java/fr/openmc/core/features/dream/models/db/DreamPlayer.java +++ b/src/main/java/fr/openmc/core/features/dream/models/db/DreamPlayer.java @@ -8,10 +8,11 @@ import fr.openmc.core.features.dream.DreamManager; import fr.openmc.core.features.dream.displays.DreamBossBar; import fr.openmc.core.features.dream.events.DreamEndEvent; -import fr.openmc.core.features.dream.generation.DreamBiome; -import fr.openmc.core.features.dream.generation.structures.DreamStructure; -import fr.openmc.core.features.dream.generation.structures.DreamStructuresManager; import fr.openmc.core.features.dream.mecanism.cold.ColdManager; +import fr.openmc.core.features.dream.models.registry.DreamBiome; +import fr.openmc.core.features.dream.models.registry.DreamStructure; +import fr.openmc.core.features.dream.registries.DreamBiomesRegistry; +import fr.openmc.core.features.dream.registries.DreamStructuresRegistry; import fr.openmc.core.utils.messages.MessageType; import fr.openmc.core.utils.messages.MessagesManager; import fr.openmc.core.utils.messages.Prefix; @@ -119,9 +120,9 @@ public void scheduleColdTask() { this.coldTask = Bukkit.getScheduler().runTaskTimer(OMCPlugin.getInstance(), () -> { tickCounter[0] += 20; boolean nearHeat = ColdManager.isNearHeatSource(player); - boolean isInBaseCamp = DreamStructuresManager.isInsideStructure(player.getLocation(), DreamStructure.DreamType.BASE_CAMP); + boolean isInBaseCamp = DreamStructuresRegistry.isInDreamStructure(player, DreamStructure.BASE_CAMP); double resistance = ColdManager.calculateColdResistance(player); - boolean inColdBiome = player.getLocation().getBlock().getBiome().equals(DreamBiome.GLACITE_GROTTO.getBiome()); + boolean inColdBiome = DreamBiomesRegistry.isInDreamBiome(player, DreamBiome.GLACITE_GROTTO); if (isInBaseCamp) { cold = Math.max(0, cold - 15); diff --git a/src/main/java/fr/openmc/core/features/dream/generation/DreamBiome.java b/src/main/java/fr/openmc/core/features/dream/models/registry/DreamBiome.java similarity index 75% rename from src/main/java/fr/openmc/core/features/dream/generation/DreamBiome.java rename to src/main/java/fr/openmc/core/features/dream/models/registry/DreamBiome.java index 0610563ea..001a06e4d 100644 --- a/src/main/java/fr/openmc/core/features/dream/generation/DreamBiome.java +++ b/src/main/java/fr/openmc/core/features/dream/models/registry/DreamBiome.java @@ -1,4 +1,4 @@ -package fr.openmc.core.features.dream.generation; +package fr.openmc.core.features.dream.models.registry; import io.papermc.paper.registry.RegistryAccess; import io.papermc.paper.registry.RegistryKey; @@ -7,6 +7,7 @@ import org.bukkit.NamespacedKey; import org.bukkit.Registry; import org.bukkit.block.Biome; +import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import static fr.openmc.core.utils.messages.MessagesManager.textToSmall; @@ -16,23 +17,23 @@ public enum DreamBiome { SCULK_PLAINS( Component.text(textToSmall("§3Plaine de Sculk")), - NamespacedKey.fromString("openmc:sculk_plains") + NamespacedKey.fromString("omc_dream:sculk_plains") ), SOUL_FOREST( Component.text(textToSmall("§5Forêt des Âmes")), - NamespacedKey.fromString("openmc:soul_forest") + NamespacedKey.fromString("omc_dream:soul_forest") ), MUD_BEACH( Component.text(textToSmall("§8Plage de boue")), - NamespacedKey.fromString("openmc:mud_beach") + NamespacedKey.fromString("omc_dream:mud_beach") ), CLOUD_LAND( Component.text(textToSmall("§fVallée des Nuages")), - NamespacedKey.fromString("openmc:cloud_land") + NamespacedKey.fromString("omc_dream:cloud_land") ), GLACITE_GROTTO( Component.text(textToSmall("§bGrotte glacée")), - NamespacedKey.fromString("openmc:glacite_grotto") + NamespacedKey.fromString("omc_dream:glacite_grotto") ); private final Registry<@NotNull Biome> registry = RegistryAccess.registryAccess().getRegistry(RegistryKey.BIOME); diff --git a/src/main/java/fr/openmc/core/features/dream/models/registry/DreamStructure.java b/src/main/java/fr/openmc/core/features/dream/models/registry/DreamStructure.java new file mode 100644 index 000000000..3bb2635ad --- /dev/null +++ b/src/main/java/fr/openmc/core/features/dream/models/registry/DreamStructure.java @@ -0,0 +1,40 @@ +package fr.openmc.core.features.dream.models.registry; + +import io.papermc.paper.registry.RegistryAccess; +import io.papermc.paper.registry.RegistryKey; +import lombok.Getter; +import net.kyori.adventure.text.Component; +import org.bukkit.NamespacedKey; +import org.bukkit.Registry; +import org.bukkit.entity.Player; +import org.bukkit.generator.structure.Structure; +import org.jetbrains.annotations.NotNull; + +@Getter +public enum DreamStructure { + + BASE_CAMP( + Component.text("§bCamp de Grotte"), + NamespacedKey.fromString("omc_dream:glacite_grotto/base_camp") + ), + CUBE_TEMPLE( + Component.text("§5Temple du Cube"), + NamespacedKey.fromString("omc_dream:soul_forest/cube_temple") + ), + CLOUD_CASTLE( + Component.text("§7Château des Nuages"), + NamespacedKey.fromString("omc_dream:cloud_land/cloud_castle") + ) + ; + + private final Registry<@NotNull Structure> registry = RegistryAccess.registryAccess().getRegistry(RegistryKey.STRUCTURE); + private final Component name; + private final NamespacedKey structureKey; + private final Structure structure; + + DreamStructure(Component name, NamespacedKey structureKey) { + this.name = name; + this.structureKey = structureKey; + this.structure = registry.get(structureKey); + } +} diff --git a/src/main/java/fr/openmc/core/features/dream/registries/DreamBiomesRegistry.java b/src/main/java/fr/openmc/core/features/dream/registries/DreamBiomesRegistry.java new file mode 100644 index 000000000..365df05bd --- /dev/null +++ b/src/main/java/fr/openmc/core/features/dream/registries/DreamBiomesRegistry.java @@ -0,0 +1,26 @@ +package fr.openmc.core.features.dream.registries; + +import fr.openmc.core.features.dream.models.registry.DreamBiome; +import fr.openmc.core.features.dream.models.registry.DreamStructure; +import org.bukkit.Location; +import org.bukkit.entity.Player; + +public class DreamBiomesRegistry { + public static boolean isDreamBiome(Location loc, DreamBiome dreamBiome) { + return loc.getBlock().getBiome().equals(dreamBiome.getBiome()); + } + + public static boolean isInDreamBiome(Player player, DreamBiome dreamBiome) { + return player.getLocation().getBlock().getBiome() == dreamBiome.getBiome(); + } + + public static DreamBiome getDreamBiome(Player player) { + for (DreamBiome dreamBiome : DreamBiome.values()) { + if (!dreamBiome.getBiome().equals(player.getLocation().getBlock().getBiome())) continue; + + return dreamBiome; + } + + return DreamBiome.SCULK_PLAINS; + } +} diff --git a/src/main/java/fr/openmc/core/features/dream/registries/DreamBlocksRegistry.java b/src/main/java/fr/openmc/core/features/dream/registries/DreamBlocksRegistry.java index 84b858ca8..15e760606 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/DreamBlocksRegistry.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/DreamBlocksRegistry.java @@ -1,7 +1,7 @@ package fr.openmc.core.features.dream.registries; import fr.openmc.core.OMCPlugin; -import fr.openmc.core.features.dream.generation.DreamDimensionManager; +import fr.openmc.core.features.dream.dimension.DreamDimensionManager; import fr.openmc.core.features.dream.listeners.registry.DreamBlocksListeners; import fr.openmc.core.features.dream.mecanism.altar.AltarManager; import fr.openmc.core.features.dream.mecanism.cloudcastle.BossCloudSpawner; diff --git a/src/main/java/fr/openmc/core/features/dream/registries/DreamStructuresRegistry.java b/src/main/java/fr/openmc/core/features/dream/registries/DreamStructuresRegistry.java new file mode 100644 index 000000000..34dcff10f --- /dev/null +++ b/src/main/java/fr/openmc/core/features/dream/registries/DreamStructuresRegistry.java @@ -0,0 +1,20 @@ +package fr.openmc.core.features.dream.registries; + +import fr.openmc.core.features.dream.models.registry.DreamStructure; +import org.bukkit.entity.Player; + +public class DreamStructuresRegistry { + public static boolean isInDreamStructure(Player player, DreamStructure dreamStructure) { + return !player.getLocation().getChunk().getStructures(dreamStructure.getStructure()).isEmpty(); + } + + public static DreamStructure getDreamStructure(Player player) { + for (DreamStructure dreamStructure : DreamStructure.values()) { + if (player.getLocation().getChunk().getStructures(dreamStructure.getStructure()).isEmpty()) continue; + + return dreamStructure; + } + + return null; + } +} diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/tools/SoulAxe.java b/src/main/java/fr/openmc/core/features/dream/registries/items/tools/SoulAxe.java index aae13e003..16f619070 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/tools/SoulAxe.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/tools/SoulAxe.java @@ -13,7 +13,7 @@ public SoulAxe(String name) { @Override public DreamRarity getRarity() { - return DreamRarity.COMMON; + return DreamRarity.RARE; } @Override diff --git a/src/main/java/fr/openmc/core/features/dream/registries/mobs/Breezy.java b/src/main/java/fr/openmc/core/features/dream/registries/mobs/Breezy.java index 78800de75..1538fcfd3 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/mobs/Breezy.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/mobs/Breezy.java @@ -2,7 +2,7 @@ import fr.openmc.core.OMCPlugin; import fr.openmc.core.features.dream.DreamUtils; -import fr.openmc.core.features.dream.generation.DreamDimensionManager; +import fr.openmc.core.features.dream.dimension.DreamDimensionManager; import fr.openmc.core.features.dream.models.registry.DreamMob; import fr.openmc.core.utils.ParticleUtils; import org.bukkit.*; diff --git a/src/main/java/fr/openmc/core/features/dream/registries/mobs/DreamPhantom.java b/src/main/java/fr/openmc/core/features/dream/registries/mobs/DreamPhantom.java index 91d9a095a..0346ce36c 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/mobs/DreamPhantom.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/mobs/DreamPhantom.java @@ -1,6 +1,6 @@ package fr.openmc.core.features.dream.registries.mobs; -import fr.openmc.core.features.dream.generation.DreamDimensionManager; +import fr.openmc.core.features.dream.dimension.DreamDimensionManager; import fr.openmc.core.features.dream.models.registry.DreamMob; import fr.openmc.core.utils.RandomUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/fr/openmc/core/features/dream/registries/mobs/DreamStray.java b/src/main/java/fr/openmc/core/features/dream/registries/mobs/DreamStray.java index 3b4f48b3e..2617a12d5 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/mobs/DreamStray.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/mobs/DreamStray.java @@ -1,6 +1,6 @@ package fr.openmc.core.features.dream.registries.mobs; -import fr.openmc.core.features.dream.generation.DreamDimensionManager; +import fr.openmc.core.features.dream.dimension.DreamDimensionManager; import fr.openmc.core.features.dream.models.registry.DreamMob; import fr.openmc.core.features.dream.registries.DreamItemRegistry; import org.bukkit.Bukkit; diff --git a/src/main/java/fr/openmc/core/features/dream/registries/mobs/listeners/MudBeachMobSpawningListener.java b/src/main/java/fr/openmc/core/features/dream/registries/mobs/listeners/MudBeachMobSpawningListener.java index 7eb6775fc..ea80b9636 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/mobs/listeners/MudBeachMobSpawningListener.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/mobs/listeners/MudBeachMobSpawningListener.java @@ -1,7 +1,8 @@ package fr.openmc.core.features.dream.registries.mobs.listeners; import fr.openmc.core.features.dream.DreamUtils; -import fr.openmc.core.features.dream.generation.DreamBiome; +import fr.openmc.core.features.dream.models.registry.DreamBiome; +import fr.openmc.core.features.dream.registries.DreamBiomesRegistry; import fr.openmc.core.features.dream.registries.DreamMobsRegistry; import org.bukkit.Location; import org.bukkit.World; @@ -38,7 +39,7 @@ void onCreatureSpawn(CreatureSpawnEvent e) { e.setCancelled(true); - if (!world.getBiome(spawningLoc).equals(DreamBiome.MUD_BEACH.getBiome())) return; + if (!DreamBiomesRegistry.isDreamBiome(spawningLoc, DreamBiome.MUD_BEACH)) return; double choice = Math.random(); if (choice < CORRUPTED_TADPOLE_PROBABILITY) { diff --git a/src/main/java/fr/openmc/core/features/dream/registries/mobs/listeners/PlainsMobSpawningListener.java b/src/main/java/fr/openmc/core/features/dream/registries/mobs/listeners/PlainsMobSpawningListener.java index 1d30238b1..b2add6318 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/mobs/listeners/PlainsMobSpawningListener.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/mobs/listeners/PlainsMobSpawningListener.java @@ -1,7 +1,8 @@ package fr.openmc.core.features.dream.registries.mobs.listeners; import fr.openmc.core.features.dream.DreamUtils; -import fr.openmc.core.features.dream.generation.DreamBiome; +import fr.openmc.core.features.dream.models.registry.DreamBiome; +import fr.openmc.core.features.dream.registries.DreamBiomesRegistry; import fr.openmc.core.features.dream.registries.DreamMobsRegistry; import fr.openmc.core.features.dream.registries.mobs.DreamCreaking; import fr.openmc.core.features.dream.registries.mobs.DreamSpider; @@ -41,7 +42,7 @@ void onCreatureSpawn(CreatureSpawnEvent e) { World world = spawningLoc.getWorld(); if (!DreamUtils.isDreamWorld(world)) return; e.setCancelled(true); - if (!world.getBiome(spawningLoc).equals(DreamBiome.SCULK_PLAINS.getBiome())) return; + if (!DreamBiomesRegistry.isDreamBiome(spawningLoc, DreamBiome.SCULK_PLAINS)) return; if (e.getEntity().getType().equals(EntityType.CREAKING)) { e.setCancelled(false); diff --git a/src/main/java/fr/openmc/core/features/dream/registries/mobs/listeners/SoulForestMobSpawningListener.java b/src/main/java/fr/openmc/core/features/dream/registries/mobs/listeners/SoulForestMobSpawningListener.java index 657bf2ff2..af175625b 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/mobs/listeners/SoulForestMobSpawningListener.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/mobs/listeners/SoulForestMobSpawningListener.java @@ -1,7 +1,8 @@ package fr.openmc.core.features.dream.registries.mobs.listeners; import fr.openmc.core.features.dream.DreamUtils; -import fr.openmc.core.features.dream.generation.DreamBiome; +import fr.openmc.core.features.dream.models.registry.DreamBiome; +import fr.openmc.core.features.dream.registries.DreamBiomesRegistry; import fr.openmc.core.features.dream.registries.DreamMobsRegistry; import fr.openmc.core.features.dream.registries.mobs.Soul; import org.bukkit.Location; @@ -35,7 +36,7 @@ void onCreatureSpawn(CreatureSpawnEvent e) { if (e.getSpawnReason() == CreatureSpawnEvent.SpawnReason.CUSTOM) return; if (!DreamUtils.isDreamWorld(spawningLoc)) return; e.setCancelled(true); - if (!spawningLoc.getWorld().getBiome(spawningLoc).equals(DreamBiome.SOUL_FOREST.getBiome())) return; + if (!DreamBiomesRegistry.isDreamBiome(spawningLoc, DreamBiome.SOUL_FOREST)) return; double choice = Math.random(); diff --git a/src/main/java/fr/openmc/core/utils/FastNoiseLite.java b/src/main/java/fr/openmc/core/utils/FastNoiseLite.java deleted file mode 100644 index f02db14ad..000000000 --- a/src/main/java/fr/openmc/core/utils/FastNoiseLite.java +++ /dev/null @@ -1,2481 +0,0 @@ -package fr.openmc.core.utils; - -// MIT License -// -// Copyright(c) 2023 Jordan Peck (jordan.me2@gmail.com) -// Copyright(c) 2023 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. -// -// .'',;:cldxkO00KKXXNNWWWNNXKOkxdollcc::::::;:::ccllloooolllllllllooollc:,'... ...........',;cldxkO000Okxdlc::;;;,,;;;::cclllllll -// ..',;:ldxO0KXXNNNNNNNNXXK0kxdolcc::::::;;;,,,,,,;;;;;;;;;;:::cclllllc:;'.... ...........',;:ldxO0KXXXK0Okxdolc::;;;;::cllodddddo -// ...',:loxO0KXNNNNNXXKK0Okxdolc::;::::::::;;;,,'''''.....''',;:clllllc:;,'............''''''''',;:loxO0KXNNNNNXK0Okxdollccccllodxxxxxxd -// ....';:ldkO0KXXXKK00Okxdolcc:;;;;;::cclllcc:;;,''..... ....',;clooddolcc:;;;;,,;;;;;::::;;;;;;:cloxk0KXNWWWWWWNXKK0Okxddoooddxxkkkkkxx -// .....';:ldxkOOOOOkxxdolcc:;;;,,,;;:cllooooolcc:;'... ..,:codxkkkxddooollloooooooollcc:::::clodkO0KXNWWWWWWNNXK00Okxxxxxxxxkkkkxxx -// . ....';:cloddddo___________,,,,;;:clooddddoolc:,... ..,:ldx__00OOOkkk___kkkkkkxxdollc::::cclodkO0KXXNNNNNNXXK0OOkxxxxxxxxxxxxddd -// .......',;:cccc:| |,,,;;:cclooddddoll:;'.. ..';cox| \KKK000| |KK00OOkxdocc___;::clldxxkO0KKKKK00Okkxdddddddddddddddoo -// .......'',,,,,''| ________|',,;;::cclloooooolc:;'......___:ldk| \KK000| |XKKK0Okxolc| |;;::cclodxxkkkkxxdoolllcclllooodddooooo -// ''......''''....| | ....'',,,,;;;::cclloooollc:;,''.'| |oxk| \OOO0| |KKK00Oxdoll|___|;;;;;::ccllllllcc::;;,,;;;:cclloooooooo -// ;;,''.......... | |_____',,;;;____:___cllo________.___| |___| \xkk| |KK_______ool___:::;________;;;_______...'',;;:ccclllloo -// c:;,''......... | |:::/ ' |lo/ | | \dx| |0/ \d| |cc/ |'/ \......',,;;:ccllo -// ol:;,'..........| _____|ll/ __ |o/ ______|____ ___| | \o| |/ ___ \| |o/ ______|/ ___ \ .......'',;:clo -// dlc;,...........| |::clooo| / | |x\___ \KXKKK0| |dol| |\ \| | | | | |d\___ \..| | / / ....',:cl -// xoc;'... .....'| |llodddd| \__| |_____\ \KKK0O| |lc:| |'\ | |___| | |_____\ \.| |_/___/... ...',;:c -// dlc;'... ....',;| |oddddddo\ | |Okkx| |::;| |..\ |\ /| | | \ |... ....',;:c -// ol:,'.......',:c|___|xxxddollc\_____,___|_________/ddoll|___|,,,|___|...\_____|:\ ______/l|___|_________/...\________|'........',;::cc -// c:;'.......';:codxxkkkkxxolc::;::clodxkOO0OOkkxdollc::;;,,''''',,,,''''''''''',,'''''',;:loxkkOOkxol:;,'''',,;:ccllcc:;,'''''',;::ccll -// ;,'.......',:codxkOO0OOkxdlc:;,,;;:cldxxkkxxdolc:;;,,''.....'',;;:::;;,,,'''''........,;cldkO0KK0Okdoc::;;::cloodddoolc:;;;;;::ccllooo -// .........',;:lodxOO0000Okdoc:,,',,;:clloddoolc:;,''.......'',;:clooollc:;;,,''.......',:ldkOKXNNXX0Oxdolllloddxxxxxxdolccccccllooodddd -// . .....';:cldxkO0000Okxol:;,''',,;::cccc:;,,'.......'',;:cldxxkkxxdolc:;;,'.......';coxOKXNWWWNXKOkxddddxxkkkkkkxdoollllooddxxxxkkk -// ....',;:codxkO000OOxdoc:;,''',,,;;;;,''.......',,;:clodkO00000Okxolc::;,,''..',;:ldxOKXNWWWNNK0OkkkkkkkkkkkxxddooooodxxkOOOOO000 -// ....',;;clodxkkOOOkkdolc:;,,,,,,,,'..........,;:clodxkO0KKXKK0Okxdolcc::;;,,,;;:codkO0XXNNNNXKK0OOOOOkkkkxxdoollloodxkO0KKKXXXXX -// -// VERSION: 1.1.1 -// https://github.com/Auburn/FastNoiseLite - -// To switch between using floats or doubles for input position, -// perform a file-wide replace on the following strings (including /*FNLfloat*/) -// /*FNLfloat*/ float -// /*FNLfloat*/ double - -public class FastNoiseLite { - public enum NoiseType { - OpenSimplex2, - OpenSimplex2S, - Cellular, - Perlin, - ValueCubic, - Value - } - - ; - - public enum RotationType3D { - None, - ImproveXYPlanes, - ImproveXZPlanes - } - - ; - - public enum FractalType { - None, - FBm, - Ridged, - PingPong, - DomainWarpProgressive, - DomainWarpIndependent - } - - ; - - public enum CellularDistanceFunction { - Euclidean, - EuclideanSq, - Manhattan, - Hybrid - } - - ; - - public enum CellularReturnType { - CellValue, - Distance, - Distance2, - Distance2Add, - Distance2Sub, - Distance2Mul, - Distance2Div - } - - ; - - public enum DomainWarpType { - OpenSimplex2, - OpenSimplex2Reduced, - BasicGrid - } - - ; - - private enum TransformType3D { - None, - ImproveXYPlanes, - ImproveXZPlanes, - DefaultOpenSimplex2 - } - - ; - - private int mSeed = 1337; - private float mFrequency = 0.01f; - private NoiseType mNoiseType = NoiseType.OpenSimplex2; - private RotationType3D mRotationType3D = RotationType3D.None; - private TransformType3D mTransformType3D = TransformType3D.DefaultOpenSimplex2; - - private FractalType mFractalType = FractalType.None; - private int mOctaves = 3; - private float mLacunarity = 2.0f; - private float mGain = 0.5f; - private float mWeightedStrength = 0.0f; - private float mPingPongStrength = 2.0f; - - private float mFractalBounding = 1 / 1.75f; - - private CellularDistanceFunction mCellularDistanceFunction = CellularDistanceFunction.EuclideanSq; - private CellularReturnType mCellularReturnType = CellularReturnType.Distance; - private float mCellularJitterModifier = 1.0f; - - private DomainWarpType mDomainWarpType = DomainWarpType.OpenSimplex2; - private TransformType3D mWarpTransformType3D = TransformType3D.DefaultOpenSimplex2; - private float mDomainWarpAmp = 1.0f; - - /// - /// Create new FastNoise object with default seed - /// - public FastNoiseLite() { - } - - /// - /// Create new FastNoise object with specified seed - /// - public FastNoiseLite(int seed) { - SetSeed(seed); - } - - /// - /// Sets seed used for all noise types - /// - /// - /// Default: 1337 - /// - public void SetSeed(int seed) { - mSeed = seed; - } - - /// - /// Sets frequency for all noise types - /// - /// - /// Default: 0.01 - /// - public void SetFrequency(float frequency) { - mFrequency = frequency; - } - - /// - /// Sets noise algorithm used for GetNoise(...) - /// - /// - /// Default: OpenSimplex2 - /// - public void SetNoiseType(NoiseType noiseType) { - mNoiseType = noiseType; - UpdateTransformType3D(); - } - - /// - /// Sets domain rotation type for 3D Noise and 3D DomainWarp. - /// Can aid in reducing directional artifacts when sampling a 2D plane in 3D - /// - /// - /// Default: None - /// - public void SetRotationType3D(RotationType3D rotationType3D) { - mRotationType3D = rotationType3D; - UpdateTransformType3D(); - UpdateWarpTransformType3D(); - } - - /// - /// Sets method for combining octaves in all fractal noise types - /// - /// - /// Default: None - /// Note: FractalType.DomainWarp... only affects DomainWarp(...) - /// - public void SetFractalType(FractalType fractalType) { - mFractalType = fractalType; - } - - /// - /// Sets octave count for all fractal noise types - /// - /// - /// Default: 3 - /// - public void SetFractalOctaves(int octaves) { - mOctaves = octaves; - CalculateFractalBounding(); - } - - /// - /// Sets octave lacunarity for all fractal noise types - /// - /// - /// Default: 2.0 - /// - public void SetFractalLacunarity(float lacunarity) { - mLacunarity = lacunarity; - } - - /// - /// Sets octave gain for all fractal noise types - /// - /// - /// Default: 0.5 - /// - public void SetFractalGain(float gain) { - mGain = gain; - CalculateFractalBounding(); - } - - /// - /// Sets octave weighting for all none DomainWarp fratal types - /// - /// - /// Default: 0.0 - /// Note: Keep between 0...1 to maintain -1...1 output bounding - /// - public void SetFractalWeightedStrength(float weightedStrength) { - mWeightedStrength = weightedStrength; - } - - /// - /// Sets strength of the fractal ping pong effect - /// - /// - /// Default: 2.0 - /// - public void SetFractalPingPongStrength(float pingPongStrength) { - mPingPongStrength = pingPongStrength; - } - - - /// - /// Sets distance function used in cellular noise calculations - /// - /// - /// Default: Distance - /// - public void SetCellularDistanceFunction(CellularDistanceFunction cellularDistanceFunction) { - mCellularDistanceFunction = cellularDistanceFunction; - } - - /// - /// Sets return type from cellular noise calculations - /// - /// - /// Default: EuclideanSq - /// - public void SetCellularReturnType(CellularReturnType cellularReturnType) { - mCellularReturnType = cellularReturnType; - } - - /// - /// Sets the maximum distance a cellular point can move from it's grid position - /// - /// - /// Default: 1.0 - /// Note: Setting this higher than 1 will cause artifacts - /// - public void SetCellularJitter(float cellularJitter) { - mCellularJitterModifier = cellularJitter; - } - - - /// - /// Sets the warp algorithm when using DomainWarp(...) - /// - /// - /// Default: OpenSimplex2 - /// - public void SetDomainWarpType(DomainWarpType domainWarpType) { - mDomainWarpType = domainWarpType; - UpdateWarpTransformType3D(); - } - - - /// - /// Sets the maximum warp distance from original position when using DomainWarp(...) - /// - /// - /// Default: 1.0 - /// - public void SetDomainWarpAmp(float domainWarpAmp) { - mDomainWarpAmp = domainWarpAmp; - } - - - /// - /// 2D noise at given position using current settings - /// - /// - /// Noise output bounded between -1...1 - /// - public float GetNoise(/*FNLfloat*/ float x, /*FNLfloat*/ float y) { - x *= mFrequency; - y *= mFrequency; - - switch (mNoiseType) { - case OpenSimplex2: - case OpenSimplex2S: { - final /*FNLfloat*/ float SQRT3 = (/*FNLfloat*/ float) 1.7320508075688772935274463415059; - final /*FNLfloat*/ float F2 = 0.5f * (SQRT3 - 1); - /*FNLfloat*/ - float t = (x + y) * F2; - x += t; - y += t; - } - break; - default: - break; - } - - switch (mFractalType) { - default: - return GenNoiseSingle(mSeed, x, y); - case FBm: - return GenFractalFBm(x, y); - case Ridged: - return GenFractalRidged(x, y); - case PingPong: - return GenFractalPingPong(x, y); - } - } - - /// - /// 3D noise at given position using current settings - /// - /// - /// Noise output bounded between -1...1 - /// - public float GetNoise(/*FNLfloat*/ float x, /*FNLfloat*/ float y, /*FNLfloat*/ float z) { - x *= mFrequency; - y *= mFrequency; - z *= mFrequency; - - switch (mTransformType3D) { - case ImproveXYPlanes: { - /*FNLfloat*/ - float xy = x + y; - /*FNLfloat*/ - float s2 = xy * -(/*FNLfloat*/ float) 0.211324865405187; - z *= (/*FNLfloat*/ float) 0.577350269189626; - x += s2 - z; - y = y + s2 - z; - z += xy * (/*FNLfloat*/ float) 0.577350269189626; - } - break; - case ImproveXZPlanes: { - /*FNLfloat*/ - float xz = x + z; - /*FNLfloat*/ - float s2 = xz * -(/*FNLfloat*/ float) 0.211324865405187; - y *= (/*FNLfloat*/ float) 0.577350269189626; - x += s2 - y; - z += s2 - y; - y += xz * (/*FNLfloat*/ float) 0.577350269189626; - } - break; - case DefaultOpenSimplex2: { - final /*FNLfloat*/ float R3 = (/*FNLfloat*/ float) (2.0 / 3.0); - /*FNLfloat*/ - float r = (x + y + z) * R3; // Rotation, not skew - x = r - x; - y = r - y; - z = r - z; - } - break; - default: - break; - } - - switch (mFractalType) { - default: - return GenNoiseSingle(mSeed, x, y, z); - case FBm: - return GenFractalFBm(x, y, z); - case Ridged: - return GenFractalRidged(x, y, z); - case PingPong: - return GenFractalPingPong(x, y, z); - } - } - - - /// - /// 2D warps the input position using current domain warp settings - /// - /// - /// Example usage with GetNoise - /// DomainWarp(coord) - /// noise = GetNoise(x, y) - /// - public void DomainWarp(Vector2 coord) { - switch (mFractalType) { - default: - DomainWarpSingle(coord); - break; - case DomainWarpProgressive: - DomainWarpFractalProgressive(coord); - break; - case DomainWarpIndependent: - DomainWarpFractalIndependent(coord); - break; - } - } - - /// - /// 3D warps the input position using current domain warp settings - /// - /// - /// Example usage with GetNoise - /// DomainWarp(coord) - /// noise = GetNoise(x, y, z) - /// - public void DomainWarp(Vector3 coord) { - switch (mFractalType) { - default: - DomainWarpSingle(coord); - break; - case DomainWarpProgressive: - DomainWarpFractalProgressive(coord); - break; - case DomainWarpIndependent: - DomainWarpFractalIndependent(coord); - break; - } - } - - - private static final float[] Gradients2D = { - 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, 0.793353340291235f, 0.608761429008721f, - 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, - 0.793353340291235f, -0.60876142900872f, 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, - -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, -0.793353340291235f, -0.608761429008721f, - -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, - -0.793353340291235f, 0.608761429008721f, -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, - 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, 0.793353340291235f, 0.608761429008721f, - 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, - 0.793353340291235f, -0.60876142900872f, 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, - -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, -0.793353340291235f, -0.608761429008721f, - -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, - -0.793353340291235f, 0.608761429008721f, -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, - 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, 0.793353340291235f, 0.608761429008721f, - 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, - 0.793353340291235f, -0.60876142900872f, 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, - -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, -0.793353340291235f, -0.608761429008721f, - -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, - -0.793353340291235f, 0.608761429008721f, -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, - 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, 0.793353340291235f, 0.608761429008721f, - 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, - 0.793353340291235f, -0.60876142900872f, 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, - -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, -0.793353340291235f, -0.608761429008721f, - -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, - -0.793353340291235f, 0.608761429008721f, -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, - 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, 0.793353340291235f, 0.608761429008721f, - 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, - 0.793353340291235f, -0.60876142900872f, 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, - -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, -0.793353340291235f, -0.608761429008721f, - -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, - -0.793353340291235f, 0.608761429008721f, -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, - 0.38268343236509f, 0.923879532511287f, 0.923879532511287f, 0.38268343236509f, 0.923879532511287f, -0.38268343236509f, 0.38268343236509f, -0.923879532511287f, - -0.38268343236509f, -0.923879532511287f, -0.923879532511287f, -0.38268343236509f, -0.923879532511287f, 0.38268343236509f, -0.38268343236509f, 0.923879532511287f, - }; - - private static final float[] RandVecs2D = { - -0.2700222198f, -0.9628540911f, 0.3863092627f, -0.9223693152f, 0.04444859006f, -0.999011673f, -0.5992523158f, -0.8005602176f, -0.7819280288f, 0.6233687174f, 0.9464672271f, 0.3227999196f, -0.6514146797f, -0.7587218957f, 0.9378472289f, 0.347048376f, - -0.8497875957f, -0.5271252623f, -0.879042592f, 0.4767432447f, -0.892300288f, -0.4514423508f, -0.379844434f, -0.9250503802f, -0.9951650832f, 0.0982163789f, 0.7724397808f, -0.6350880136f, 0.7573283322f, -0.6530343002f, -0.9928004525f, -0.119780055f, - -0.0532665713f, 0.9985803285f, 0.9754253726f, -0.2203300762f, -0.7665018163f, 0.6422421394f, 0.991636706f, 0.1290606184f, -0.994696838f, 0.1028503788f, -0.5379205513f, -0.84299554f, 0.5022815471f, -0.8647041387f, 0.4559821461f, -0.8899889226f, - -0.8659131224f, -0.5001944266f, 0.0879458407f, -0.9961252577f, -0.5051684983f, 0.8630207346f, 0.7753185226f, -0.6315704146f, -0.6921944612f, 0.7217110418f, -0.5191659449f, -0.8546734591f, 0.8978622882f, -0.4402764035f, -0.1706774107f, 0.9853269617f, - -0.9353430106f, -0.3537420705f, -0.9992404798f, 0.03896746794f, -0.2882064021f, -0.9575683108f, -0.9663811329f, 0.2571137995f, -0.8759714238f, -0.4823630009f, -0.8303123018f, -0.5572983775f, 0.05110133755f, -0.9986934731f, -0.8558373281f, -0.5172450752f, - 0.09887025282f, 0.9951003332f, 0.9189016087f, 0.3944867976f, -0.2439375892f, -0.9697909324f, -0.8121409387f, -0.5834613061f, -0.9910431363f, 0.1335421355f, 0.8492423985f, -0.5280031709f, -0.9717838994f, -0.2358729591f, 0.9949457207f, 0.1004142068f, - 0.6241065508f, -0.7813392434f, 0.662910307f, 0.7486988212f, -0.7197418176f, 0.6942418282f, -0.8143370775f, -0.5803922158f, 0.104521054f, -0.9945226741f, -0.1065926113f, -0.9943027784f, 0.445799684f, -0.8951327509f, 0.105547406f, 0.9944142724f, - -0.992790267f, 0.1198644477f, -0.8334366408f, 0.552615025f, 0.9115561563f, -0.4111755999f, 0.8285544909f, -0.5599084351f, 0.7217097654f, -0.6921957921f, 0.4940492677f, -0.8694339084f, -0.3652321272f, -0.9309164803f, -0.9696606758f, 0.2444548501f, - 0.08925509731f, -0.996008799f, 0.5354071276f, -0.8445941083f, -0.1053576186f, 0.9944343981f, -0.9890284586f, 0.1477251101f, 0.004856104961f, 0.9999882091f, 0.9885598478f, 0.1508291331f, 0.9286129562f, -0.3710498316f, -0.5832393863f, -0.8123003252f, - 0.3015207509f, 0.9534596146f, -0.9575110528f, 0.2883965738f, 0.9715802154f, -0.2367105511f, 0.229981792f, 0.9731949318f, 0.955763816f, -0.2941352207f, 0.740956116f, 0.6715534485f, -0.9971513787f, -0.07542630764f, 0.6905710663f, -0.7232645452f, - -0.290713703f, -0.9568100872f, 0.5912777791f, -0.8064679708f, -0.9454592212f, -0.325740481f, 0.6664455681f, 0.74555369f, 0.6236134912f, 0.7817328275f, 0.9126993851f, -0.4086316587f, -0.8191762011f, 0.5735419353f, -0.8812745759f, -0.4726046147f, - 0.9953313627f, 0.09651672651f, 0.9855650846f, -0.1692969699f, -0.8495980887f, 0.5274306472f, 0.6174853946f, -0.7865823463f, 0.8508156371f, 0.52546432f, 0.9985032451f, -0.05469249926f, 0.1971371563f, -0.9803759185f, 0.6607855748f, -0.7505747292f, - -0.03097494063f, 0.9995201614f, -0.6731660801f, 0.739491331f, -0.7195018362f, -0.6944905383f, 0.9727511689f, 0.2318515979f, 0.9997059088f, -0.0242506907f, 0.4421787429f, -0.8969269532f, 0.9981350961f, -0.061043673f, -0.9173660799f, -0.3980445648f, - -0.8150056635f, -0.5794529907f, -0.8789331304f, 0.4769450202f, 0.0158605829f, 0.999874213f, -0.8095464474f, 0.5870558317f, -0.9165898907f, -0.3998286786f, -0.8023542565f, 0.5968480938f, -0.5176737917f, 0.8555780767f, -0.8154407307f, -0.5788405779f, - 0.4022010347f, -0.9155513791f, -0.9052556868f, -0.4248672045f, 0.7317445619f, 0.6815789728f, -0.5647632201f, -0.8252529947f, -0.8403276335f, -0.5420788397f, -0.9314281527f, 0.363925262f, 0.5238198472f, 0.8518290719f, 0.7432803869f, -0.6689800195f, - -0.985371561f, -0.1704197369f, 0.4601468731f, 0.88784281f, 0.825855404f, 0.5638819483f, 0.6182366099f, 0.7859920446f, 0.8331502863f, -0.553046653f, 0.1500307506f, 0.9886813308f, -0.662330369f, -0.7492119075f, -0.668598664f, 0.743623444f, - 0.7025606278f, 0.7116238924f, -0.5419389763f, -0.8404178401f, -0.3388616456f, 0.9408362159f, 0.8331530315f, 0.5530425174f, -0.2989720662f, -0.9542618632f, 0.2638522993f, 0.9645630949f, 0.124108739f, -0.9922686234f, -0.7282649308f, -0.6852956957f, - 0.6962500149f, 0.7177993569f, -0.9183535368f, 0.3957610156f, -0.6326102274f, -0.7744703352f, -0.9331891859f, -0.359385508f, -0.1153779357f, -0.9933216659f, 0.9514974788f, -0.3076565421f, -0.08987977445f, -0.9959526224f, 0.6678496916f, 0.7442961705f, - 0.7952400393f, -0.6062947138f, -0.6462007402f, -0.7631674805f, -0.2733598753f, 0.9619118351f, 0.9669590226f, -0.254931851f, -0.9792894595f, 0.2024651934f, -0.5369502995f, -0.8436138784f, -0.270036471f, -0.9628500944f, -0.6400277131f, 0.7683518247f, - -0.7854537493f, -0.6189203566f, 0.06005905383f, -0.9981948257f, -0.02455770378f, 0.9996984141f, -0.65983623f, 0.751409442f, -0.6253894466f, -0.7803127835f, -0.6210408851f, -0.7837781695f, 0.8348888491f, 0.5504185768f, -0.1592275245f, 0.9872419133f, - 0.8367622488f, 0.5475663786f, -0.8675753916f, -0.4973056806f, -0.2022662628f, -0.9793305667f, 0.9399189937f, 0.3413975472f, 0.9877404807f, -0.1561049093f, -0.9034455656f, 0.4287028224f, 0.1269804218f, -0.9919052235f, -0.3819600854f, 0.924178821f, - 0.9754625894f, 0.2201652486f, -0.3204015856f, -0.9472818081f, -0.9874760884f, 0.1577687387f, 0.02535348474f, -0.9996785487f, 0.4835130794f, -0.8753371362f, -0.2850799925f, -0.9585037287f, -0.06805516006f, -0.99768156f, -0.7885244045f, -0.6150034663f, - 0.3185392127f, -0.9479096845f, 0.8880043089f, 0.4598351306f, 0.6476921488f, -0.7619021462f, 0.9820241299f, 0.1887554194f, 0.9357275128f, -0.3527237187f, -0.8894895414f, 0.4569555293f, 0.7922791302f, 0.6101588153f, 0.7483818261f, 0.6632681526f, - -0.7288929755f, -0.6846276581f, 0.8729032783f, -0.4878932944f, 0.8288345784f, 0.5594937369f, 0.08074567077f, 0.9967347374f, 0.9799148216f, -0.1994165048f, -0.580730673f, -0.8140957471f, -0.4700049791f, -0.8826637636f, 0.2409492979f, 0.9705377045f, - 0.9437816757f, -0.3305694308f, -0.8927998638f, -0.4504535528f, -0.8069622304f, 0.5906030467f, 0.06258973166f, 0.9980393407f, -0.9312597469f, 0.3643559849f, 0.5777449785f, 0.8162173362f, -0.3360095855f, -0.941858566f, 0.697932075f, -0.7161639607f, - -0.002008157227f, -0.9999979837f, -0.1827294312f, -0.9831632392f, -0.6523911722f, 0.7578824173f, -0.4302626911f, -0.9027037258f, -0.9985126289f, -0.05452091251f, -0.01028102172f, -0.9999471489f, -0.4946071129f, 0.8691166802f, -0.2999350194f, 0.9539596344f, - 0.8165471961f, 0.5772786819f, 0.2697460475f, 0.962931498f, -0.7306287391f, -0.6827749597f, -0.7590952064f, -0.6509796216f, -0.907053853f, 0.4210146171f, -0.5104861064f, -0.8598860013f, 0.8613350597f, 0.5080373165f, 0.5007881595f, -0.8655698812f, - -0.654158152f, 0.7563577938f, -0.8382755311f, -0.545246856f, 0.6940070834f, 0.7199681717f, 0.06950936031f, 0.9975812994f, 0.1702942185f, -0.9853932612f, 0.2695973274f, 0.9629731466f, 0.5519612192f, -0.8338697815f, 0.225657487f, -0.9742067022f, - 0.4215262855f, -0.9068161835f, 0.4881873305f, -0.8727388672f, -0.3683854996f, -0.9296731273f, -0.9825390578f, 0.1860564427f, 0.81256471f, 0.5828709909f, 0.3196460933f, -0.9475370046f, 0.9570913859f, 0.2897862643f, -0.6876655497f, -0.7260276109f, - -0.9988770922f, -0.047376731f, -0.1250179027f, 0.992154486f, -0.8280133617f, 0.560708367f, 0.9324863769f, -0.3612051451f, 0.6394653183f, 0.7688199442f, -0.01623847064f, -0.9998681473f, -0.9955014666f, -0.09474613458f, -0.81453315f, 0.580117012f, - 0.4037327978f, -0.9148769469f, 0.9944263371f, 0.1054336766f, -0.1624711654f, 0.9867132919f, -0.9949487814f, -0.100383875f, -0.6995302564f, 0.7146029809f, 0.5263414922f, -0.85027327f, -0.5395221479f, 0.841971408f, 0.6579370318f, 0.7530729462f, - 0.01426758847f, -0.9998982128f, -0.6734383991f, 0.7392433447f, 0.639412098f, -0.7688642071f, 0.9211571421f, 0.3891908523f, -0.146637214f, -0.9891903394f, -0.782318098f, 0.6228791163f, -0.5039610839f, -0.8637263605f, -0.7743120191f, -0.6328039957f, - }; - - private static final float[] Gradients3D = { - 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, - 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, -1, 0, - 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 0, - 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, - 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, -1, 0, - 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 0, - 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, - 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, -1, 0, - 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 0, - 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, - 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, -1, 0, - 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 0, - 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, - 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, -1, 0, - 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 0, - 1, 1, 0, 0, 0, -1, 1, 0, -1, 1, 0, 0, 0, -1, -1, 0 - }; - - private static final float[] RandVecs3D = { - -0.7292736885f, -0.6618439697f, 0.1735581948f, 0, 0.790292081f, -0.5480887466f, -0.2739291014f, 0, 0.7217578935f, 0.6226212466f, -0.3023380997f, 0, 0.565683137f, -0.8208298145f, -0.0790000257f, 0, 0.760049034f, -0.5555979497f, -0.3370999617f, 0, 0.3713945616f, 0.5011264475f, 0.7816254623f, 0, -0.1277062463f, -0.4254438999f, -0.8959289049f, 0, -0.2881560924f, -0.5815838982f, 0.7607405838f, 0, - 0.5849561111f, -0.662820239f, -0.4674352136f, 0, 0.3307171178f, 0.0391653737f, 0.94291689f, 0, 0.8712121778f, -0.4113374369f, -0.2679381538f, 0, 0.580981015f, 0.7021915846f, 0.4115677815f, 0, 0.503756873f, 0.6330056931f, -0.5878203852f, 0, 0.4493712205f, 0.601390195f, 0.6606022552f, 0, -0.6878403724f, 0.09018890807f, -0.7202371714f, 0, -0.5958956522f, -0.6469350577f, 0.475797649f, 0, - -0.5127052122f, 0.1946921978f, -0.8361987284f, 0, -0.9911507142f, -0.05410276466f, -0.1212153153f, 0, -0.2149721042f, 0.9720882117f, -0.09397607749f, 0, -0.7518650936f, -0.5428057603f, 0.3742469607f, 0, 0.5237068895f, 0.8516377189f, -0.02107817834f, 0, 0.6333504779f, 0.1926167129f, -0.7495104896f, 0, -0.06788241606f, 0.3998305789f, 0.9140719259f, 0, -0.5538628599f, -0.4729896695f, -0.6852128902f, 0, - -0.7261455366f, -0.5911990757f, 0.3509933228f, 0, -0.9229274737f, -0.1782808786f, 0.3412049336f, 0, -0.6968815002f, 0.6511274338f, 0.3006480328f, 0, 0.9608044783f, -0.2098363234f, -0.1811724921f, 0, 0.06817146062f, -0.9743405129f, 0.2145069156f, 0, -0.3577285196f, -0.6697087264f, -0.6507845481f, 0, -0.1868621131f, 0.7648617052f, -0.6164974636f, 0, -0.6541697588f, 0.3967914832f, 0.6439087246f, 0, - 0.6993340405f, -0.6164538506f, 0.3618239211f, 0, -0.1546665739f, 0.6291283928f, 0.7617583057f, 0, -0.6841612949f, -0.2580482182f, -0.6821542638f, 0, 0.5383980957f, 0.4258654885f, 0.7271630328f, 0, -0.5026987823f, -0.7939832935f, -0.3418836993f, 0, 0.3202971715f, 0.2834415347f, 0.9039195862f, 0, 0.8683227101f, -0.0003762656404f, -0.4959995258f, 0, 0.791120031f, -0.08511045745f, 0.6057105799f, 0, - -0.04011016052f, -0.4397248749f, 0.8972364289f, 0, 0.9145119872f, 0.3579346169f, -0.1885487608f, 0, -0.9612039066f, -0.2756484276f, 0.01024666929f, 0, 0.6510361721f, -0.2877799159f, -0.7023778346f, 0, -0.2041786351f, 0.7365237271f, 0.644859585f, 0, -0.7718263711f, 0.3790626912f, 0.5104855816f, 0, -0.3060082741f, -0.7692987727f, 0.5608371729f, 0, 0.454007341f, -0.5024843065f, 0.7357899537f, 0, - 0.4816795475f, 0.6021208291f, -0.6367380315f, 0, 0.6961980369f, -0.3222197429f, 0.641469197f, 0, -0.6532160499f, -0.6781148932f, 0.3368515753f, 0, 0.5089301236f, -0.6154662304f, -0.6018234363f, 0, -0.1635919754f, -0.9133604627f, -0.372840892f, 0, 0.52408019f, -0.8437664109f, 0.1157505864f, 0, 0.5902587356f, 0.4983817807f, -0.6349883666f, 0, 0.5863227872f, 0.494764745f, 0.6414307729f, 0, - 0.6779335087f, 0.2341345225f, 0.6968408593f, 0, 0.7177054546f, -0.6858979348f, 0.120178631f, 0, -0.5328819713f, -0.5205125012f, 0.6671608058f, 0, -0.8654874251f, -0.0700727088f, -0.4960053754f, 0, -0.2861810166f, 0.7952089234f, 0.5345495242f, 0, -0.04849529634f, 0.9810836427f, -0.1874115585f, 0, -0.6358521667f, 0.6058348682f, 0.4781800233f, 0, 0.6254794696f, -0.2861619734f, 0.7258696564f, 0, - -0.2585259868f, 0.5061949264f, -0.8227581726f, 0, 0.02136306781f, 0.5064016808f, -0.8620330371f, 0, 0.200111773f, 0.8599263484f, 0.4695550591f, 0, 0.4743561372f, 0.6014985084f, -0.6427953014f, 0, 0.6622993731f, -0.5202474575f, -0.5391679918f, 0, 0.08084972818f, -0.6532720452f, 0.7527940996f, 0, -0.6893687501f, 0.0592860349f, 0.7219805347f, 0, -0.1121887082f, -0.9673185067f, 0.2273952515f, 0, - 0.7344116094f, 0.5979668656f, -0.3210532909f, 0, 0.5789393465f, -0.2488849713f, 0.7764570201f, 0, 0.6988182827f, 0.3557169806f, -0.6205791146f, 0, -0.8636845529f, -0.2748771249f, -0.4224826141f, 0, -0.4247027957f, -0.4640880967f, 0.777335046f, 0, 0.5257722489f, -0.8427017621f, 0.1158329937f, 0, 0.9343830603f, 0.316302472f, -0.1639543925f, 0, -0.1016836419f, -0.8057303073f, -0.5834887393f, 0, - -0.6529238969f, 0.50602126f, -0.5635892736f, 0, -0.2465286165f, -0.9668205684f, -0.06694497494f, 0, -0.9776897119f, -0.2099250524f, -0.007368825344f, 0, 0.7736893337f, 0.5734244712f, 0.2694238123f, 0, -0.6095087895f, 0.4995678998f, 0.6155736747f, 0, 0.5794535482f, 0.7434546771f, 0.3339292269f, 0, -0.8226211154f, 0.08142581855f, 0.5627293636f, 0, -0.510385483f, 0.4703667658f, 0.7199039967f, 0, - -0.5764971849f, -0.07231656274f, -0.8138926898f, 0, 0.7250628871f, 0.3949971505f, -0.5641463116f, 0, -0.1525424005f, 0.4860840828f, -0.8604958341f, 0, -0.5550976208f, -0.4957820792f, 0.667882296f, 0, -0.1883614327f, 0.9145869398f, 0.357841725f, 0, 0.7625556724f, -0.5414408243f, -0.3540489801f, 0, -0.5870231946f, -0.3226498013f, -0.7424963803f, 0, 0.3051124198f, 0.2262544068f, -0.9250488391f, 0, - 0.6379576059f, 0.577242424f, -0.5097070502f, 0, -0.5966775796f, 0.1454852398f, -0.7891830656f, 0, -0.658330573f, 0.6555487542f, -0.3699414651f, 0, 0.7434892426f, 0.2351084581f, 0.6260573129f, 0, 0.5562114096f, 0.8264360377f, -0.0873632843f, 0, -0.3028940016f, -0.8251527185f, 0.4768419182f, 0, 0.1129343818f, -0.985888439f, -0.1235710781f, 0, 0.5937652891f, -0.5896813806f, 0.5474656618f, 0, - 0.6757964092f, -0.5835758614f, -0.4502648413f, 0, 0.7242302609f, -0.1152719764f, 0.6798550586f, 0, -0.9511914166f, 0.0753623979f, -0.2992580792f, 0, 0.2539470961f, -0.1886339355f, 0.9486454084f, 0, 0.571433621f, -0.1679450851f, -0.8032795685f, 0, -0.06778234979f, 0.3978269256f, 0.9149531629f, 0, 0.6074972649f, 0.733060024f, -0.3058922593f, 0, -0.5435478392f, 0.1675822484f, 0.8224791405f, 0, - -0.5876678086f, -0.3380045064f, -0.7351186982f, 0, -0.7967562402f, 0.04097822706f, -0.6029098428f, 0, -0.1996350917f, 0.8706294745f, 0.4496111079f, 0, -0.02787660336f, -0.9106232682f, -0.4122962022f, 0, -0.7797625996f, -0.6257634692f, 0.01975775581f, 0, -0.5211232846f, 0.7401644346f, -0.4249554471f, 0, 0.8575424857f, 0.4053272873f, -0.3167501783f, 0, 0.1045223322f, 0.8390195772f, -0.5339674439f, 0, - 0.3501822831f, 0.9242524096f, -0.1520850155f, 0, 0.1987849858f, 0.07647613266f, 0.9770547224f, 0, 0.7845996363f, 0.6066256811f, -0.1280964233f, 0, 0.09006737436f, -0.9750989929f, -0.2026569073f, 0, -0.8274343547f, -0.542299559f, 0.1458203587f, 0, -0.3485797732f, -0.415802277f, 0.840000362f, 0, -0.2471778936f, -0.7304819962f, -0.6366310879f, 0, -0.3700154943f, 0.8577948156f, 0.3567584454f, 0, - 0.5913394901f, -0.548311967f, -0.5913303597f, 0, 0.1204873514f, -0.7626472379f, -0.6354935001f, 0, 0.616959265f, 0.03079647928f, 0.7863922953f, 0, 0.1258156836f, -0.6640829889f, -0.7369967419f, 0, -0.6477565124f, -0.1740147258f, -0.7417077429f, 0, 0.6217889313f, -0.7804430448f, -0.06547655076f, 0, 0.6589943422f, -0.6096987708f, 0.4404473475f, 0, -0.2689837504f, -0.6732403169f, -0.6887635427f, 0, - -0.3849775103f, 0.5676542638f, 0.7277093879f, 0, 0.5754444408f, 0.8110471154f, -0.1051963504f, 0, 0.9141593684f, 0.3832947817f, 0.131900567f, 0, -0.107925319f, 0.9245493968f, 0.3654593525f, 0, 0.377977089f, 0.3043148782f, 0.8743716458f, 0, -0.2142885215f, -0.8259286236f, 0.5214617324f, 0, 0.5802544474f, 0.4148098596f, -0.7008834116f, 0, -0.1982660881f, 0.8567161266f, -0.4761596756f, 0, - -0.03381553704f, 0.3773180787f, -0.9254661404f, 0, -0.6867922841f, -0.6656597827f, 0.2919133642f, 0, 0.7731742607f, -0.2875793547f, -0.5652430251f, 0, -0.09655941928f, 0.9193708367f, -0.3813575004f, 0, 0.2715702457f, -0.9577909544f, -0.09426605581f, 0, 0.2451015704f, -0.6917998565f, -0.6792188003f, 0, 0.977700782f, -0.1753855374f, 0.1155036542f, 0, -0.5224739938f, 0.8521606816f, 0.02903615945f, 0, - -0.7734880599f, -0.5261292347f, 0.3534179531f, 0, -0.7134492443f, -0.269547243f, 0.6467878011f, 0, 0.1644037271f, 0.5105846203f, -0.8439637196f, 0, 0.6494635788f, 0.05585611296f, 0.7583384168f, 0, -0.4711970882f, 0.5017280509f, -0.7254255765f, 0, -0.6335764307f, -0.2381686273f, -0.7361091029f, 0, -0.9021533097f, -0.270947803f, -0.3357181763f, 0, -0.3793711033f, 0.872258117f, 0.3086152025f, 0, - -0.6855598966f, -0.3250143309f, 0.6514394162f, 0, 0.2900942212f, -0.7799057743f, -0.5546100667f, 0, -0.2098319339f, 0.85037073f, 0.4825351604f, 0, -0.4592603758f, 0.6598504336f, -0.5947077538f, 0, 0.8715945488f, 0.09616365406f, -0.4807031248f, 0, -0.6776666319f, 0.7118504878f, -0.1844907016f, 0, 0.7044377633f, 0.312427597f, 0.637304036f, 0, -0.7052318886f, -0.2401093292f, -0.6670798253f, 0, - 0.081921007f, -0.7207336136f, -0.6883545647f, 0, -0.6993680906f, -0.5875763221f, -0.4069869034f, 0, -0.1281454481f, 0.6419895885f, 0.7559286424f, 0, -0.6337388239f, -0.6785471501f, -0.3714146849f, 0, 0.5565051903f, -0.2168887573f, -0.8020356851f, 0, -0.5791554484f, 0.7244372011f, -0.3738578718f, 0, 0.1175779076f, -0.7096451073f, 0.6946792478f, 0, -0.6134619607f, 0.1323631078f, 0.7785527795f, 0, - 0.6984635305f, -0.02980516237f, -0.715024719f, 0, 0.8318082963f, -0.3930171956f, 0.3919597455f, 0, 0.1469576422f, 0.05541651717f, -0.9875892167f, 0, 0.708868575f, -0.2690503865f, 0.6520101478f, 0, 0.2726053183f, 0.67369766f, -0.68688995f, 0, -0.6591295371f, 0.3035458599f, -0.6880466294f, 0, 0.4815131379f, -0.7528270071f, 0.4487723203f, 0, 0.9430009463f, 0.1675647412f, -0.2875261255f, 0, - 0.434802957f, 0.7695304522f, -0.4677277752f, 0, 0.3931996188f, 0.594473625f, 0.7014236729f, 0, 0.7254336655f, -0.603925654f, 0.3301814672f, 0, 0.7590235227f, -0.6506083235f, 0.02433313207f, 0, -0.8552768592f, -0.3430042733f, 0.3883935666f, 0, -0.6139746835f, 0.6981725247f, 0.3682257648f, 0, -0.7465905486f, -0.5752009504f, 0.3342849376f, 0, 0.5730065677f, 0.810555537f, -0.1210916791f, 0, - -0.9225877367f, -0.3475211012f, -0.167514036f, 0, -0.7105816789f, -0.4719692027f, -0.5218416899f, 0, -0.08564609717f, 0.3583001386f, 0.929669703f, 0, -0.8279697606f, -0.2043157126f, 0.5222271202f, 0, 0.427944023f, 0.278165994f, 0.8599346446f, 0, 0.5399079671f, -0.7857120652f, -0.3019204161f, 0, 0.5678404253f, -0.5495413974f, -0.6128307303f, 0, -0.9896071041f, 0.1365639107f, -0.04503418428f, 0, - -0.6154342638f, -0.6440875597f, 0.4543037336f, 0, 0.1074204368f, -0.7946340692f, 0.5975094525f, 0, -0.3595449969f, -0.8885529948f, 0.28495784f, 0, -0.2180405296f, 0.1529888965f, 0.9638738118f, 0, -0.7277432317f, -0.6164050508f, -0.3007234646f, 0, 0.7249729114f, -0.00669719484f, 0.6887448187f, 0, -0.5553659455f, -0.5336586252f, 0.6377908264f, 0, 0.5137558015f, 0.7976208196f, -0.3160000073f, 0, - -0.3794024848f, 0.9245608561f, -0.03522751494f, 0, 0.8229248658f, 0.2745365933f, -0.4974176556f, 0, -0.5404114394f, 0.6091141441f, 0.5804613989f, 0, 0.8036581901f, -0.2703029469f, 0.5301601931f, 0, 0.6044318879f, 0.6832968393f, 0.4095943388f, 0, 0.06389988817f, 0.9658208605f, -0.2512108074f, 0, 0.1087113286f, 0.7402471173f, -0.6634877936f, 0, -0.713427712f, -0.6926784018f, 0.1059128479f, 0, - 0.6458897819f, -0.5724548511f, -0.5050958653f, 0, -0.6553931414f, 0.7381471625f, 0.159995615f, 0, 0.3910961323f, 0.9188871375f, -0.05186755998f, 0, -0.4879022471f, -0.5904376907f, 0.6429111375f, 0, 0.6014790094f, 0.7707441366f, -0.2101820095f, 0, -0.5677173047f, 0.7511360995f, 0.3368851762f, 0, 0.7858573506f, 0.226674665f, 0.5753666838f, 0, -0.4520345543f, -0.604222686f, -0.6561857263f, 0, - 0.002272116345f, 0.4132844051f, -0.9105991643f, 0, -0.5815751419f, -0.5162925989f, 0.6286591339f, 0, -0.03703704785f, 0.8273785755f, 0.5604221175f, 0, -0.5119692504f, 0.7953543429f, -0.3244980058f, 0, -0.2682417366f, -0.9572290247f, -0.1084387619f, 0, -0.2322482736f, -0.9679131102f, -0.09594243324f, 0, 0.3554328906f, -0.8881505545f, 0.2913006227f, 0, 0.7346520519f, -0.4371373164f, 0.5188422971f, 0, - 0.9985120116f, 0.04659011161f, -0.02833944577f, 0, -0.3727687496f, -0.9082481361f, 0.1900757285f, 0, 0.91737377f, -0.3483642108f, 0.1925298489f, 0, 0.2714911074f, 0.4147529736f, -0.8684886582f, 0, 0.5131763485f, -0.7116334161f, 0.4798207128f, 0, -0.8737353606f, 0.18886992f, -0.4482350644f, 0, 0.8460043821f, -0.3725217914f, 0.3814499973f, 0, 0.8978727456f, -0.1780209141f, -0.4026575304f, 0, - 0.2178065647f, -0.9698322841f, -0.1094789531f, 0, -0.1518031304f, -0.7788918132f, -0.6085091231f, 0, -0.2600384876f, -0.4755398075f, -0.8403819825f, 0, 0.572313509f, -0.7474340931f, -0.3373418503f, 0, -0.7174141009f, 0.1699017182f, -0.6756111411f, 0, -0.684180784f, 0.02145707593f, -0.7289967412f, 0, -0.2007447902f, 0.06555605789f, -0.9774476623f, 0, -0.1148803697f, -0.8044887315f, 0.5827524187f, 0, - -0.7870349638f, 0.03447489231f, 0.6159443543f, 0, -0.2015596421f, 0.6859872284f, 0.6991389226f, 0, -0.08581082512f, -0.10920836f, -0.9903080513f, 0, 0.5532693395f, 0.7325250401f, -0.396610771f, 0, -0.1842489331f, -0.9777375055f, -0.1004076743f, 0, 0.0775473789f, -0.9111505856f, 0.4047110257f, 0, 0.1399838409f, 0.7601631212f, -0.6344734459f, 0, 0.4484419361f, -0.845289248f, 0.2904925424f, 0 - }; - - - private static float FastMin(float a, float b) { - return a < b ? a : b; - } - - private static float FastMax(float a, float b) { - return a > b ? a : b; - } - - private static float FastAbs(float f) { - return f < 0 ? -f : f; - } - - private static float FastSqrt(float f) { - return (float) Math.sqrt(f); - } - - private static int FastFloor(/*FNLfloat*/ float f) { - return f >= 0 ? (int) f : (int) f - 1; - } - - private static int FastRound(/*FNLfloat*/ float f) { - return f >= 0 ? (int) (f + 0.5f) : (int) (f - 0.5f); - } - - private static float Lerp(float a, float b, float t) { - return a + t * (b - a); - } - - private static float InterpHermite(float t) { - return t * t * (3 - 2 * t); - } - - private static float InterpQuintic(float t) { - return t * t * t * (t * (t * 6 - 15) + 10); - } - - private static float CubicLerp(float a, float b, float c, float d, float t) { - float p = (d - c) - (a - b); - return t * t * t * p + t * t * ((a - b) - p) + t * (c - a) + b; - } - - private static float PingPong(float t) { - t -= (int) (t * 0.5f) * 2; - return t < 1 ? t : 2 - t; - } - - private void CalculateFractalBounding() { - float gain = FastAbs(mGain); - float amp = gain; - float ampFractal = 1.0f; - for (int i = 1; i < mOctaves; i++) { - ampFractal += amp; - amp *= gain; - } - mFractalBounding = 1 / ampFractal; - } - - // Hashing - private static final int PrimeX = 501125321; - private static final int PrimeY = 1136930381; - private static final int PrimeZ = 1720413743; - - private static int Hash(int seed, int xPrimed, int yPrimed) { - int hash = seed ^ xPrimed ^ yPrimed; - - hash *= 0x27d4eb2d; - return hash; - } - - private static int Hash(int seed, int xPrimed, int yPrimed, int zPrimed) { - int hash = seed ^ xPrimed ^ yPrimed ^ zPrimed; - - hash *= 0x27d4eb2d; - return hash; - } - - private static float ValCoord(int seed, int xPrimed, int yPrimed) { - int hash = Hash(seed, xPrimed, yPrimed); - - hash *= hash; - hash ^= hash << 19; - return hash * (1 / 2147483648.0f); - } - - private static float ValCoord(int seed, int xPrimed, int yPrimed, int zPrimed) { - int hash = Hash(seed, xPrimed, yPrimed, zPrimed); - - hash *= hash; - hash ^= hash << 19; - return hash * (1 / 2147483648.0f); - } - - private static float GradCoord(int seed, int xPrimed, int yPrimed, float xd, float yd) { - int hash = Hash(seed, xPrimed, yPrimed); - hash ^= hash >> 15; - hash &= 127 << 1; - - float xg = Gradients2D[hash]; - float yg = Gradients2D[hash | 1]; - - return xd * xg + yd * yg; - } - - private static float GradCoord(int seed, int xPrimed, int yPrimed, int zPrimed, float xd, float yd, float zd) { - int hash = Hash(seed, xPrimed, yPrimed, zPrimed); - hash ^= hash >> 15; - hash &= 63 << 2; - - float xg = Gradients3D[hash]; - float yg = Gradients3D[hash | 1]; - float zg = Gradients3D[hash | 2]; - - return xd * xg + yd * yg + zd * zg; - } - - - // Generic noise gen - - private float GenNoiseSingle(int seed, /*FNLfloat*/ float x, /*FNLfloat*/ float y) { - switch (mNoiseType) { - case OpenSimplex2: - return SingleSimplex(seed, x, y); - case OpenSimplex2S: - return SingleOpenSimplex2S(seed, x, y); - case Cellular: - return SingleCellular(seed, x, y); - case Perlin: - return SinglePerlin(seed, x, y); - case ValueCubic: - return SingleValueCubic(seed, x, y); - case Value: - return SingleValue(seed, x, y); - default: - return 0; - } - } - - private float GenNoiseSingle(int seed, /*FNLfloat*/ float x, /*FNLfloat*/ float y, /*FNLfloat*/ float z) { - switch (mNoiseType) { - case OpenSimplex2: - return SingleOpenSimplex2(seed, x, y, z); - case OpenSimplex2S: - return SingleOpenSimplex2S(seed, x, y, z); - case Cellular: - return SingleCellular(seed, x, y, z); - case Perlin: - return SinglePerlin(seed, x, y, z); - case ValueCubic: - return SingleValueCubic(seed, x, y, z); - case Value: - return SingleValue(seed, x, y, z); - default: - return 0; - } - } - - - // Noise Coordinate Transforms (frequency, and possible skew or rotation) - - private void UpdateTransformType3D() { - switch (mRotationType3D) { - case ImproveXYPlanes: - mTransformType3D = TransformType3D.ImproveXYPlanes; - break; - case ImproveXZPlanes: - mTransformType3D = TransformType3D.ImproveXZPlanes; - break; - default: - switch (mNoiseType) { - case OpenSimplex2: - case OpenSimplex2S: - mTransformType3D = TransformType3D.DefaultOpenSimplex2; - break; - default: - mTransformType3D = TransformType3D.None; - break; - } - break; - } - } - - private void UpdateWarpTransformType3D() { - switch (mRotationType3D) { - case ImproveXYPlanes: - mWarpTransformType3D = TransformType3D.ImproveXYPlanes; - break; - case ImproveXZPlanes: - mWarpTransformType3D = TransformType3D.ImproveXZPlanes; - break; - default: - switch (mDomainWarpType) { - case OpenSimplex2: - case OpenSimplex2Reduced: - mWarpTransformType3D = TransformType3D.DefaultOpenSimplex2; - break; - default: - mWarpTransformType3D = TransformType3D.None; - break; - } - break; - } - } - - - // Fractal FBm - - private float GenFractalFBm(/*FNLfloat*/ float x, /*FNLfloat*/ float y) { - int seed = mSeed; - float sum = 0; - float amp = mFractalBounding; - - for (int i = 0; i < mOctaves; i++) { - float noise = GenNoiseSingle(seed++, x, y); - sum += noise * amp; - amp *= Lerp(1.0f, FastMin(noise + 1, 2) * 0.5f, mWeightedStrength); - - x *= mLacunarity; - y *= mLacunarity; - amp *= mGain; - } - - return sum; - } - - private float GenFractalFBm(/*FNLfloat*/ float x, /*FNLfloat*/ float y, /*FNLfloat*/ float z) { - int seed = mSeed; - float sum = 0; - float amp = mFractalBounding; - - for (int i = 0; i < mOctaves; i++) { - float noise = GenNoiseSingle(seed++, x, y, z); - sum += noise * amp; - amp *= Lerp(1.0f, (noise + 1) * 0.5f, mWeightedStrength); - - x *= mLacunarity; - y *= mLacunarity; - z *= mLacunarity; - amp *= mGain; - } - - return sum; - } - - - // Fractal Ridged - - private float GenFractalRidged(/*FNLfloat*/ float x, /*FNLfloat*/ float y) { - int seed = mSeed; - float sum = 0; - float amp = mFractalBounding; - - for (int i = 0; i < mOctaves; i++) { - float noise = FastAbs(GenNoiseSingle(seed++, x, y)); - sum += (noise * -2 + 1) * amp; - amp *= Lerp(1.0f, 1 - noise, mWeightedStrength); - - x *= mLacunarity; - y *= mLacunarity; - amp *= mGain; - } - - return sum; - } - - private float GenFractalRidged(/*FNLfloat*/ float x, /*FNLfloat*/ float y, /*FNLfloat*/ float z) { - int seed = mSeed; - float sum = 0; - float amp = mFractalBounding; - - for (int i = 0; i < mOctaves; i++) { - float noise = FastAbs(GenNoiseSingle(seed++, x, y, z)); - sum += (noise * -2 + 1) * amp; - amp *= Lerp(1.0f, 1 - noise, mWeightedStrength); - - x *= mLacunarity; - y *= mLacunarity; - z *= mLacunarity; - amp *= mGain; - } - - return sum; - } - - - // Fractal PingPong - - private float GenFractalPingPong(/*FNLfloat*/ float x, /*FNLfloat*/ float y) { - int seed = mSeed; - float sum = 0; - float amp = mFractalBounding; - - for (int i = 0; i < mOctaves; i++) { - float noise = PingPong((GenNoiseSingle(seed++, x, y) + 1) * mPingPongStrength); - sum += (noise - 0.5f) * 2 * amp; - amp *= Lerp(1.0f, noise, mWeightedStrength); - - x *= mLacunarity; - y *= mLacunarity; - amp *= mGain; - } - - return sum; - } - - private float GenFractalPingPong(/*FNLfloat*/ float x, /*FNLfloat*/ float y, /*FNLfloat*/ float z) { - int seed = mSeed; - float sum = 0; - float amp = mFractalBounding; - - for (int i = 0; i < mOctaves; i++) { - float noise = PingPong((GenNoiseSingle(seed++, x, y, z) + 1) * mPingPongStrength); - sum += (noise - 0.5f) * 2 * amp; - amp *= Lerp(1.0f, noise, mWeightedStrength); - - x *= mLacunarity; - y *= mLacunarity; - z *= mLacunarity; - amp *= mGain; - } - - return sum; - } - - - // Simplex/OpenSimplex2 Noise - - private float SingleSimplex(int seed, /*FNLfloat*/ float x, /*FNLfloat*/ float y) { - // 2D OpenSimplex2 case uses the same algorithm as ordinary Simplex. - - final float SQRT3 = 1.7320508075688772935274463415059f; - final float G2 = (3 - SQRT3) / 6; - - /* - * --- Skew moved to switch statements before fractal evaluation --- - * final FNLfloat F2 = 0.5f * (SQRT3 - 1); - * FNLfloat s = (x + y) * F2; - * x += s; y += s; - */ - - int i = FastFloor(x); - int j = FastFloor(y); - float xi = (float) (x - i); - float yi = (float) (y - j); - - float t = (xi + yi) * G2; - float x0 = (float) (xi - t); - float y0 = (float) (yi - t); - - i *= PrimeX; - j *= PrimeY; - - float n0, n1, n2; - - float a = 0.5f - x0 * x0 - y0 * y0; - if (a <= 0) n0 = 0; - else { - n0 = (a * a) * (a * a) * GradCoord(seed, i, j, x0, y0); - } - - float c = (float) (2 * (1 - 2 * G2) * (1 / G2 - 2)) * t + ((float) (-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a); - if (c <= 0) n2 = 0; - else { - float x2 = x0 + (2 * (float) G2 - 1); - float y2 = y0 + (2 * (float) G2 - 1); - n2 = (c * c) * (c * c) * GradCoord(seed, i + PrimeX, j + PrimeY, x2, y2); - } - - if (y0 > x0) { - float x1 = x0 + (float) G2; - float y1 = y0 + ((float) G2 - 1); - float b = 0.5f - x1 * x1 - y1 * y1; - if (b <= 0) n1 = 0; - else { - n1 = (b * b) * (b * b) * GradCoord(seed, i, j + PrimeY, x1, y1); - } - } else { - float x1 = x0 + ((float) G2 - 1); - float y1 = y0 + (float) G2; - float b = 0.5f - x1 * x1 - y1 * y1; - if (b <= 0) n1 = 0; - else { - n1 = (b * b) * (b * b) * GradCoord(seed, i + PrimeX, j, x1, y1); - } - } - - return (n0 + n1 + n2) * 99.83685446303647f; - } - - private float SingleOpenSimplex2(int seed, /*FNLfloat*/ float x, /*FNLfloat*/ float y, /*FNLfloat*/ float z) { - // 3D OpenSimplex2 case uses two offset rotated cube grids. - - /* - * --- Rotation moved to switch statements before fractal evaluation --- - * final FNLfloat R3 = (FNLfloat)(2.0 / 3.0); - * FNLfloat r = (x + y + z) * R3; // Rotation, not skew - * x = r - x; y = r - y; z = r - z; - */ - - int i = FastRound(x); - int j = FastRound(y); - int k = FastRound(z); - float x0 = (float) (x - i); - float y0 = (float) (y - j); - float z0 = (float) (z - k); - - int xNSign = (int) (-1.0f - x0) | 1; - int yNSign = (int) (-1.0f - y0) | 1; - int zNSign = (int) (-1.0f - z0) | 1; - - float ax0 = xNSign * -x0; - float ay0 = yNSign * -y0; - float az0 = zNSign * -z0; - - i *= PrimeX; - j *= PrimeY; - k *= PrimeZ; - - float value = 0; - float a = (0.6f - x0 * x0) - (y0 * y0 + z0 * z0); - - for (int l = 0; ; l++) { - if (a > 0) { - value += (a * a) * (a * a) * GradCoord(seed, i, j, k, x0, y0, z0); - } - - if (ax0 >= ay0 && ax0 >= az0) { - float b = a + ax0 + ax0; - if (b > 1) { - b -= 1; - value += (b * b) * (b * b) * GradCoord(seed, i - xNSign * PrimeX, j, k, x0 + xNSign, y0, z0); - } - } else if (ay0 > ax0 && ay0 >= az0) { - float b = a + ay0 + ay0; - if (b > 1) { - b -= 1; - value += (b * b) * (b * b) * GradCoord(seed, i, j - yNSign * PrimeY, k, x0, y0 + yNSign, z0); - } - } else { - float b = a + az0 + az0; - if (b > 1) { - b -= 1; - value += (b * b) * (b * b) * GradCoord(seed, i, j, k - zNSign * PrimeZ, x0, y0, z0 + zNSign); - } - } - - if (l == 1) break; - - ax0 = 0.5f - ax0; - ay0 = 0.5f - ay0; - az0 = 0.5f - az0; - - x0 = xNSign * ax0; - y0 = yNSign * ay0; - z0 = zNSign * az0; - - a += (0.75f - ax0) - (ay0 + az0); - - i += (xNSign >> 1) & PrimeX; - j += (yNSign >> 1) & PrimeY; - k += (zNSign >> 1) & PrimeZ; - - xNSign = -xNSign; - yNSign = -yNSign; - zNSign = -zNSign; - - seed = ~seed; - } - - return value * 32.69428253173828125f; - } - - - // OpenSimplex2S Noise - - private float SingleOpenSimplex2S(int seed, /*FNLfloat*/ float x, /*FNLfloat*/ float y) { - // 2D OpenSimplex2S case is a modified 2D simplex noise. - - final /*FNLfloat*/ float SQRT3 = (/*FNLfloat*/ float) 1.7320508075688772935274463415059; - final /*FNLfloat*/ float G2 = (3 - SQRT3) / 6; - - /* - * --- Skew moved to TransformNoiseCoordinate method --- - * final FNLfloat F2 = 0.5f * (SQRT3 - 1); - * FNLfloat s = (x + y) * F2; - * x += s; y += s; - */ - - int i = FastFloor(x); - int j = FastFloor(y); - float xi = (float) (x - i); - float yi = (float) (y - j); - - i *= PrimeX; - j *= PrimeY; - int i1 = i + PrimeX; - int j1 = j + PrimeY; - - float t = (xi + yi) * (float) G2; - float x0 = xi - t; - float y0 = yi - t; - - float a0 = (2.0f / 3.0f) - x0 * x0 - y0 * y0; - float value = (a0 * a0) * (a0 * a0) * GradCoord(seed, i, j, x0, y0); - - float a1 = (float) (2 * (1 - 2 * G2) * (1 / G2 - 2)) * t + ((float) (-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a0); - float x1 = x0 - (float) (1 - 2 * G2); - float y1 = y0 - (float) (1 - 2 * G2); - value += (a1 * a1) * (a1 * a1) * GradCoord(seed, i1, j1, x1, y1); - - // Nested conditionals were faster than compact bit logic/arithmetic. - float xmyi = xi - yi; - if (t > G2) { - if (xi + xmyi > 1) { - float x2 = x0 + (float) (3 * G2 - 2); - float y2 = y0 + (float) (3 * G2 - 1); - float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; - if (a2 > 0) { - value += (a2 * a2) * (a2 * a2) * GradCoord(seed, i + (PrimeX << 1), j + PrimeY, x2, y2); - } - } else { - float x2 = x0 + (float) G2; - float y2 = y0 + (float) (G2 - 1); - float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; - if (a2 > 0) { - value += (a2 * a2) * (a2 * a2) * GradCoord(seed, i, j + PrimeY, x2, y2); - } - } - - if (yi - xmyi > 1) { - float x3 = x0 + (float) (3 * G2 - 1); - float y3 = y0 + (float) (3 * G2 - 2); - float a3 = (2.0f / 3.0f) - x3 * x3 - y3 * y3; - if (a3 > 0) { - value += (a3 * a3) * (a3 * a3) * GradCoord(seed, i + PrimeX, j + (PrimeY << 1), x3, y3); - } - } else { - float x3 = x0 + (float) (G2 - 1); - float y3 = y0 + (float) G2; - float a3 = (2.0f / 3.0f) - x3 * x3 - y3 * y3; - if (a3 > 0) { - value += (a3 * a3) * (a3 * a3) * GradCoord(seed, i + PrimeX, j, x3, y3); - } - } - } else { - if (xi + xmyi < 0) { - float x2 = x0 + (float) (1 - G2); - float y2 = y0 - (float) G2; - float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; - if (a2 > 0) { - value += (a2 * a2) * (a2 * a2) * GradCoord(seed, i - PrimeX, j, x2, y2); - } - } else { - float x2 = x0 + (float) (G2 - 1); - float y2 = y0 + (float) G2; - float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; - if (a2 > 0) { - value += (a2 * a2) * (a2 * a2) * GradCoord(seed, i + PrimeX, j, x2, y2); - } - } - - if (yi < xmyi) { - float x2 = x0 - (float) G2; - float y2 = y0 - (float) (G2 - 1); - float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; - if (a2 > 0) { - value += (a2 * a2) * (a2 * a2) * GradCoord(seed, i, j - PrimeY, x2, y2); - } - } else { - float x2 = x0 + (float) G2; - float y2 = y0 + (float) (G2 - 1); - float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; - if (a2 > 0) { - value += (a2 * a2) * (a2 * a2) * GradCoord(seed, i, j + PrimeY, x2, y2); - } - } - } - - return value * 18.24196194486065f; - } - - private float SingleOpenSimplex2S(int seed, /*FNLfloat*/ float x, /*FNLfloat*/ float y, /*FNLfloat*/ float z) { - // 3D OpenSimplex2S case uses two offset rotated cube grids. - - /* - * --- Rotation moved to TransformNoiseCoordinate method --- - * final FNLfloat R3 = (FNLfloat)(2.0 / 3.0); - * FNLfloat r = (x + y + z) * R3; // Rotation, not skew - * x = r - x; y = r - y; z = r - z; - */ - - int i = FastFloor(x); - int j = FastFloor(y); - int k = FastFloor(z); - float xi = (float) (x - i); - float yi = (float) (y - j); - float zi = (float) (z - k); - - i *= PrimeX; - j *= PrimeY; - k *= PrimeZ; - int seed2 = seed + 1293373; - - int xNMask = (int) (-0.5f - xi); - int yNMask = (int) (-0.5f - yi); - int zNMask = (int) (-0.5f - zi); - - float x0 = xi + xNMask; - float y0 = yi + yNMask; - float z0 = zi + zNMask; - float a0 = 0.75f - x0 * x0 - y0 * y0 - z0 * z0; - float value = (a0 * a0) * (a0 * a0) * GradCoord(seed, - i + (xNMask & PrimeX), j + (yNMask & PrimeY), k + (zNMask & PrimeZ), x0, y0, z0); - - float x1 = xi - 0.5f; - float y1 = yi - 0.5f; - float z1 = zi - 0.5f; - float a1 = 0.75f - x1 * x1 - y1 * y1 - z1 * z1; - value += (a1 * a1) * (a1 * a1) * GradCoord(seed2, - i + PrimeX, j + PrimeY, k + PrimeZ, x1, y1, z1); - - float xAFlipMask0 = ((xNMask | 1) << 1) * x1; - float yAFlipMask0 = ((yNMask | 1) << 1) * y1; - float zAFlipMask0 = ((zNMask | 1) << 1) * z1; - float xAFlipMask1 = (-2 - (xNMask << 2)) * x1 - 1.0f; - float yAFlipMask1 = (-2 - (yNMask << 2)) * y1 - 1.0f; - float zAFlipMask1 = (-2 - (zNMask << 2)) * z1 - 1.0f; - - boolean skip5 = false; - float a2 = xAFlipMask0 + a0; - if (a2 > 0) { - float x2 = x0 - (xNMask | 1); - float y2 = y0; - float z2 = z0; - value += (a2 * a2) * (a2 * a2) * GradCoord(seed, - i + (~xNMask & PrimeX), j + (yNMask & PrimeY), k + (zNMask & PrimeZ), x2, y2, z2); - } else { - float a3 = yAFlipMask0 + zAFlipMask0 + a0; - if (a3 > 0) { - float x3 = x0; - float y3 = y0 - (yNMask | 1); - float z3 = z0 - (zNMask | 1); - value += (a3 * a3) * (a3 * a3) * GradCoord(seed, - i + (xNMask & PrimeX), j + (~yNMask & PrimeY), k + (~zNMask & PrimeZ), x3, y3, z3); - } - - float a4 = xAFlipMask1 + a1; - if (a4 > 0) { - float x4 = (xNMask | 1) + x1; - float y4 = y1; - float z4 = z1; - value += (a4 * a4) * (a4 * a4) * GradCoord(seed2, - i + (xNMask & (PrimeX * 2)), j + PrimeY, k + PrimeZ, x4, y4, z4); - skip5 = true; - } - } - - boolean skip9 = false; - float a6 = yAFlipMask0 + a0; - if (a6 > 0) { - float x6 = x0; - float y6 = y0 - (yNMask | 1); - float z6 = z0; - value += (a6 * a6) * (a6 * a6) * GradCoord(seed, - i + (xNMask & PrimeX), j + (~yNMask & PrimeY), k + (zNMask & PrimeZ), x6, y6, z6); - } else { - float a7 = xAFlipMask0 + zAFlipMask0 + a0; - if (a7 > 0) { - float x7 = x0 - (xNMask | 1); - float y7 = y0; - float z7 = z0 - (zNMask | 1); - value += (a7 * a7) * (a7 * a7) * GradCoord(seed, - i + (~xNMask & PrimeX), j + (yNMask & PrimeY), k + (~zNMask & PrimeZ), x7, y7, z7); - } - - float a8 = yAFlipMask1 + a1; - if (a8 > 0) { - float x8 = x1; - float y8 = (yNMask | 1) + y1; - float z8 = z1; - value += (a8 * a8) * (a8 * a8) * GradCoord(seed2, - i + PrimeX, j + (yNMask & (PrimeY << 1)), k + PrimeZ, x8, y8, z8); - skip9 = true; - } - } - - boolean skipD = false; - float aA = zAFlipMask0 + a0; - if (aA > 0) { - float xA = x0; - float yA = y0; - float zA = z0 - (zNMask | 1); - value += (aA * aA) * (aA * aA) * GradCoord(seed, - i + (xNMask & PrimeX), j + (yNMask & PrimeY), k + (~zNMask & PrimeZ), xA, yA, zA); - } else { - float aB = xAFlipMask0 + yAFlipMask0 + a0; - if (aB > 0) { - float xB = x0 - (xNMask | 1); - float yB = y0 - (yNMask | 1); - float zB = z0; - value += (aB * aB) * (aB * aB) * GradCoord(seed, - i + (~xNMask & PrimeX), j + (~yNMask & PrimeY), k + (zNMask & PrimeZ), xB, yB, zB); - } - - float aC = zAFlipMask1 + a1; - if (aC > 0) { - float xC = x1; - float yC = y1; - float zC = (zNMask | 1) + z1; - value += (aC * aC) * (aC * aC) * GradCoord(seed2, - i + PrimeX, j + PrimeY, k + (zNMask & (PrimeZ << 1)), xC, yC, zC); - skipD = true; - } - } - - if (!skip5) { - float a5 = yAFlipMask1 + zAFlipMask1 + a1; - if (a5 > 0) { - float x5 = x1; - float y5 = (yNMask | 1) + y1; - float z5 = (zNMask | 1) + z1; - value += (a5 * a5) * (a5 * a5) * GradCoord(seed2, - i + PrimeX, j + (yNMask & (PrimeY << 1)), k + (zNMask & (PrimeZ << 1)), x5, y5, z5); - } - } - - if (!skip9) { - float a9 = xAFlipMask1 + zAFlipMask1 + a1; - if (a9 > 0) { - float x9 = (xNMask | 1) + x1; - float y9 = y1; - float z9 = (zNMask | 1) + z1; - value += (a9 * a9) * (a9 * a9) * GradCoord(seed2, - i + (xNMask & (PrimeX * 2)), j + PrimeY, k + (zNMask & (PrimeZ << 1)), x9, y9, z9); - } - } - - if (!skipD) { - float aD = xAFlipMask1 + yAFlipMask1 + a1; - if (aD > 0) { - float xD = (xNMask | 1) + x1; - float yD = (yNMask | 1) + y1; - float zD = z1; - value += (aD * aD) * (aD * aD) * GradCoord(seed2, - i + (xNMask & (PrimeX << 1)), j + (yNMask & (PrimeY << 1)), k + PrimeZ, xD, yD, zD); - } - } - - return value * 9.046026385208288f; - } - - - // Cellular Noise - - private float SingleCellular(int seed, /*FNLfloat*/ float x, /*FNLfloat*/ float y) { - int xr = FastRound(x); - int yr = FastRound(y); - - float distance0 = Float.MAX_VALUE; - float distance1 = Float.MAX_VALUE; - int closestHash = 0; - - float cellularJitter = 0.43701595f * mCellularJitterModifier; - - int xPrimed = (xr - 1) * PrimeX; - int yPrimedBase = (yr - 1) * PrimeY; - - switch (mCellularDistanceFunction) { - default: - case Euclidean: - case EuclideanSq: - for (int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for (int yi = yr - 1; yi <= yr + 1; yi++) { - int hash = Hash(seed, xPrimed, yPrimed); - int idx = hash & (255 << 1); - - float vecX = (float) (xi - x) + RandVecs2D[idx] * cellularJitter; - float vecY = (float) (yi - y) + RandVecs2D[idx | 1] * cellularJitter; - - float newDistance = vecX * vecX + vecY * vecY; - - distance1 = FastMax(FastMin(distance1, newDistance), distance0); - if (newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - } - yPrimed += PrimeY; - } - xPrimed += PrimeX; - } - break; - case Manhattan: - for (int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for (int yi = yr - 1; yi <= yr + 1; yi++) { - int hash = Hash(seed, xPrimed, yPrimed); - int idx = hash & (255 << 1); - - float vecX = (float) (xi - x) + RandVecs2D[idx] * cellularJitter; - float vecY = (float) (yi - y) + RandVecs2D[idx | 1] * cellularJitter; - - float newDistance = FastAbs(vecX) + FastAbs(vecY); - - distance1 = FastMax(FastMin(distance1, newDistance), distance0); - if (newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - } - yPrimed += PrimeY; - } - xPrimed += PrimeX; - } - break; - case Hybrid: - for (int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for (int yi = yr - 1; yi <= yr + 1; yi++) { - int hash = Hash(seed, xPrimed, yPrimed); - int idx = hash & (255 << 1); - - float vecX = (float) (xi - x) + RandVecs2D[idx] * cellularJitter; - float vecY = (float) (yi - y) + RandVecs2D[idx | 1] * cellularJitter; - - float newDistance = (FastAbs(vecX) + FastAbs(vecY)) + (vecX * vecX + vecY * vecY); - - distance1 = FastMax(FastMin(distance1, newDistance), distance0); - if (newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - } - yPrimed += PrimeY; - } - xPrimed += PrimeX; - } - break; - } - - if (mCellularDistanceFunction == CellularDistanceFunction.Euclidean && mCellularReturnType != CellularReturnType.CellValue) { - distance0 = FastSqrt(distance0); - - if (mCellularReturnType != CellularReturnType.Distance) { - distance1 = FastSqrt(distance1); - } - } - - switch (mCellularReturnType) { - case CellValue: - return closestHash * (1 / 2147483648.0f); - case Distance: - return distance0 - 1; - case Distance2: - return distance1 - 1; - case Distance2Add: - return (distance1 + distance0) * 0.5f - 1; - case Distance2Sub: - return distance1 - distance0 - 1; - case Distance2Mul: - return distance1 * distance0 * 0.5f - 1; - case Distance2Div: - return distance0 / distance1 - 1; - default: - return 0; - } - } - - private float SingleCellular(int seed, /*FNLfloat*/ float x, /*FNLfloat*/ float y, /*FNLfloat*/ float z) { - int xr = FastRound(x); - int yr = FastRound(y); - int zr = FastRound(z); - - float distance0 = Float.MAX_VALUE; - float distance1 = Float.MAX_VALUE; - int closestHash = 0; - - float cellularJitter = 0.39614353f * mCellularJitterModifier; - - int xPrimed = (xr - 1) * PrimeX; - int yPrimedBase = (yr - 1) * PrimeY; - int zPrimedBase = (zr - 1) * PrimeZ; - - switch (mCellularDistanceFunction) { - case Euclidean: - case EuclideanSq: - for (int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for (int yi = yr - 1; yi <= yr + 1; yi++) { - int zPrimed = zPrimedBase; - - for (int zi = zr - 1; zi <= zr + 1; zi++) { - int hash = Hash(seed, xPrimed, yPrimed, zPrimed); - int idx = hash & (255 << 2); - - float vecX = (float) (xi - x) + RandVecs3D[idx] * cellularJitter; - float vecY = (float) (yi - y) + RandVecs3D[idx | 1] * cellularJitter; - float vecZ = (float) (zi - z) + RandVecs3D[idx | 2] * cellularJitter; - - float newDistance = vecX * vecX + vecY * vecY + vecZ * vecZ; - - distance1 = FastMax(FastMin(distance1, newDistance), distance0); - if (newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - } - zPrimed += PrimeZ; - } - yPrimed += PrimeY; - } - xPrimed += PrimeX; - } - break; - case Manhattan: - for (int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for (int yi = yr - 1; yi <= yr + 1; yi++) { - int zPrimed = zPrimedBase; - - for (int zi = zr - 1; zi <= zr + 1; zi++) { - int hash = Hash(seed, xPrimed, yPrimed, zPrimed); - int idx = hash & (255 << 2); - - float vecX = (float) (xi - x) + RandVecs3D[idx] * cellularJitter; - float vecY = (float) (yi - y) + RandVecs3D[idx | 1] * cellularJitter; - float vecZ = (float) (zi - z) + RandVecs3D[idx | 2] * cellularJitter; - - float newDistance = FastAbs(vecX) + FastAbs(vecY) + FastAbs(vecZ); - - distance1 = FastMax(FastMin(distance1, newDistance), distance0); - if (newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - } - zPrimed += PrimeZ; - } - yPrimed += PrimeY; - } - xPrimed += PrimeX; - } - break; - case Hybrid: - for (int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for (int yi = yr - 1; yi <= yr + 1; yi++) { - int zPrimed = zPrimedBase; - - for (int zi = zr - 1; zi <= zr + 1; zi++) { - int hash = Hash(seed, xPrimed, yPrimed, zPrimed); - int idx = hash & (255 << 2); - - float vecX = (float) (xi - x) + RandVecs3D[idx] * cellularJitter; - float vecY = (float) (yi - y) + RandVecs3D[idx | 1] * cellularJitter; - float vecZ = (float) (zi - z) + RandVecs3D[idx | 2] * cellularJitter; - - float newDistance = (FastAbs(vecX) + FastAbs(vecY) + FastAbs(vecZ)) + (vecX * vecX + vecY * vecY + vecZ * vecZ); - - distance1 = FastMax(FastMin(distance1, newDistance), distance0); - if (newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - } - zPrimed += PrimeZ; - } - yPrimed += PrimeY; - } - xPrimed += PrimeX; - } - break; - default: - break; - } - - if (mCellularDistanceFunction == CellularDistanceFunction.Euclidean && mCellularReturnType != CellularReturnType.CellValue) { - distance0 = FastSqrt(distance0); - - if (mCellularReturnType != CellularReturnType.Distance) { - distance1 = FastSqrt(distance1); - } - } - - switch (mCellularReturnType) { - case CellValue: - return closestHash * (1 / 2147483648.0f); - case Distance: - return distance0 - 1; - case Distance2: - return distance1 - 1; - case Distance2Add: - return (distance1 + distance0) * 0.5f - 1; - case Distance2Sub: - return distance1 - distance0 - 1; - case Distance2Mul: - return distance1 * distance0 * 0.5f - 1; - case Distance2Div: - return distance0 / distance1 - 1; - default: - return 0; - } - } - - - // Perlin Noise - - private float SinglePerlin(int seed, /*FNLfloat*/ float x, /*FNLfloat*/ float y) { - int x0 = FastFloor(x); - int y0 = FastFloor(y); - - float xd0 = (float) (x - x0); - float yd0 = (float) (y - y0); - float xd1 = xd0 - 1; - float yd1 = yd0 - 1; - - float xs = InterpQuintic(xd0); - float ys = InterpQuintic(yd0); - - x0 *= PrimeX; - y0 *= PrimeY; - int x1 = x0 + PrimeX; - int y1 = y0 + PrimeY; - - float xf0 = Lerp(GradCoord(seed, x0, y0, xd0, yd0), GradCoord(seed, x1, y0, xd1, yd0), xs); - float xf1 = Lerp(GradCoord(seed, x0, y1, xd0, yd1), GradCoord(seed, x1, y1, xd1, yd1), xs); - - return Lerp(xf0, xf1, ys) * 1.4247691104677813f; - } - - private float SinglePerlin(int seed, /*FNLfloat*/ float x, /*FNLfloat*/ float y, /*FNLfloat*/ float z) { - int x0 = FastFloor(x); - int y0 = FastFloor(y); - int z0 = FastFloor(z); - - float xd0 = (float) (x - x0); - float yd0 = (float) (y - y0); - float zd0 = (float) (z - z0); - float xd1 = xd0 - 1; - float yd1 = yd0 - 1; - float zd1 = zd0 - 1; - - float xs = InterpQuintic(xd0); - float ys = InterpQuintic(yd0); - float zs = InterpQuintic(zd0); - - x0 *= PrimeX; - y0 *= PrimeY; - z0 *= PrimeZ; - int x1 = x0 + PrimeX; - int y1 = y0 + PrimeY; - int z1 = z0 + PrimeZ; - - float xf00 = Lerp(GradCoord(seed, x0, y0, z0, xd0, yd0, zd0), GradCoord(seed, x1, y0, z0, xd1, yd0, zd0), xs); - float xf10 = Lerp(GradCoord(seed, x0, y1, z0, xd0, yd1, zd0), GradCoord(seed, x1, y1, z0, xd1, yd1, zd0), xs); - float xf01 = Lerp(GradCoord(seed, x0, y0, z1, xd0, yd0, zd1), GradCoord(seed, x1, y0, z1, xd1, yd0, zd1), xs); - float xf11 = Lerp(GradCoord(seed, x0, y1, z1, xd0, yd1, zd1), GradCoord(seed, x1, y1, z1, xd1, yd1, zd1), xs); - - float yf0 = Lerp(xf00, xf10, ys); - float yf1 = Lerp(xf01, xf11, ys); - - return Lerp(yf0, yf1, zs) * 0.964921414852142333984375f; - } - - - // Value Cubic Noise - - private float SingleValueCubic(int seed, /*FNLfloat*/ float x, /*FNLfloat*/ float y) { - int x1 = FastFloor(x); - int y1 = FastFloor(y); - - float xs = (float) (x - x1); - float ys = (float) (y - y1); - - x1 *= PrimeX; - y1 *= PrimeY; - int x0 = x1 - PrimeX; - int y0 = y1 - PrimeY; - int x2 = x1 + PrimeX; - int y2 = y1 + PrimeY; - int x3 = x1 + (PrimeX << 1); - int y3 = y1 + (PrimeY << 1); - - return CubicLerp( - CubicLerp(ValCoord(seed, x0, y0), ValCoord(seed, x1, y0), ValCoord(seed, x2, y0), ValCoord(seed, x3, y0), - xs), - CubicLerp(ValCoord(seed, x0, y1), ValCoord(seed, x1, y1), ValCoord(seed, x2, y1), ValCoord(seed, x3, y1), - xs), - CubicLerp(ValCoord(seed, x0, y2), ValCoord(seed, x1, y2), ValCoord(seed, x2, y2), ValCoord(seed, x3, y2), - xs), - CubicLerp(ValCoord(seed, x0, y3), ValCoord(seed, x1, y3), ValCoord(seed, x2, y3), ValCoord(seed, x3, y3), - xs), - ys) * (1 / (1.5f * 1.5f)); - } - - private float SingleValueCubic(int seed, /*FNLfloat*/ float x, /*FNLfloat*/ float y, /*FNLfloat*/ float z) { - int x1 = FastFloor(x); - int y1 = FastFloor(y); - int z1 = FastFloor(z); - - float xs = (float) (x - x1); - float ys = (float) (y - y1); - float zs = (float) (z - z1); - - x1 *= PrimeX; - y1 *= PrimeY; - z1 *= PrimeZ; - - int x0 = x1 - PrimeX; - int y0 = y1 - PrimeY; - int z0 = z1 - PrimeZ; - int x2 = x1 + PrimeX; - int y2 = y1 + PrimeY; - int z2 = z1 + PrimeZ; - int x3 = x1 + (PrimeX << 1); - int y3 = y1 + (PrimeY << 1); - int z3 = z1 + (PrimeZ << 1); - - - return CubicLerp( - CubicLerp( - CubicLerp(ValCoord(seed, x0, y0, z0), ValCoord(seed, x1, y0, z0), ValCoord(seed, x2, y0, z0), ValCoord(seed, x3, y0, z0), xs), - CubicLerp(ValCoord(seed, x0, y1, z0), ValCoord(seed, x1, y1, z0), ValCoord(seed, x2, y1, z0), ValCoord(seed, x3, y1, z0), xs), - CubicLerp(ValCoord(seed, x0, y2, z0), ValCoord(seed, x1, y2, z0), ValCoord(seed, x2, y2, z0), ValCoord(seed, x3, y2, z0), xs), - CubicLerp(ValCoord(seed, x0, y3, z0), ValCoord(seed, x1, y3, z0), ValCoord(seed, x2, y3, z0), ValCoord(seed, x3, y3, z0), xs), - ys), - CubicLerp( - CubicLerp(ValCoord(seed, x0, y0, z1), ValCoord(seed, x1, y0, z1), ValCoord(seed, x2, y0, z1), ValCoord(seed, x3, y0, z1), xs), - CubicLerp(ValCoord(seed, x0, y1, z1), ValCoord(seed, x1, y1, z1), ValCoord(seed, x2, y1, z1), ValCoord(seed, x3, y1, z1), xs), - CubicLerp(ValCoord(seed, x0, y2, z1), ValCoord(seed, x1, y2, z1), ValCoord(seed, x2, y2, z1), ValCoord(seed, x3, y2, z1), xs), - CubicLerp(ValCoord(seed, x0, y3, z1), ValCoord(seed, x1, y3, z1), ValCoord(seed, x2, y3, z1), ValCoord(seed, x3, y3, z1), xs), - ys), - CubicLerp( - CubicLerp(ValCoord(seed, x0, y0, z2), ValCoord(seed, x1, y0, z2), ValCoord(seed, x2, y0, z2), ValCoord(seed, x3, y0, z2), xs), - CubicLerp(ValCoord(seed, x0, y1, z2), ValCoord(seed, x1, y1, z2), ValCoord(seed, x2, y1, z2), ValCoord(seed, x3, y1, z2), xs), - CubicLerp(ValCoord(seed, x0, y2, z2), ValCoord(seed, x1, y2, z2), ValCoord(seed, x2, y2, z2), ValCoord(seed, x3, y2, z2), xs), - CubicLerp(ValCoord(seed, x0, y3, z2), ValCoord(seed, x1, y3, z2), ValCoord(seed, x2, y3, z2), ValCoord(seed, x3, y3, z2), xs), - ys), - CubicLerp( - CubicLerp(ValCoord(seed, x0, y0, z3), ValCoord(seed, x1, y0, z3), ValCoord(seed, x2, y0, z3), ValCoord(seed, x3, y0, z3), xs), - CubicLerp(ValCoord(seed, x0, y1, z3), ValCoord(seed, x1, y1, z3), ValCoord(seed, x2, y1, z3), ValCoord(seed, x3, y1, z3), xs), - CubicLerp(ValCoord(seed, x0, y2, z3), ValCoord(seed, x1, y2, z3), ValCoord(seed, x2, y2, z3), ValCoord(seed, x3, y2, z3), xs), - CubicLerp(ValCoord(seed, x0, y3, z3), ValCoord(seed, x1, y3, z3), ValCoord(seed, x2, y3, z3), ValCoord(seed, x3, y3, z3), xs), - ys), - zs) * (1 / (1.5f * 1.5f * 1.5f)); - } - - - // Value Noise - - private float SingleValue(int seed, /*FNLfloat*/ float x, /*FNLfloat*/ float y) { - int x0 = FastFloor(x); - int y0 = FastFloor(y); - - float xs = InterpHermite((float) (x - x0)); - float ys = InterpHermite((float) (y - y0)); - - x0 *= PrimeX; - y0 *= PrimeY; - int x1 = x0 + PrimeX; - int y1 = y0 + PrimeY; - - float xf0 = Lerp(ValCoord(seed, x0, y0), ValCoord(seed, x1, y0), xs); - float xf1 = Lerp(ValCoord(seed, x0, y1), ValCoord(seed, x1, y1), xs); - - return Lerp(xf0, xf1, ys); - } - - private float SingleValue(int seed, /*FNLfloat*/ float x, /*FNLfloat*/ float y, /*FNLfloat*/ float z) { - int x0 = FastFloor(x); - int y0 = FastFloor(y); - int z0 = FastFloor(z); - - float xs = InterpHermite((float) (x - x0)); - float ys = InterpHermite((float) (y - y0)); - float zs = InterpHermite((float) (z - z0)); - - x0 *= PrimeX; - y0 *= PrimeY; - z0 *= PrimeZ; - int x1 = x0 + PrimeX; - int y1 = y0 + PrimeY; - int z1 = z0 + PrimeZ; - - float xf00 = Lerp(ValCoord(seed, x0, y0, z0), ValCoord(seed, x1, y0, z0), xs); - float xf10 = Lerp(ValCoord(seed, x0, y1, z0), ValCoord(seed, x1, y1, z0), xs); - float xf01 = Lerp(ValCoord(seed, x0, y0, z1), ValCoord(seed, x1, y0, z1), xs); - float xf11 = Lerp(ValCoord(seed, x0, y1, z1), ValCoord(seed, x1, y1, z1), xs); - - float yf0 = Lerp(xf00, xf10, ys); - float yf1 = Lerp(xf01, xf11, ys); - - return Lerp(yf0, yf1, zs); - } - - - // Domain Warp - - private void DoSingleDomainWarp(int seed, float amp, float freq, /*FNLfloat*/ float x, /*FNLfloat*/ float y, Vector2 coord) { - switch (mDomainWarpType) { - case OpenSimplex2: - SingleDomainWarpSimplexGradient(seed, amp * 38.283687591552734375f, freq, x, y, coord, false); - break; - case OpenSimplex2Reduced: - SingleDomainWarpSimplexGradient(seed, amp * 16.0f, freq, x, y, coord, true); - break; - case BasicGrid: - SingleDomainWarpBasicGrid(seed, amp, freq, x, y, coord); - break; - } - } - - private void DoSingleDomainWarp(int seed, float amp, float freq, /*FNLfloat*/ float x, /*FNLfloat*/ float y, /*FNLfloat*/ float z, Vector3 coord) { - switch (mDomainWarpType) { - case OpenSimplex2: - SingleDomainWarpOpenSimplex2Gradient(seed, amp * 32.69428253173828125f, freq, x, y, z, coord, false); - break; - case OpenSimplex2Reduced: - SingleDomainWarpOpenSimplex2Gradient(seed, amp * 7.71604938271605f, freq, x, y, z, coord, true); - break; - case BasicGrid: - SingleDomainWarpBasicGrid(seed, amp, freq, x, y, z, coord); - break; - } - } - - - // Domain Warp Single Wrapper - - private void DomainWarpSingle(Vector2 coord) { - int seed = mSeed; - float amp = mDomainWarpAmp * mFractalBounding; - float freq = mFrequency; - - /*FNLfloat*/ - float xs = coord.x; - /*FNLfloat*/ - float ys = coord.y; - switch (mDomainWarpType) { - case OpenSimplex2: - case OpenSimplex2Reduced: { - final /*FNLfloat*/ float SQRT3 = (/*FNLfloat*/ float) 1.7320508075688772935274463415059; - final /*FNLfloat*/ float F2 = 0.5f * (SQRT3 - 1); - /*FNLfloat*/ - float t = (xs + ys) * F2; - xs += t; - ys += t; - } - break; - default: - break; - } - - DoSingleDomainWarp(seed, amp, freq, xs, ys, coord); - } - - private void DomainWarpSingle(Vector3 coord) { - int seed = mSeed; - float amp = mDomainWarpAmp * mFractalBounding; - float freq = mFrequency; - - /*FNLfloat*/ - float xs = coord.x; - /*FNLfloat*/ - float ys = coord.y; - /*FNLfloat*/ - float zs = coord.z; - switch (mWarpTransformType3D) { - case ImproveXYPlanes: { - /*FNLfloat*/ - float xy = xs + ys; - /*FNLfloat*/ - float s2 = xy * -(/*FNLfloat*/ float) 0.211324865405187; - zs *= (/*FNLfloat*/ float) 0.577350269189626; - xs += s2 - zs; - ys = ys + s2 - zs; - zs += xy * (/*FNLfloat*/ float) 0.577350269189626; - } - break; - case ImproveXZPlanes: { - /*FNLfloat*/ - float xz = xs + zs; - /*FNLfloat*/ - float s2 = xz * -(/*FNLfloat*/ float) 0.211324865405187; - ys *= (/*FNLfloat*/ float) 0.577350269189626; - xs += s2 - ys; - zs += s2 - ys; - ys += xz * (/*FNLfloat*/ float) 0.577350269189626; - } - break; - case DefaultOpenSimplex2: { - final /*FNLfloat*/ float R3 = (/*FNLfloat*/ float) (2.0 / 3.0); - /*FNLfloat*/ - float r = (xs + ys + zs) * R3; // Rotation, not skew - xs = r - xs; - ys = r - ys; - zs = r - zs; - } - break; - default: - break; - } - - DoSingleDomainWarp(seed, amp, freq, xs, ys, zs, coord); - } - - - // Domain Warp Fractal Progressive - - private void DomainWarpFractalProgressive(Vector2 coord) { - int seed = mSeed; - float amp = mDomainWarpAmp * mFractalBounding; - float freq = mFrequency; - - for (int i = 0; i < mOctaves; i++) { - /*FNLfloat*/ - float xs = coord.x; - /*FNLfloat*/ - float ys = coord.y; - switch (mDomainWarpType) { - case OpenSimplex2: - case OpenSimplex2Reduced: { - final /*FNLfloat*/ float SQRT3 = (/*FNLfloat*/ float) 1.7320508075688772935274463415059; - final /*FNLfloat*/ float F2 = 0.5f * (SQRT3 - 1); - /*FNLfloat*/ - float t = (xs + ys) * F2; - xs += t; - ys += t; - } - break; - default: - break; - } - - DoSingleDomainWarp(seed, amp, freq, xs, ys, coord); - - seed++; - amp *= mGain; - freq *= mLacunarity; - } - } - - private void DomainWarpFractalProgressive(Vector3 coord) { - int seed = mSeed; - float amp = mDomainWarpAmp * mFractalBounding; - float freq = mFrequency; - - for (int i = 0; i < mOctaves; i++) { - /*FNLfloat*/ - float xs = coord.x; - /*FNLfloat*/ - float ys = coord.y; - /*FNLfloat*/ - float zs = coord.z; - switch (mWarpTransformType3D) { - case ImproveXYPlanes: { - /*FNLfloat*/ - float xy = xs + ys; - /*FNLfloat*/ - float s2 = xy * -(/*FNLfloat*/ float) 0.211324865405187; - zs *= (/*FNLfloat*/ float) 0.577350269189626; - xs += s2 - zs; - ys = ys + s2 - zs; - zs += xy * (/*FNLfloat*/ float) 0.577350269189626; - } - break; - case ImproveXZPlanes: { - /*FNLfloat*/ - float xz = xs + zs; - /*FNLfloat*/ - float s2 = xz * -(/*FNLfloat*/ float) 0.211324865405187; - ys *= (/*FNLfloat*/ float) 0.577350269189626; - xs += s2 - ys; - zs += s2 - ys; - ys += xz * (/*FNLfloat*/ float) 0.577350269189626; - } - break; - case DefaultOpenSimplex2: { - final /*FNLfloat*/ float R3 = (/*FNLfloat*/ float) (2.0 / 3.0); - /*FNLfloat*/ - float r = (xs + ys + zs) * R3; // Rotation, not skew - xs = r - xs; - ys = r - ys; - zs = r - zs; - } - break; - default: - break; - } - - DoSingleDomainWarp(seed, amp, freq, xs, ys, zs, coord); - - seed++; - amp *= mGain; - freq *= mLacunarity; - } - } - - - // Domain Warp Fractal Independant - private void DomainWarpFractalIndependent(Vector2 coord) { - /*FNLfloat*/ - float xs = coord.x; - /*FNLfloat*/ - float ys = coord.y; - switch (mDomainWarpType) { - case OpenSimplex2: - case OpenSimplex2Reduced: { - final /*FNLfloat*/ float SQRT3 = (/*FNLfloat*/ float) 1.7320508075688772935274463415059; - final /*FNLfloat*/ float F2 = 0.5f * (SQRT3 - 1); - /*FNLfloat*/ - float t = (xs + ys) * F2; - xs += t; - ys += t; - } - break; - default: - break; - } - - int seed = mSeed; - float amp = mDomainWarpAmp * mFractalBounding; - float freq = mFrequency; - - for (int i = 0; i < mOctaves; i++) { - DoSingleDomainWarp(seed, amp, freq, xs, ys, coord); - - seed++; - amp *= mGain; - freq *= mLacunarity; - } - } - - private void DomainWarpFractalIndependent(Vector3 coord) { - /*FNLfloat*/ - float xs = coord.x; - /*FNLfloat*/ - float ys = coord.y; - /*FNLfloat*/ - float zs = coord.z; - switch (mWarpTransformType3D) { - case ImproveXYPlanes: { - /*FNLfloat*/ - float xy = xs + ys; - /*FNLfloat*/ - float s2 = xy * -(/*FNLfloat*/ float) 0.211324865405187; - zs *= (/*FNLfloat*/ float) 0.577350269189626; - xs += s2 - zs; - ys = ys + s2 - zs; - zs += xy * (/*FNLfloat*/ float) 0.577350269189626; - } - break; - case ImproveXZPlanes: { - /*FNLfloat*/ - float xz = xs + zs; - /*FNLfloat*/ - float s2 = xz * -(/*FNLfloat*/ float) 0.211324865405187; - ys *= (/*FNLfloat*/ float) 0.577350269189626; - xs += s2 - ys; - zs += s2 - ys; - ys += xz * (/*FNLfloat*/ float) 0.577350269189626; - } - break; - case DefaultOpenSimplex2: { - final /*FNLfloat*/ float R3 = (/*FNLfloat*/ float) (2.0 / 3.0); - /*FNLfloat*/ - float r = (xs + ys + zs) * R3; // Rotation, not skew - xs = r - xs; - ys = r - ys; - zs = r - zs; - } - break; - default: - break; - } - - int seed = mSeed; - float amp = mDomainWarpAmp * mFractalBounding; - float freq = mFrequency; - - for (int i = 0; i < mOctaves; i++) { - DoSingleDomainWarp(seed, amp, freq, xs, ys, zs, coord); - - seed++; - amp *= mGain; - freq *= mLacunarity; - } - } - - - // Domain Warp Basic Grid - - private void SingleDomainWarpBasicGrid(int seed, float warpAmp, float frequency, /*FNLfloat*/ float x, /*FNLfloat*/ float y, Vector2 coord) { - /*FNLfloat*/ - float xf = x * frequency; - /*FNLfloat*/ - float yf = y * frequency; - - int x0 = FastFloor(xf); - int y0 = FastFloor(yf); - - float xs = InterpHermite((float) (xf - x0)); - float ys = InterpHermite((float) (yf - y0)); - - x0 *= PrimeX; - y0 *= PrimeY; - int x1 = x0 + PrimeX; - int y1 = y0 + PrimeY; - - int hash0 = Hash(seed, x0, y0) & (255 << 1); - int hash1 = Hash(seed, x1, y0) & (255 << 1); - - float lx0x = Lerp(RandVecs2D[hash0], RandVecs2D[hash1], xs); - float ly0x = Lerp(RandVecs2D[hash0 | 1], RandVecs2D[hash1 | 1], xs); - - hash0 = Hash(seed, x0, y1) & (255 << 1); - hash1 = Hash(seed, x1, y1) & (255 << 1); - - float lx1x = Lerp(RandVecs2D[hash0], RandVecs2D[hash1], xs); - float ly1x = Lerp(RandVecs2D[hash0 | 1], RandVecs2D[hash1 | 1], xs); - - coord.x += Lerp(lx0x, lx1x, ys) * warpAmp; - coord.y += Lerp(ly0x, ly1x, ys) * warpAmp; - } - - private void SingleDomainWarpBasicGrid(int seed, float warpAmp, float frequency, /*FNLfloat*/ float x, /*FNLfloat*/ float y, /*FNLfloat*/ float z, Vector3 coord) { - /*FNLfloat*/ - float xf = x * frequency; - /*FNLfloat*/ - float yf = y * frequency; - /*FNLfloat*/ - float zf = z * frequency; - - int x0 = FastFloor(xf); - int y0 = FastFloor(yf); - int z0 = FastFloor(zf); - - float xs = InterpHermite((float) (xf - x0)); - float ys = InterpHermite((float) (yf - y0)); - float zs = InterpHermite((float) (zf - z0)); - - x0 *= PrimeX; - y0 *= PrimeY; - z0 *= PrimeZ; - int x1 = x0 + PrimeX; - int y1 = y0 + PrimeY; - int z1 = z0 + PrimeZ; - - int hash0 = Hash(seed, x0, y0, z0) & (255 << 2); - int hash1 = Hash(seed, x1, y0, z0) & (255 << 2); - - float lx0x = Lerp(RandVecs3D[hash0], RandVecs3D[hash1], xs); - float ly0x = Lerp(RandVecs3D[hash0 | 1], RandVecs3D[hash1 | 1], xs); - float lz0x = Lerp(RandVecs3D[hash0 | 2], RandVecs3D[hash1 | 2], xs); - - hash0 = Hash(seed, x0, y1, z0) & (255 << 2); - hash1 = Hash(seed, x1, y1, z0) & (255 << 2); - - float lx1x = Lerp(RandVecs3D[hash0], RandVecs3D[hash1], xs); - float ly1x = Lerp(RandVecs3D[hash0 | 1], RandVecs3D[hash1 | 1], xs); - float lz1x = Lerp(RandVecs3D[hash0 | 2], RandVecs3D[hash1 | 2], xs); - - float lx0y = Lerp(lx0x, lx1x, ys); - float ly0y = Lerp(ly0x, ly1x, ys); - float lz0y = Lerp(lz0x, lz1x, ys); - - hash0 = Hash(seed, x0, y0, z1) & (255 << 2); - hash1 = Hash(seed, x1, y0, z1) & (255 << 2); - - lx0x = Lerp(RandVecs3D[hash0], RandVecs3D[hash1], xs); - ly0x = Lerp(RandVecs3D[hash0 | 1], RandVecs3D[hash1 | 1], xs); - lz0x = Lerp(RandVecs3D[hash0 | 2], RandVecs3D[hash1 | 2], xs); - - hash0 = Hash(seed, x0, y1, z1) & (255 << 2); - hash1 = Hash(seed, x1, y1, z1) & (255 << 2); - - lx1x = Lerp(RandVecs3D[hash0], RandVecs3D[hash1], xs); - ly1x = Lerp(RandVecs3D[hash0 | 1], RandVecs3D[hash1 | 1], xs); - lz1x = Lerp(RandVecs3D[hash0 | 2], RandVecs3D[hash1 | 2], xs); - - coord.x += Lerp(lx0y, Lerp(lx0x, lx1x, ys), zs) * warpAmp; - coord.y += Lerp(ly0y, Lerp(ly0x, ly1x, ys), zs) * warpAmp; - coord.z += Lerp(lz0y, Lerp(lz0x, lz1x, ys), zs) * warpAmp; - } - - - // Domain Warp Simplex/OpenSimplex2 - private void SingleDomainWarpSimplexGradient(int seed, float warpAmp, float frequency, /*FNLfloat*/ float x, /*FNLfloat*/ float y, Vector2 coord, boolean outGradOnly) { - final float SQRT3 = 1.7320508075688772935274463415059f; - final float G2 = (3 - SQRT3) / 6; - - x *= frequency; - y *= frequency; - - /* - * --- Skew moved to switch statements before fractal evaluation --- - * final FNLfloat F2 = 0.5f * (SQRT3 - 1); - * FNLfloat s = (x + y) * F2; - * x += s; y += s; - */ - - int i = FastFloor(x); - int j = FastFloor(y); - float xi = (float) (x - i); - float yi = (float) (y - j); - - float t = (xi + yi) * G2; - float x0 = (float) (xi - t); - float y0 = (float) (yi - t); - - i *= PrimeX; - j *= PrimeY; - - float vx, vy; - vx = vy = 0; - - float a = 0.5f - x0 * x0 - y0 * y0; - if (a > 0) { - float aaaa = (a * a) * (a * a); - float xo, yo; - if (outGradOnly) { - int hash = Hash(seed, i, j) & (255 << 1); - xo = RandVecs2D[hash]; - yo = RandVecs2D[hash | 1]; - } else { - int hash = Hash(seed, i, j); - int index1 = hash & (127 << 1); - int index2 = (hash >> 7) & (255 << 1); - float xg = Gradients2D[index1]; - float yg = Gradients2D[index1 | 1]; - float value = x0 * xg + y0 * yg; - float xgo = RandVecs2D[index2]; - float ygo = RandVecs2D[index2 | 1]; - xo = value * xgo; - yo = value * ygo; - } - vx += aaaa * xo; - vy += aaaa * yo; - } - - float c = (float) (2 * (1 - 2 * G2) * (1 / G2 - 2)) * t + ((float) (-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a); - if (c > 0) { - float x2 = x0 + (2 * (float) G2 - 1); - float y2 = y0 + (2 * (float) G2 - 1); - float cccc = (c * c) * (c * c); - float xo, yo; - if (outGradOnly) { - int hash = Hash(seed, i + PrimeX, j + PrimeY) & (255 << 1); - xo = RandVecs2D[hash]; - yo = RandVecs2D[hash | 1]; - } else { - int hash = Hash(seed, i + PrimeX, j + PrimeY); - int index1 = hash & (127 << 1); - int index2 = (hash >> 7) & (255 << 1); - float xg = Gradients2D[index1]; - float yg = Gradients2D[index1 | 1]; - float value = x2 * xg + y2 * yg; - float xgo = RandVecs2D[index2]; - float ygo = RandVecs2D[index2 | 1]; - xo = value * xgo; - yo = value * ygo; - } - vx += cccc * xo; - vy += cccc * yo; - } - - if (y0 > x0) { - float x1 = x0 + (float) G2; - float y1 = y0 + ((float) G2 - 1); - float b = 0.5f - x1 * x1 - y1 * y1; - if (b > 0) { - float bbbb = (b * b) * (b * b); - float xo, yo; - if (outGradOnly) { - int hash = Hash(seed, i, j + PrimeY) & (255 << 1); - xo = RandVecs2D[hash]; - yo = RandVecs2D[hash | 1]; - } else { - int hash = Hash(seed, i, j + PrimeY); - int index1 = hash & (127 << 1); - int index2 = (hash >> 7) & (255 << 1); - float xg = Gradients2D[index1]; - float yg = Gradients2D[index1 | 1]; - float value = x1 * xg + y1 * yg; - float xgo = RandVecs2D[index2]; - float ygo = RandVecs2D[index2 | 1]; - xo = value * xgo; - yo = value * ygo; - } - vx += bbbb * xo; - vy += bbbb * yo; - } - } else { - float x1 = x0 + ((float) G2 - 1); - float y1 = y0 + (float) G2; - float b = 0.5f - x1 * x1 - y1 * y1; - if (b > 0) { - float bbbb = (b * b) * (b * b); - float xo, yo; - if (outGradOnly) { - int hash = Hash(seed, i + PrimeX, j) & (255 << 1); - xo = RandVecs2D[hash]; - yo = RandVecs2D[hash | 1]; - } else { - int hash = Hash(seed, i + PrimeX, j); - int index1 = hash & (127 << 1); - int index2 = (hash >> 7) & (255 << 1); - float xg = Gradients2D[index1]; - float yg = Gradients2D[index1 | 1]; - float value = x1 * xg + y1 * yg; - float xgo = RandVecs2D[index2]; - float ygo = RandVecs2D[index2 | 1]; - xo = value * xgo; - yo = value * ygo; - } - vx += bbbb * xo; - vy += bbbb * yo; - } - } - - coord.x += vx * warpAmp; - coord.y += vy * warpAmp; - } - - private void SingleDomainWarpOpenSimplex2Gradient(int seed, float warpAmp, float frequency, /*FNLfloat*/ float x, /*FNLfloat*/ float y, /*FNLfloat*/ float z, Vector3 coord, boolean outGradOnly) { - x *= frequency; - y *= frequency; - z *= frequency; - - /* - * --- Rotation moved to switch statements before fractal evaluation --- - * final FNLfloat R3 = (FNLfloat)(2.0 / 3.0); - * FNLfloat r = (x + y + z) * R3; // Rotation, not skew - * x = r - x; y = r - y; z = r - z; - */ - - int i = FastRound(x); - int j = FastRound(y); - int k = FastRound(z); - float x0 = (float) x - i; - float y0 = (float) y - j; - float z0 = (float) z - k; - - int xNSign = (int) (-x0 - 1.0f) | 1; - int yNSign = (int) (-y0 - 1.0f) | 1; - int zNSign = (int) (-z0 - 1.0f) | 1; - - float ax0 = xNSign * -x0; - float ay0 = yNSign * -y0; - float az0 = zNSign * -z0; - - i *= PrimeX; - j *= PrimeY; - k *= PrimeZ; - - float vx, vy, vz; - vx = vy = vz = 0; - - float a = (0.6f - x0 * x0) - (y0 * y0 + z0 * z0); - for (int l = 0; ; l++) { - if (a > 0) { - float aaaa = (a * a) * (a * a); - float xo, yo, zo; - if (outGradOnly) { - int hash = Hash(seed, i, j, k) & (255 << 2); - xo = RandVecs3D[hash]; - yo = RandVecs3D[hash | 1]; - zo = RandVecs3D[hash | 2]; - } else { - int hash = Hash(seed, i, j, k); - int index1 = hash & (63 << 2); - int index2 = (hash >> 6) & (255 << 2); - float xg = Gradients3D[index1]; - float yg = Gradients3D[index1 | 1]; - float zg = Gradients3D[index1 | 2]; - float value = x0 * xg + y0 * yg + z0 * zg; - float xgo = RandVecs3D[index2]; - float ygo = RandVecs3D[index2 | 1]; - float zgo = RandVecs3D[index2 | 2]; - xo = value * xgo; - yo = value * ygo; - zo = value * zgo; - } - vx += aaaa * xo; - vy += aaaa * yo; - vz += aaaa * zo; - } - - float b = a; - int i1 = i; - int j1 = j; - int k1 = k; - float x1 = x0; - float y1 = y0; - float z1 = z0; - - if (ax0 >= ay0 && ax0 >= az0) { - x1 += xNSign; - b = b + ax0 + ax0; - i1 -= xNSign * PrimeX; - } else if (ay0 > ax0 && ay0 >= az0) { - y1 += yNSign; - b = b + ay0 + ay0; - j1 -= yNSign * PrimeY; - } else { - z1 += zNSign; - b = b + az0 + az0; - k1 -= zNSign * PrimeZ; - } - - if (b > 1) { - b -= 1; - float bbbb = (b * b) * (b * b); - float xo, yo, zo; - if (outGradOnly) { - int hash = Hash(seed, i1, j1, k1) & (255 << 2); - xo = RandVecs3D[hash]; - yo = RandVecs3D[hash | 1]; - zo = RandVecs3D[hash | 2]; - } else { - int hash = Hash(seed, i1, j1, k1); - int index1 = hash & (63 << 2); - int index2 = (hash >> 6) & (255 << 2); - float xg = Gradients3D[index1]; - float yg = Gradients3D[index1 | 1]; - float zg = Gradients3D[index1 | 2]; - float value = x1 * xg + y1 * yg + z1 * zg; - float xgo = RandVecs3D[index2]; - float ygo = RandVecs3D[index2 | 1]; - float zgo = RandVecs3D[index2 | 2]; - xo = value * xgo; - yo = value * ygo; - zo = value * zgo; - } - vx += bbbb * xo; - vy += bbbb * yo; - vz += bbbb * zo; - } - - if (l == 1) break; - - ax0 = 0.5f - ax0; - ay0 = 0.5f - ay0; - az0 = 0.5f - az0; - - x0 = xNSign * ax0; - y0 = yNSign * ay0; - z0 = zNSign * az0; - - a += (0.75f - ax0) - (ay0 + az0); - - i += (xNSign >> 1) & PrimeX; - j += (yNSign >> 1) & PrimeY; - k += (zNSign >> 1) & PrimeZ; - - xNSign = -xNSign; - yNSign = -yNSign; - zNSign = -zNSign; - - seed += 1293373; - } - - coord.x += vx * warpAmp; - coord.y += vy * warpAmp; - coord.z += vz * warpAmp; - } - - public static class Vector2 { - public /*FNLfloat*/ float x; - public /*FNLfloat*/ float y; - - public Vector2(/*FNLfloat*/ float x, /*FNLfloat*/ float y) { - this.x = x; - this.y = y; - } - } - - public static class Vector3 { - public /*FNLfloat*/ float x; - public /*FNLfloat*/ float y; - public /*FNLfloat*/ float z; - - public Vector3(/*FNLfloat*/ float x, /*FNLfloat*/ float y, /*FNLfloat*/ float z) { - this.x = x; - this.y = y; - this.z = z; - } - } -} diff --git a/src/main/java/fr/openmc/core/utils/bootstrap/DatapackRegistry.java b/src/main/java/fr/openmc/core/utils/bootstrap/DatapackRegistry.java new file mode 100644 index 000000000..2bce5f29f --- /dev/null +++ b/src/main/java/fr/openmc/core/utils/bootstrap/DatapackRegistry.java @@ -0,0 +1,68 @@ +package fr.openmc.core.utils.bootstrap; + +import io.papermc.paper.datapack.DatapackRegistrar; +import io.papermc.paper.plugin.lifecycle.event.registrar.RegistrarEvent; +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; +import java.net.URI; +import java.nio.file.*; +import java.util.Map; +import java.util.stream.Stream; + +@SuppressWarnings("UnstableApiUsage") +public class DatapackRegistry { + /** + * Load datapacks from a given path and register them to the datapack registrar. + * ONLY USE IN BOOTSTRAP + * @param event the datapack registrar event + * @param path the path to the datapacks directory + */ + public static void load(RegistrarEvent<@NotNull DatapackRegistrar> event, Path path) { + try (Stream paths = Files.list(path)){ + paths.forEach(pathDir -> { + try { + event.registrar().discoverPack(pathDir.toUri(), pathDir.getFileName().toString()); + } catch (IOException e) { + throw new RuntimeException(e); + } + }); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * Extract datapacks from the plugin jar to a temporary directory and return the path to that directory. + * @param pluginSource the path to the plugin jar + * @return the path to the temporary directory containing the extracted datapacks + */ + public static Path extractDatapacks(Path pluginSource) { + try { + Path tempDir = Files.createTempDirectory("omc-datapacks"); + URI jarUri = URI.create("jar:" + pluginSource.toUri()); + + // on lit le .jar + try (FileSystem jarFs = FileSystems.newFileSystem(jarUri, Map.of())) { + // les dossiers resources sont a la racine du .jar + Path datapacksInJar = jarFs.getPath("/datapacks"); + + try (Stream paths = Files.walk(datapacksInJar)) { + for (Path source : (Iterable) paths::iterator) { + // on fait les copies des dossiers dans les datapacks + Path dest = tempDir.resolve(datapacksInJar.relativize(source).toString()); + if (Files.isDirectory(source)) Files.createDirectories(dest); + else { + Files.createDirectories(dest.getParent()); + Files.copy(source, dest, StandardCopyOption.REPLACE_EXISTING); + } + } + } + } + + return tempDir; + } catch (IOException e) { + throw new RuntimeException("Failed to extract datapacks", e); + } + } +} diff --git a/src/main/java/fr/openmc/core/utils/structure/FeaturesPopulator.java b/src/main/java/fr/openmc/core/utils/structure/FeaturesPopulator.java deleted file mode 100644 index 4cfc87600..000000000 --- a/src/main/java/fr/openmc/core/utils/structure/FeaturesPopulator.java +++ /dev/null @@ -1,33 +0,0 @@ -package fr.openmc.core.utils.structure; - -import org.bukkit.Location; -import org.bukkit.generator.BlockPopulator; - -import java.util.List; -import java.util.Map; -import java.util.Random; - -public abstract class FeaturesPopulator extends BlockPopulator { - - public final String group; - public final List features; - - public FeaturesPopulator(String group, List features) { - this.group = group; - this.features = features; - - Map> toPreload = Map.of(group, features); - StructureUtils.preloadStructures(toPreload); - } - - protected StructureUtils.CachedStructure getRandomFeatures(Random random) { - if (features.isEmpty()) return null; - String name = features.get(random.nextInt(features.size())); - return StructureUtils.getCachedStructure(group, name); - } - - protected void placeFeatures(StructureUtils.CachedStructure structure, Location target, boolean mirrorX, boolean mirrorZ, boolean placeAir) { - if (structure == null) return; - StructureUtils.placeStructure(structure, target, mirrorX, mirrorZ, placeAir); - } -} diff --git a/src/main/java/fr/openmc/core/utils/structure/SchematicsUtils.java b/src/main/java/fr/openmc/core/utils/structure/SchematicsUtils.java deleted file mode 100644 index 737dac76f..000000000 --- a/src/main/java/fr/openmc/core/utils/structure/SchematicsUtils.java +++ /dev/null @@ -1,163 +0,0 @@ -package fr.openmc.core.utils.structure; - -import com.sk89q.worldedit.EditSession; -import com.sk89q.worldedit.WorldEdit; -import com.sk89q.worldedit.WorldEditException; -import com.sk89q.worldedit.bukkit.BukkitAdapter; -import com.sk89q.worldedit.extent.clipboard.Clipboard; -import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats; -import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader; -import com.sk89q.worldedit.function.operation.Operation; -import com.sk89q.worldedit.function.operation.Operations; -import com.sk89q.worldedit.math.BlockVector3; -import com.sk89q.worldedit.regions.Region; -import com.sk89q.worldedit.session.ClipboardHolder; -import fr.openmc.core.OMCPlugin; -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.World; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class SchematicsUtils { - - private static final Map CACHE = new HashMap<>(); - - /** - * /!\ must be put in ressources folder - * - * @param nameSchem Just name of file ex. limbo without .schem - */ - public static void extractSchematic(String nameSchem) { - OMCPlugin plugin = OMCPlugin.getInstance(); - File schemFolder = new File(plugin.getDataFolder(), "schem"); - if (!schemFolder.exists()) schemFolder.mkdirs(); - - File outFile = new File(schemFolder, nameSchem + ".schem"); - if (outFile.exists()) return; - - try (InputStream in = plugin.getResource("schem/" + nameSchem + ".schem")) { - if (in == null) { - plugin.getSLF4JLogger().warn("Le fichier '" + nameSchem + ".schem' est introuvable dans les ressources."); - return; - } - Files.copy(in, outFile.toPath()); - plugin.getSLF4JLogger().info("Fichier '" + nameSchem + ".schem' extrait dans plugins/OpenMC/schem/."); - } catch (IOException e) { - e.printStackTrace(); - } - } - - public static CachedSchematic preload(String group, String name, File file) { - if (file == null || !file.exists()) return null; - return CACHE.computeIfAbsent(group + ":" + name, f -> { - try { - var format = ClipboardFormats.findByFile(file); - if (format == null) return null; - - try (ClipboardReader reader = format.getReader(new FileInputStream(file))) { - Clipboard clipboard = reader.read(); - - Region region = clipboard.getRegion(); - BlockVector3 min = region.getMinimumPoint(); - BlockVector3 max = region.getMaximumPoint(); - - //pb vient d'ici - int width = min.x() - max.y() + 1; - int height = min.y() - max.y() + 1; - int length = min.z() - max.z() + 1; - - List baseBlocks = new ArrayList<>(); - for (BlockVector3 pos : region) { - if (pos.y() == min.y()) { - var block = clipboard.getBlock(pos); - if (block.getBlockType().getMaterial().isSolid()) { - baseBlocks.add(pos.subtract(min)); - } - } - } - - return new CachedSchematic(clipboard, file, width, height, length, baseBlocks); - } - } catch (IOException e) { - e.printStackTrace(); - return null; - } - }); - } - - public static boolean pasteSchem(World bukkitWorld, CachedSchematic schematic, Location loc, boolean checkFloating) { - if (schematic == null || schematic.clipboard() == null) return false; - - int baseX = loc.getBlockX(); - int baseY = loc.getBlockY(); - int baseZ = loc.getBlockZ(); - - if (checkFloating) { - int floating = 0, checked = 0; - - for (int i = 0; i < schematic.baseBlocks().size(); i += 3) { - BlockVector3 rel = schematic.baseBlocks().get(i); - int worldX = baseX + rel.x(); - int worldZ = baseZ + rel.z(); - - Material below = bukkitWorld.getBlockAt(worldX, baseY - 1, worldZ).getType(); - if (below.isAir() || !below.isSolid()) floating++; - checked++; - } - - if (checked > 0 && ((double) floating / checked) > 0.4D) { - return false; - } - } - - var weWorld = BukkitAdapter.adapt(bukkitWorld); - - Bukkit.getScheduler().runTask(OMCPlugin.getInstance(), () -> { - try (EditSession session = WorldEdit.getInstance().newEditSession(weWorld)) { - Operation op = new ClipboardHolder(schematic.clipboard()) - .createPaste(session) - .to(BlockVector3.at(baseX, baseY, baseZ)) - .ignoreAirBlocks(true) - .build(); - - Operations.complete(op); - session.flushSession(); - } catch (WorldEditException e) { - e.printStackTrace(); - } - }); - - return true; - } - - public static void preloadSchematics(Map> schematicsGroups) { - for (Map.Entry> entry : schematicsGroups.entrySet()) { - String group = entry.getKey(); - for (String name : entry.getValue()) { - File file = new File(OMCPlugin.getInstance().getDataFolder(), "schem/" + name + ".schem"); - CachedSchematic cached = preload(group, name, file); - if (cached != null) { - CACHE.put(group + ":" + name, cached); - } - } - } - } - - public static CachedSchematic getCachedSchematic(String group, String name) { - return CACHE.get(group + ":" + name); - } - - public record CachedSchematic(Clipboard clipboard, File file, int width, int height, int length, - List baseBlocks) { - } -} diff --git a/src/main/java/fr/openmc/core/utils/structure/StructureUtils.java b/src/main/java/fr/openmc/core/utils/structure/StructureUtils.java deleted file mode 100644 index afb5d8cc7..000000000 --- a/src/main/java/fr/openmc/core/utils/structure/StructureUtils.java +++ /dev/null @@ -1,251 +0,0 @@ -package fr.openmc.core.utils.structure; - -import com.flowpowered.nbt.Tag; -import com.flowpowered.nbt.*; -import com.flowpowered.nbt.stream.NBTInputStream; -import fr.openmc.core.OMCPlugin; -import net.minecraft.core.BlockPos; -import net.minecraft.server.level.ServerLevel; -import org.bukkit.*; -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.block.data.CraftBlockData; -import org.bukkit.scheduler.BukkitRunnable; - -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletionException; - -public class StructureUtils { - private static final Map STRUCTURE_CACHE = new HashMap<>(); - - public record CachedStructure( - CompoundTag nbt, - int[] size, - BlockData[] palette, - List blocksToPlace - ) { - } - - public static void preloadStructures(Map> structuresByGroup) { - for (Map.Entry> entry : structuresByGroup.entrySet()) { - String group = entry.getKey(); - for (String name : entry.getValue()) { - try { - CompoundTag nbt = loadNBT(group, name); - CachedStructure cached = buildCache(nbt); - STRUCTURE_CACHE.put(group + "/" + name.replace(".nbt", ""), cached); - } catch (IOException e) { - OMCPlugin.getInstance().getSLF4JLogger().error("Impossible de précharger la structure {}/{}", group, name); - } - } - } - } - - private static CompoundTag loadNBT(String group, String name) throws IOException { - String path = "structures/" + group + "/" + name.replace(".nbt", "") + ".nbt"; - try (InputStream in = OMCPlugin.getInstance().getResource(path)) { - if (in == null) throw new IllegalArgumentException("Structure introuvable : " + path); - try (NBTInputStream nbtIn = new NBTInputStream(in)) { - Tag base = nbtIn.readTag(); - if (!(base instanceof CompoundTag compound)) { - throw new IllegalStateException("Structure NBT invalide : " + path); - } - return compound; - } - } - } - - private static CachedStructure buildCache(CompoundTag nbt) { - CompoundMap compound = nbt.getValue(); - - ListTag paletteList = (ListTag) compound.get("palette"); - BlockData[] states = new BlockData[paletteList.getValue().size()]; - for (int i = 0; i < states.length; i++) { - CompoundMap blockTag = ((CompoundTag) paletteList.getValue().get(i)).getValue(); - StringBuilder s = new StringBuilder(blockTag.get("Name").getValue().toString()); - if (blockTag.containsKey("Properties")) { - CompoundMap props = ((CompoundTag) blockTag.get("Properties")).getValue(); - if (!props.isEmpty()) { - s.append("["); - int k = 0; - for (Map.Entry> e : props.entrySet()) { - if (k++ > 0) s.append(","); - s.append(e.getKey()).append("=").append(e.getValue().getValue()); - } - s.append("]"); - } - } - states[i] = Bukkit.createBlockData(s.toString()); - } - - ListTag blocksList = (ListTag) compound.get("blocks"); - List blocksToPlace = new ArrayList<>(); - for (Object oTag : blocksList.getValue()) { - CompoundMap blockTag = ((CompoundTag) oTag).getValue(); - ListTag posListTag = (ListTag) blockTag.get("pos"); - int x = ((IntTag) posListTag.getValue().get(0)).getValue(); - int y = ((IntTag) posListTag.getValue().get(1)).getValue(); - int z = ((IntTag) posListTag.getValue().get(2)).getValue(); - int stateIdx = ((IntTag) blockTag.get("state")).getValue(); - blocksToPlace.add(new int[]{x, y, z, stateIdx}); - } - - ListTag sizeList = (ListTag) compound.get("size"); - int[] size = new int[]{ - ((IntTag) sizeList.getValue().get(0)).getValue(), - ((IntTag) sizeList.getValue().get(1)).getValue(), - ((IntTag) sizeList.getValue().get(2)).getValue() - }; - - return new CachedStructure(nbt, size, states, blocksToPlace); - } - - public static CachedStructure getCachedStructure(String group, String name) { - return STRUCTURE_CACHE.get(group + "/" + name.replace(".nbt", "")); - } - - /** - * Places a structure from an NBT file into the world at the given location. - * Structure files can be exported using a Minecraft Structure Block. - *

- * Optimisations : - * - Lecture du cache des structures - * - Lecture rapide des Chunks (fait avec IA) - * - Réduction des appels à world.getBlockAt() / getBlockData(). - * - * @param cached the NBT structure. - * @param target The lowest (min corner) location where to place the structure. - * @param mirrorX Whether to mirror the structure on the X axis (ignores block rotation). - * @param mirrorZ Whether to mirror the structure on the Z axis (ignores block rotation). - * @throws IOException If the NBT file is malformed or unreadable. - */ - public static void placeStructure(CachedStructure cached, Location target, boolean mirrorX, boolean mirrorZ, boolean placeAir) { - Bukkit.getScheduler().runTaskAsynchronously(OMCPlugin.getInstance(), () -> { - try { - List originalBlocks = cached.blocksToPlace(); - int[] size = cached.size(); - BlockData[] states = cached.palette(); - - List blocksToPlace = new ArrayList<>(originalBlocks.size()); - final List baseSolidCells = new ArrayList<>(); - for (int[] e : originalBlocks) { - int x = e[0], y = e[1], z = e[2], stateIdx = e[3]; - if (mirrorX) x = (size[0] - 1) - x; - if (mirrorZ) z = (size[2] - 1) - z; - blocksToPlace.add(new int[]{x, y, z, stateIdx}); - if (y == 0 && states[stateIdx].getMaterial().isSolid()) { - baseSolidCells.add(new int[]{x, z}); - } - } - - World world = target.getWorld(); - int baseX = target.getBlockX(); - int baseY = target.getBlockY(); - int baseZ = target.getBlockZ(); - - int chunkMinX = (baseX) >> 4; - int chunkMaxX = (baseX + size[0]) >> 4; - int chunkMinZ = (baseZ) >> 4; - int chunkMaxZ = (baseZ + size[2]) >> 4; - - List> futures = new ArrayList<>(); - for (int cx = chunkMinX; cx <= chunkMaxX; cx++) { - for (int cz = chunkMinZ; cz <= chunkMaxZ; cz++) { - futures.add(world.getChunkAtAsync(cx, cz, true)); - } - } - - CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).thenRun(() -> { - Map loadedChunks = new HashMap<>(); - for (CompletableFuture f : futures) { - try { - Chunk c = f.join(); - long key = (((long) c.getX()) << 32) | (c.getZ() & 0xffffffffL); - loadedChunks.put(key, c); - } catch (CompletionException ignored) { - - } - } - - Bukkit.getScheduler().runTask(OMCPlugin.getInstance(), () -> { - ServerLevel handle = ((CraftWorld) world).getHandle(); - - Map snapshots = new HashMap<>(); - int floating = 0; - int checked = 0; - for (int i = 0; i < baseSolidCells.size(); i += 3) { - int[] rc = baseSolidCells.get(i); - int worldX = baseX + rc[0]; - int worldZ = baseZ + rc[1]; - int chunkX = worldX >> 4; - int chunkZ = worldZ >> 4; - long key = (((long) chunkX) << 32) | (chunkZ & 0xffffffffL); - - Chunk chunk = loadedChunks.get(key); - if (chunk == null || !chunk.isLoaded()) { - floating++; - checked++; - continue; - } - - ChunkSnapshot snap = snapshots.get(key); - if (snap == null) { - snap = chunk.getChunkSnapshot(); - snapshots.put(key, snap); - } - int localX = Math.floorMod(worldX, 16); - int localZ = Math.floorMod(worldZ, 16); - - if (baseY - 1 < world.getMinHeight()) { - floating++; - checked++; - continue; - } - - Material mat = snap.getBlockType(localX, baseY - 1, localZ); - if (mat.isAir() || !mat.isSolid()) { - floating++; - } - checked++; - } - - if (checked > 0 && ((double) floating / checked) > 0.40D) { - return; - } - - final int batchSize = 2000; - new BukkitRunnable() { - int index = 0; - - @Override - public void run() { - int placed = 0; - while (index < blocksToPlace.size() && placed < batchSize) { - int[] e = blocksToPlace.get(index++); - BlockPos pos = new BlockPos(baseX + e[0], baseY + e[1], baseZ + e[2]); - BlockData data = states[e[3]]; - - if (!placeAir && data.getMaterial().isAir()) continue; - - handle.setBlock(pos, ((CraftBlockData) data).getState(), 2 | 16); - placed++; - } - if (index >= blocksToPlace.size()) { - cancel(); - } - } - }.runTaskTimer(OMCPlugin.getInstance(), 1L, 1L); - }); - }); - } catch (Exception ex) { - throw new RuntimeException(ex); - } - }); - } -} diff --git a/src/main/resources/datapack/data/openmc/worldgen/biome/cloud_land.json b/src/main/resources/datapack/data/openmc/worldgen/biome/cloud_land.json deleted file mode 100644 index e160fa461..000000000 --- a/src/main/resources/datapack/data/openmc/worldgen/biome/cloud_land.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "temperature": 0.8, - "downfall": 0.9, - "has_precipitation": false, - "temperature_modifier": "none", - "creature_spawn_probability": 0, - "effects": { - "sky_color": 10395294, - "fog_color": 0, - "water_color": 15068927, - "water_fog_color": 12895439, - "grass_color": 10137777, - "foliage_color": 12763842, - "particle": { - "options": { - "type": "small_gust" - }, - "probability": 0.01 - } - }, - "spawners": {}, - "spawn_costs": {}, - "carvers": [], - "features": [] -} \ No newline at end of file diff --git a/src/main/resources/datapack/data/openmc/worldgen/biome/glacite_grotto.json b/src/main/resources/datapack/data/openmc/worldgen/biome/glacite_grotto.json deleted file mode 100644 index 35ab702c6..000000000 --- a/src/main/resources/datapack/data/openmc/worldgen/biome/glacite_grotto.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "temperature": 0.8, - "downfall": 0.9, - "has_precipitation": false, - "temperature_modifier": "none", - "creature_spawn_probability": 0, - "effects": { - "sky_color": 10137777, - "fog_color": 0, - "water_color": 15068927, - "water_fog_color": 12895439, - "grass_color": 10137777, - "foliage_color": 12763842, - "particle": { - "options": { - "type": "snowflake" - }, - "probability": 0.01 - } - }, - "spawners": {}, - "spawn_costs": {}, - "carvers": [], - "features": [] -} \ No newline at end of file diff --git a/src/main/resources/datapack/pack.mcmeta b/src/main/resources/datapack/pack.mcmeta deleted file mode 100644 index ca66febb4..000000000 --- a/src/main/resources/datapack/pack.mcmeta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "pack": { - "description": "Le datapack d'OpenMC", - "min_format": [88, 0], - "max_format": [88, 0] - } -} diff --git a/src/main/resources/datapacks/omc_dream/data/minecraft/tags/block/dripstone_replaceable_blocks.json b/src/main/resources/datapacks/omc_dream/data/minecraft/tags/block/dripstone_replaceable_blocks.json new file mode 100644 index 000000000..55dab0c03 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/minecraft/tags/block/dripstone_replaceable_blocks.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:snow", + "minecraft:snow_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/minecraft/tags/block/snow_layer_cannot_survive_on.json b/src/main/resources/datapacks/omc_dream/data/minecraft/tags/block/snow_layer_cannot_survive_on.json new file mode 100644 index 000000000..6fd5b190e --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/minecraft/tags/block/snow_layer_cannot_survive_on.json @@ -0,0 +1,6 @@ +{ + "replace": true, + "values": [ + "barrier" + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/dimension/dream.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/dimension/dream.json new file mode 100644 index 000000000..e86662842 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/dimension/dream.json @@ -0,0 +1,93 @@ +{ + "type": "minecraft:overworld", + "generator": { + "type": "minecraft:noise", + "settings": "omc_dream:main_settings", + "biome_source": { + "type": "minecraft:multi_noise", + "biomes": [ + { + "biome": "omc_dream:cloud_land", + "parameters": { + "temperature": [-1, 1], + "humidity": 0, + "continentalness": [-1, 1], + "erosion": 0, + "weirdness": 0, + "depth": [ + -1.5, + 0.0625 + ], + "offset": 0 + } + }, + { + "biome": "omc_dream:mud_beach", + "parameters": { + "temperature": [-1, 1], + "humidity": 0, + "continentalness": [-1, 0.1], + "erosion": 0, + "weirdness": 0, + "depth": [ + 0.0626, + 0.73 + ], + "offset": 0 + } + }, + { + "biome": "omc_dream:glacite_grotto", + "parameters": { + "temperature": [-1, 1], + "humidity": 0, + "continentalness": [-1, 1], + "erosion": 0, + "weirdness": 0, + "depth": [ + 0.73, + 1.5 + ], + "offset": 0 + } + }, + { + "biome": "omc_dream:sculk_plains", + "parameters": { + "temperature": [ + 0, + 1 + ], + "humidity": 0, + "continentalness": [0.1, 1], + "erosion": 0, + "weirdness": 0, + "depth": [ + 0.0625, + 0.57 + ], + "offset": 0 + } + }, + { + "biome": "omc_dream:soul_forest", + "parameters": { + "temperature": [ + -1, + 0 + ], + "humidity": 0, + "continentalness": [0.1, 1], + "erosion": 0, + "weirdness": 0, + "depth": [ + 0.0625, + 0.57 + ], + "offset": 0 + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/datapack/data/openmc/loot_table/cloud_castle/boss_spawner.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/loot_table/cloud_castle/boss_spawner.json similarity index 100% rename from src/main/resources/datapack/data/openmc/loot_table/cloud_castle/boss_spawner.json rename to src/main/resources/datapacks/omc_dream/data/omc_dream/loot_table/cloud_castle/boss_spawner.json diff --git a/src/main/resources/datapack/data/openmc/loot_table/cloud_castle/mob_spawner.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/loot_table/cloud_castle/mob_spawner.json similarity index 100% rename from src/main/resources/datapack/data/openmc/loot_table/cloud_castle/mob_spawner.json rename to src/main/resources/datapacks/omc_dream/data/omc_dream/loot_table/cloud_castle/mob_spawner.json diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_1.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_1.nbt new file mode 100644 index 000000000..8741d0c4f Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_1.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_2.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_2.nbt new file mode 100644 index 000000000..2217e0f3b Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_2.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_3.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_3.nbt new file mode 100644 index 000000000..5fd248d26 Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_3.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_4.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_4.nbt new file mode 100644 index 000000000..304ea198b Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_4.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_5.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_5.nbt new file mode 100644 index 000000000..8e70cb584 Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_5.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_6.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_6.nbt new file mode 100644 index 000000000..6aa03e708 Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_6.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_7.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_7.nbt new file mode 100644 index 000000000..19ac51f37 Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_7.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_8.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_8.nbt new file mode 100644 index 000000000..76d5197d6 Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/cloud_land/cloud_castle/part_8.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_1.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_1.nbt new file mode 100644 index 000000000..58bc5d928 Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_1.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_2.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_2.nbt new file mode 100644 index 000000000..294dbea1c Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_2.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_3.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_3.nbt new file mode 100644 index 000000000..395a6733d Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_3.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_4.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_4.nbt new file mode 100644 index 000000000..24a7e6256 Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_4.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_5.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_5.nbt new file mode 100644 index 000000000..e879e58cc Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_5.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_6.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_6.nbt new file mode 100644 index 000000000..98874f1f0 Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_6.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_7.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_7.nbt new file mode 100644 index 000000000..0e6057f4b Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_7.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_8.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_8.nbt new file mode 100644 index 000000000..eba0bd724 Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/base_camp/part_8.nbt differ diff --git a/src/main/resources/structures/omc_dream/glacite/spike_normal_1.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_normal_1.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/glacite/spike_normal_1.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_normal_1.nbt diff --git a/src/main/resources/structures/omc_dream/glacite/spike_normal_2.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_normal_2.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/glacite/spike_normal_2.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_normal_2.nbt diff --git a/src/main/resources/structures/omc_dream/glacite/spike_normal_3.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_normal_3.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/glacite/spike_normal_3.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_normal_3.nbt diff --git a/src/main/resources/structures/omc_dream/glacite/spike_normal_4.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_normal_4.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/glacite/spike_normal_4.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_normal_4.nbt diff --git a/src/main/resources/structures/omc_dream/glacite/spike_vertical_1.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_vertical_1.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/glacite/spike_vertical_1.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_vertical_1.nbt diff --git a/src/main/resources/structures/omc_dream/glacite/spike_vertical_2.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_vertical_2.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/glacite/spike_vertical_2.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_vertical_2.nbt diff --git a/src/main/resources/structures/omc_dream/glacite/spike_vertical_3.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_vertical_3.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/glacite/spike_vertical_3.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_vertical_3.nbt diff --git a/src/main/resources/structures/omc_dream/glacite/spike_vertical_4.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_vertical_4.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/glacite/spike_vertical_4.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_vertical_4.nbt diff --git a/src/main/resources/structures/omc_dream/glacite/spike_vertical_5.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_vertical_5.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/glacite/spike_vertical_5.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/glacite_grotto/spike_vertical_5.nbt diff --git a/src/main/resources/structures/omc_dream/mud/rock_1.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/mud_beach/rock_1.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/mud/rock_1.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/mud_beach/rock_1.nbt diff --git a/src/main/resources/structures/omc_dream/mud/rock_2.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/mud_beach/rock_2.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/mud/rock_2.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/mud_beach/rock_2.nbt diff --git a/src/main/resources/structures/omc_dream/mud/rock_3.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/mud_beach/rock_3.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/mud/rock_3.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/mud_beach/rock_3.nbt diff --git a/src/main/resources/structures/omc_dream/mud/rock_4.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/mud_beach/rock_4.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/mud/rock_4.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/mud_beach/rock_4.nbt diff --git a/src/main/resources/structures/omc_dream/mud/rock_5.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/mud_beach/rock_5.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/mud/rock_5.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/mud_beach/rock_5.nbt diff --git a/src/main/resources/structures/omc_dream/mud/rock_6.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/mud_beach/rock_6.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/mud/rock_6.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/mud_beach/rock_6.nbt diff --git a/src/main/resources/structures/omc_dream/mud/rock_7.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/mud_beach/rock_7.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/mud/rock_7.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/mud_beach/rock_7.nbt diff --git a/src/main/resources/structures/omc_dream/plains/tree_1.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/sculk_plains/tree_1.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/plains/tree_1.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/sculk_plains/tree_1.nbt diff --git a/src/main/resources/structures/omc_dream/plains/tree_2.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/sculk_plains/tree_2.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/plains/tree_2.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/sculk_plains/tree_2.nbt diff --git a/src/main/resources/structures/omc_dream/plains/tree_3.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/sculk_plains/tree_3.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/plains/tree_3.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/sculk_plains/tree_3.nbt diff --git a/src/main/resources/structures/omc_dream/plains/tree_4.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/sculk_plains/tree_4.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/plains/tree_4.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/sculk_plains/tree_4.nbt diff --git a/src/main/resources/structures/omc_dream/plains/tree_5.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/sculk_plains/tree_5.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/plains/tree_5.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/sculk_plains/tree_5.nbt diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_1.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_1.nbt new file mode 100644 index 000000000..ac07d4bc4 Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_1.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_2.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_2.nbt new file mode 100644 index 000000000..fa839265b Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_2.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_3.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_3.nbt new file mode 100644 index 000000000..09f5fd805 Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_3.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_4.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_4.nbt new file mode 100644 index 000000000..077a7fbe4 Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_4.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_5.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_5.nbt new file mode 100644 index 000000000..6f7362246 Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_5.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_6.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_6.nbt new file mode 100644 index 000000000..57b76bb7a Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_6.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_7.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_7.nbt new file mode 100644 index 000000000..19e24fc01 Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_7.nbt differ diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_8.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_8.nbt new file mode 100644 index 000000000..278abf526 Binary files /dev/null and b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/cube_temple/part_8.nbt differ diff --git a/src/main/resources/structures/omc_dream/soul_forest/pillar.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/pillar.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/soul_forest/pillar.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/pillar.nbt diff --git a/src/main/resources/structures/omc_dream/soul_forest/tree_1.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/tree_1.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/soul_forest/tree_1.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/tree_1.nbt diff --git a/src/main/resources/structures/omc_dream/soul_forest/tree_2.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/tree_2.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/soul_forest/tree_2.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/tree_2.nbt diff --git a/src/main/resources/structures/omc_dream/soul_forest/tree_3.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/tree_3.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/soul_forest/tree_3.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/tree_3.nbt diff --git a/src/main/resources/structures/omc_dream/soul_forest/tree_4.nbt b/src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/tree_4.nbt similarity index 100% rename from src/main/resources/structures/omc_dream/soul_forest/tree_4.nbt rename to src/main/resources/datapacks/omc_dream/data/omc_dream/structure/soul_forest/tree_4.nbt diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/tags/block/base_stone_dream.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/tags/block/base_stone_dream.json new file mode 100644 index 000000000..49203ac36 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/tags/block/base_stone_dream.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:deepslate", + "smooth_basalt" + ] +} diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/tags/block/snow_layer_detection.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/tags/block/snow_layer_detection.json new file mode 100644 index 000000000..f85095a81 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/tags/block/snow_layer_detection.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:snow_block", + "minecraft:deepslate", + "minecraft:sculk", + "minecraft:packed_ice", + "#omc_dream:base_stone_dream" + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/biome/cloud_land.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/biome/cloud_land.json new file mode 100644 index 000000000..df322b788 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/biome/cloud_land.json @@ -0,0 +1,29 @@ +{ + "attributes": { + "visual/sky_color": 10395294, + "visual/fog_color": 0, + "visual/water_fog_color": 12895439, + "visual/ambient_particles": [ + { + "particle": { + "type": "minecraft:small_gust" + }, + "probability": 0.01 + } + ] + }, + "temperature": 0.8, + "downfall": 0.9, + "has_precipitation": false, + "temperature_modifier": "none", + "creature_spawn_probability": 0, + "effects": { + "water_color": 15068927, + "grass_color": 10137777, + "foliage_color": 12763842 + }, + "spawners": {}, + "spawn_costs": {}, + "carvers": [], + "features": [] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/biome/glacite_grotto.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/biome/glacite_grotto.json new file mode 100644 index 000000000..e58ccf9f6 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/biome/glacite_grotto.json @@ -0,0 +1,56 @@ +{ + "attributes": { + "visual/sky_color": 10137777, + "visual/fog_color": 0, + "visual/water_fog_color": 12895439, + "visual/ambient_particles": [ + { + "particle": { + "type": "minecraft:snowflake" + }, + "probability": 0.01 + } + ] + }, + "temperature": 0.8, + "downfall": 0.9, + "has_precipitation": false, + "temperature_modifier": "none", + "creature_spawn_probability": 0, + "effects": { + "water_color": 15068927, + "grass_color": 10137777, + "foliage_color": 12763842 + }, + "spawners": {}, + "spawn_costs": {}, + "carvers": [], + "features": [ + [], + [ + "omc_dream:glacite/lake/glacite_lake", + "omc_dream:glacite/ice_celling" + ], + [ + "omc_dream:glacite/geode/glacite_geode" + ], + [], + [], + [], + [ + "omc_dream:glacite/ores" + ], + [ + "omc_dream:glacite/snow_layers/layer1", + "omc_dream:glacite/snow_layers/layer2", + "omc_dream:glacite/snow_layers/layer3" + ], + [], + [], + [ + "omc_dream:glacite/snow_layers/layer1", + "omc_dream:glacite/snow_layers/layer2", + "omc_dream:glacite/snow_layers/layer3" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/datapack/data/openmc/worldgen/biome/mud_beach.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/biome/mud_beach.json similarity index 62% rename from src/main/resources/datapack/data/openmc/worldgen/biome/mud_beach.json rename to src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/biome/mud_beach.json index d88a48ff3..1184f5f93 100644 --- a/src/main/resources/datapack/data/openmc/worldgen/biome/mud_beach.json +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/biome/mud_beach.json @@ -1,22 +1,26 @@ { + "attributes": { + "visual/sky_color": 4210752, + "visual/fog_color": 0, + "visual/water_fog_color": 12895439, + "visual/ambient_particles": [ + { + "particle": { + "type": "minecraft:ash" + }, + "probability": 0.01 + } + ] + }, "temperature": 0.8, "downfall": 0.9, "has_precipitation": false, "temperature_modifier": "none", "creature_spawn_probability": 0, "effects": { - "sky_color": 4210752, - "fog_color": 0, "water_color": 15068927, - "water_fog_color": 12895439, "grass_color": 4210752, - "foliage_color": 12763842, - "particle": { - "options": { - "type": "ash" - }, - "probability": 0.01 - } + "foliage_color": 12763842 }, "spawners": { "ambient": [], diff --git a/src/main/resources/datapack/data/openmc/worldgen/biome/sculk_plains.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/biome/sculk_plains.json similarity index 57% rename from src/main/resources/datapack/data/openmc/worldgen/biome/sculk_plains.json rename to src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/biome/sculk_plains.json index 9726e8270..d2594b35b 100644 --- a/src/main/resources/datapack/data/openmc/worldgen/biome/sculk_plains.json +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/biome/sculk_plains.json @@ -1,22 +1,26 @@ { + "attributes": { + "visual/sky_color": 1908783, + "visual/fog_color": 0, + "visual/water_fog_color": 12895439, + "visual/ambient_particles": [ + { + "particle": { + "type": "minecraft:trial_spawner_detection_ominous" + }, + "probability": 0.01 + } + ] + }, "temperature": 0.8, "downfall": 0.9, "has_precipitation": false, "temperature_modifier": "none", "creature_spawn_probability": 0, "effects": { - "sky_color": 1908783, - "fog_color": 0, "water_color": 15068927, - "water_fog_color": 12895439, "grass_color": 14606046, - "foliage_color": 12763842, - "particle": { - "options": { - "type": "trial_spawner_detection_ominous" - }, - "probability": 0.01 - } + "foliage_color": 12763842 }, "spawners": { "ambient": [], @@ -37,5 +41,17 @@ }, "spawn_costs": {}, "carvers": [], - "features": [] + "features": [ + [], + [], + [], + [], + [], + [], + [], + [], + [], + [], + [] + ] } \ No newline at end of file diff --git a/src/main/resources/datapack/data/openmc/worldgen/biome/soul_forest.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/biome/soul_forest.json similarity index 66% rename from src/main/resources/datapack/data/openmc/worldgen/biome/soul_forest.json rename to src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/biome/soul_forest.json index d6422582c..7219b8c80 100644 --- a/src/main/resources/datapack/data/openmc/worldgen/biome/soul_forest.json +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/biome/soul_forest.json @@ -1,22 +1,26 @@ { + "attributes": { + "visual/sky_color": 0, + "visual/fog_color": 0, + "visual/water_fog_color": 12895439, + "visual/ambient_particles": [ + { + "particle": { + "type": "minecraft:sculk_soul" + }, + "probability": 0.01 + } + ] + }, "temperature": 0.8, "downfall": 0.9, "has_precipitation": false, "temperature_modifier": "none", "creature_spawn_probability": 0, "effects": { - "sky_color": 0, - "fog_color": 0, "water_color": 15068927, - "water_fog_color": 12895439, "grass_color": 14606046, - "foliage_color": 12763842, - "particle": { - "options": { - "type": "sculk_soul" - }, - "probability": 0.01 - } + "foliage_color": 12763842 }, "spawners": { "ambient": [], diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/geode/glacite_geode.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/geode/glacite_geode.json new file mode 100644 index 000000000..be1fd7879 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/geode/glacite_geode.json @@ -0,0 +1,98 @@ +{ + "type": "minecraft:geode", + "config": { + "blocks": { + "alternate_inner_layer_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:sea_lantern" + } + }, + "cannot_replace": "#minecraft:features_cannot_replace", + "filling_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + }, + "inner_layer_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:blue_ice" + } + }, + "inner_placements": [ + { + "Name": "minecraft:end_rod", + "Properties": { + "facing": "up" + } + }, + { + "Name": "minecraft:end_rod", + "Properties": { + "facing": "up" + } + }, + { + "Name": "minecraft:end_rod", + "Properties": { + "facing": "up" + } + }, + { + "Name": "minecraft:end_rod", + "Properties": { + "facing": "up" + } + } + ], + "invalid_blocks": "#minecraft:geode_invalid_blocks", + "middle_layer_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:calcite" + } + }, + "outer_layer_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:smooth_basalt" + } + } + }, + "crack": { + "base_crack_size": 2, + "crack_point_offset": 2, + "generate_crack_chance": 0.95 + }, + "distribution_points": { + "type": "minecraft:uniform", + "max_inclusive": 4, + "min_inclusive": 3 + }, + "invalid_blocks_threshold": 1, + "layers": { + "filling": 1.7, + "inner_layer": 2.2, + "middle_layer": 3.2, + "outer_layer": 4.2 + }, + "max_gen_offset": 16, + "min_gen_offset": -16, + "noise_multiplier": 0.05, + "outer_wall_distance": { + "type": "minecraft:uniform", + "max_inclusive": 6, + "min_inclusive": 4 + }, + "placements_require_layer0_alternate": true, + "point_offset": { + "type": "minecraft:uniform", + "max_inclusive": 2, + "min_inclusive": 1 + }, + "use_alternate_layer0_chance": 0.083, + "use_potential_placements_chance": 0.35 + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/ice_celling.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/ice_celling.json new file mode 100644 index 000000000..bedcabc44 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/ice_celling.json @@ -0,0 +1,81 @@ +{ + "type": "minecraft:vegetation_patch", + "config": { + "depth": { + "type": "minecraft:uniform", + "min_inclusive": 1, + "max_inclusive": 2 + }, + "extra_bottom_block_chance": 0.5, + "extra_edge_column_chance": 0.5, + "ground_state": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "data": { + "Name": "minecraft:deepslate" + }, + "weight": 4 + }, + { + "data": { + "Name": "minecraft:smooth_basalt" + }, + "weight": 4 + }, + { + "data": { + "Name": "minecraft:blue_ice" + }, + "weight": 2 + } + ] + }, + "replaceable": "#omc_dream:base_stone_dream", + "surface": "ceiling", + "vegetation_chance": 0.4, + "vegetation_feature": { + "feature": { + "type": "minecraft:random_selector", + "config": { + "default": { + "feature": { + "type": "minecraft:block_column", + "config": { + "allowed_placement": { + "type": "minecraft:true" + }, + "direction": "down", + "layers": [ + { + "height": { + "type": "minecraft:biased_to_bottom", + "min_inclusive": 1, + "max_inclusive": 5 + }, + "provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:blue_ice" + } + } + } + ], + "prioritize_tip": false + } + }, + "placement": [] + }, + "features": [] + } + }, + "placement": [] + }, + "vertical_range": 1, + "xz_radius": { + "type": "minecraft:uniform", + "min_inclusive": 2, + "max_inclusive": 5 + } + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/lake/glacite_lake.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/lake/glacite_lake.json new file mode 100644 index 000000000..b17afc6fe --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/lake/glacite_lake.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:lake", + "config": { + "barrier": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:stone" + } + }, + "fluid": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "blue_ice" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/ores/coal_ores.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/ores/coal_ores.json new file mode 100644 index 000000000..8b317507b --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/ores/coal_ores.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0, + "size": 17, + "targets": [ + { + "state": { + "Name": "minecraft:deepslate_coal_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "omc_dream:base_stone_dream" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/snow_layers/layer1.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/snow_layers/layer1.json new file mode 100644 index 000000000..1063228c5 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/snow_layers/layer1.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "data": { + "Name": "minecraft:snow", + "Properties": { + "layers": "6" + } + }, + "weight": 2 + }, + { + "data": { + "Name": "minecraft:snow", + "Properties": { + "layers": "7" + } + }, + "weight": 1 + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/snow_layers/layer2.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/snow_layers/layer2.json new file mode 100644 index 000000000..2fd77246c --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/snow_layers/layer2.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "data": { + "Name": "minecraft:snow", + "Properties": { + "layers": "4" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "minecraft:snow", + "Properties": { + "layers": "5" + } + }, + "weight": 1 + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/snow_layers/layer3.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/snow_layers/layer3.json new file mode 100644 index 000000000..a835e9bde --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/snow_layers/layer3.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "data": { + "Name": "minecraft:snow", + "Properties": { + "layers": "2" + } + }, + "weight": 2 + }, + { + "data": { + "Name": "minecraft:snow", + "Properties": { + "layers": "3" + } + }, + "weight": 1 + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/dream_continents.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/dream_continents.json new file mode 100644 index 000000000..6b51cf250 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/dream_continents.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:flat_cache", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "omc_dream:terrain_noise", + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z", + "xz_scale": 1, + "y_scale": 0.15 + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/dream_depth.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/dream_depth.json new file mode 100644 index 000000000..8ade5ff02 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/dream_depth.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_value": 1.5, + "from_y": -64, + "to_value": -1.5, + "to_y": 320 +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/terrains/base_terrain.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/terrains/base_terrain.json new file mode 100644 index 000000000..81cc9f585 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/terrains/base_terrain.json @@ -0,0 +1,16 @@ +{ + "type": "add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 34, + "to_y": 84, + "from_value": 1, + "to_value": -1 + }, + "argument2": { + "type": "noise", + "noise": "omc_dream:terrain_noise", + "xz_scale": 1, + "y_scale": 0.15 + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/terrains/bedrock_floor.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/terrains/bedrock_floor.json new file mode 100644 index 000000000..96a4507ca --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/terrains/bedrock_floor.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:y_clamped_gradient", + "from_y": -60, + "to_y": -65, + "from_value": 0, + "to_value": 1 + }, + "min_inclusive": 0.25, + "max_exclusive": 1, + "when_in_range": 1, + "when_out_of_range": 0 +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/terrains/cloud_terrain.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/terrains/cloud_terrain.json new file mode 100644 index 000000000..025c9bffc --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/terrains/cloud_terrain.json @@ -0,0 +1,6 @@ +{ + "type": "minecraft:noise", + "noise": "omc_dream:cloud_noise", + "xz_scale": 1, + "y_scale": 0 +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/terrains/dream_cave.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/terrains/dream_cave.json new file mode 100644 index 000000000..ebebcc0f6 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/terrains/dream_cave.json @@ -0,0 +1,14 @@ +{ + "type": "mul", + "argument1": -1, + "argument2": { + "type": "add", + "argument1": { + "type": "noise", + "noise": "omc_dream:cave_noise", + "xz_scale": 1.2, + "y_scale": 2.5 + }, + "argument2": -0.5 + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/terrains/dream_terrain.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/terrains/dream_terrain.json new file mode 100644 index 000000000..74c29ac25 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/density_function/terrains/dream_terrain.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:y_clamped_gradient", + "from_y": 120, + "to_y": 130, + "from_value": 0, + "to_value": 1 + }, + "min_inclusive": 0.5, + "max_exclusive": 1, + "when_in_range": "omc_dream:terrains/cloud_terrain", + "when_out_of_range": "omc_dream:terrains/base_terrain" +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise/biome_noise.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise/biome_noise.json new file mode 100644 index 000000000..09593c9ff --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise/biome_noise.json @@ -0,0 +1,6 @@ +{ + "firstOctave": -7, + "amplitudes": [ + 1 + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise/cave_noise.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise/cave_noise.json new file mode 100644 index 000000000..829485fe5 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise/cave_noise.json @@ -0,0 +1,9 @@ +{ + "firstOctave": -6, + "amplitudes": [ + 2, + 0, + 1, + 0 + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise/cloud_noise.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise/cloud_noise.json new file mode 100644 index 000000000..25f4cd923 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise/cloud_noise.json @@ -0,0 +1,9 @@ +{ + "firstOctave": -6, + "amplitudes": [ + 1, + 0, + 0, + 10 + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise/smooth_basalt_noise.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise/smooth_basalt_noise.json new file mode 100644 index 000000000..69126a0f4 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise/smooth_basalt_noise.json @@ -0,0 +1,6 @@ +{ + "firstOctave": -2, + "amplitudes": [ + 2 + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise/terrain_noise.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise/terrain_noise.json new file mode 100644 index 000000000..0c7a9e0ab --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise/terrain_noise.json @@ -0,0 +1,6 @@ +{ + "firstOctave": -7, + "amplitudes": [ + 1, 0, 0, 1 + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise_settings/main_settings.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise_settings/main_settings.json new file mode 100644 index 000000000..5168286a0 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/noise_settings/main_settings.json @@ -0,0 +1,198 @@ +{ + "sea_level": -64, + "disable_mob_generation": false, + "aquifers_enabled": false, + "ore_veins_enabled": false, + "legacy_random_source": false, + "default_block": { + "Name": "minecraft:deepslate" + }, + "default_fluid": { + "Name": "minecraft:air" + }, + "noise": { + "min_y": -64, + "height": 320, + "size_horizontal": 2, + "size_vertical": 1 + }, + "noise_router": { + "barrier": 0, + "fluid_level_floodedness": 0, + "fluid_level_spread": 0, + "lava": 0, + "temperature": { + "type": "noise", + "noise": "omc_dream:biome_noise", + "xz_scale": 1, + "y_scale": 0 + }, + "vegetation": 0, + "continents": "omc_dream:dream_continents", + "erosion": 0, + "depth": "omc_dream:dream_depth", + "ridges": 0, + "final_density": { + "type": "add", + "argument1": { + "type": "min", + "argument1": "omc_dream:terrains/dream_terrain", + "argument2": "omc_dream:terrains/dream_cave" + }, + "argument2": "omc_dream:terrains/bedrock_floor" + }, + "vein_toggle": 0, + "vein_ridged": 0, + "vein_gap": 0, + "preliminary_surface_level": 0 + }, + "spawn_target": [], + "surface_rule": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:vertical_gradient", + "false_at_and_above": { + "above_bottom": 1 + }, + "random_name": "minecraft:bedrock_floor", + "true_at_and_below": { + "above_bottom": 0 + } + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:bedrock" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:not", + "invert": { + "type": "minecraft:y_above", + "anchor": { + "above_bottom": 3 + }, + "surface_depth_multiplier": 0, + "add_stone_depth": false + } + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:packed_ice" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "omc_dream:glacite_grotto" + ] + }, + "then_run": { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 3, + "surface_type": "floor", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:snow_block" + } + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "omc_dream:mud_beach" + ] + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:mud" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:y_above", + "anchor": { + "absolute": 120 + }, + "surface_depth_multiplier": 0, + "add_stone_depth": true + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:powder_snow" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "omc_dream:sculk_plains", + "omc_dream:soul_forest" + ] + }, + "then_run": { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 5, + "surface_type": "floor", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:sculk" + } + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "omc_dream:smooth_basalt_noise", + "min_threshold": 0, + "max_threshold": 2 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:smooth_basalt" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:deepslate" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/geode/glacite_geode.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/geode/glacite_geode.json new file mode 100644 index 000000000..e55f6922b --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/geode/glacite_geode.json @@ -0,0 +1,27 @@ +{ + "feature": "omc_dream:glacite/geode/glacite_geode", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 24 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 30 + }, + "min_inclusive": { + "above_bottom": -45 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/ice_celling.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/ice_celling.json new file mode 100644 index 000000000..cb250caa1 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/ice_celling.json @@ -0,0 +1,41 @@ +{ + "feature": "omc_dream:glacite/ice_celling", + "placement": [ + { + "type": "minecraft:count", + "count": 12 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": { + "above_bottom": 0 + }, + "max_inclusive": { + "absolute": 30 + } + } + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air" + ] + }, + "direction_of_search": "up", + "max_steps": 30, + "target_condition": { + "type": "minecraft:solid" + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/lake/glacite_lake.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/lake/glacite_lake.json new file mode 100644 index 000000000..843687f36 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/lake/glacite_lake.json @@ -0,0 +1,57 @@ +{ + "feature": "omc_dream:glacite/lake/glacite_lake", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 9 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 0 + }, + "min_inclusive": { + "absolute": -64 + } + } + }, + { + "type": "minecraft:environment_scan", + "direction_of_search": "down", + "max_steps": 32, + "target_condition": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:not", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + }, + { + "type": "minecraft:inside_world_bounds", + "offset": [ + 0, + -5, + 0 + ] + } + ] + } + }, + { + "type": "minecraft:surface_relative_threshold_filter", + "heightmap": "OCEAN_FLOOR_WG", + "max_inclusive": -5 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/ores.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/ores.json new file mode 100644 index 000000000..c52c2e40a --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/ores.json @@ -0,0 +1,27 @@ +{ + "feature": "omc_dream:glacite/ores/coal_ores", + "placement": [ + { + "type": "minecraft:count", + "count": 10 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 50 + }, + "min_inclusive": { + "absolute": -64 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/snow_layers/layer1.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/snow_layers/layer1.json new file mode 100644 index 000000000..72062ccfe --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/snow_layers/layer1.json @@ -0,0 +1,117 @@ +{ + "feature": "omc_dream:glacite/snow_layers/layer1", + "placement": [ + { + "type": "minecraft:count", + "count": 256 + }, + { + "type": "minecraft:count", + "count": 153 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": -64 + }, + "max_inclusive": { + "absolute": 47 + } + } + }, + { + "type": "minecraft:environment_scan", + "direction_of_search": "down", + "max_steps": 12, + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air", + "minecraft:snow" + ] + }, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 0, + -1, + 0 + ] + }, + { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air", + "snow" + ] + }, + { + "type": "minecraft:any_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 1, + 0, + 0 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 0, + 0, + 1 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + -1, + 0, + 0 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 0, + 0, + -1 + ] + } + ] + } + ] + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/snow_layers/layer2.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/snow_layers/layer2.json new file mode 100644 index 000000000..d5024cda8 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/snow_layers/layer2.json @@ -0,0 +1,241 @@ +{ + "feature": "omc_dream:glacite/snow_layers/layer2", + "placement": [ + { + "type": "minecraft:count", + "count": 256 + }, + { + "type": "minecraft:count", + "count": 153 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": -64 + }, + "max_inclusive": { + "absolute": 47 + } + } + }, + { + "type": "minecraft:environment_scan", + "direction_of_search": "down", + "max_steps": 12, + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air", + "minecraft:snow" + ] + }, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:not", + "predicate": { + "type": "minecraft:any_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 1, + 0, + 0 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 0, + 0, + 1 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + -1, + 0, + 0 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 0, + 0, + -1 + ] + }, + { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air" + ], + "offset": [ + 1, + -1, + 0 + ] + }, + { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air" + ], + "offset": [ + 0, + -1, + 1 + ] + }, + { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air" + ], + "offset": [ + -1, + -1, + 0 + ] + }, + { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air" + ], + "offset": [ + 0, + -1, + -1 + ] + } + ] + } + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 0, + -1, + 0 + ] + }, + { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air", + "snow" + ] + }, + { + "type": "minecraft:any_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 2, + 0, + 0 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 0, + 0, + 2 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + -2, + 0, + 0 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 0, + 0, + -2 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 1, + 0, + 1 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + -1, + 0, + 1 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 1, + 0, + -1 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + -1, + 0, + -1 + ] + } + ] + } + ] + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/snow_layers/layer3.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/snow_layers/layer3.json new file mode 100644 index 000000000..8ed90036f --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/placed_feature/glacite/snow_layers/layer3.json @@ -0,0 +1,282 @@ +{ + "feature": "omc_dream:glacite/snow_layers/layer3", + "placement": [ + { + "type": "minecraft:count", + "count": 256 + }, + { + "type": "minecraft:count", + "count": 153 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": -64 + }, + "max_inclusive": { + "absolute": 47 + } + } + }, + { + "type": "minecraft:environment_scan", + "direction_of_search": "down", + "max_steps": 12, + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air", + "minecraft:snow" + ] + }, + "target_condition": { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:snow_block", + "minecraft:deepslate", + "minecraft:sculk", + "minecraft:packed_ice" + ] + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air", + "snow" + ] + }, + { + "type": "minecraft:not", + "predicate": { + "type": "minecraft:any_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 1, + 0, + 0 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 0, + 0, + 1 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + -1, + 0, + 0 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 0, + 0, + -1 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 2, + 0, + 0 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 0, + 0, + 2 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + -2, + 0, + 0 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 0, + 0, + -2 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 1, + 0, + 1 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + -1, + 0, + 1 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 1, + 0, + -1 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + -1, + 0, + -1 + ] + }, + { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air" + ], + "offset": [ + 1, + -1, + 0 + ] + }, + { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air" + ], + "offset": [ + 0, + -1, + 1 + ] + }, + { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air" + ], + "offset": [ + -1, + -1, + 0 + ] + }, + { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air" + ], + "offset": [ + 0, + -1, + -1 + ] + } + ] + } + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 0, + -1, + 0 + ] + }, + { + "type": "minecraft:any_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 3, + 0, + 0 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 0, + 0, + 3 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + -3, + 0, + 0 + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "omc_dream:snow_layer_detection", + "offset": [ + 0, + 0, + -3 + ] + } + ] + } + ] + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/glacite_grotto/spike_processor.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/glacite_grotto/spike_processor.json new file mode 100644 index 000000000..a4f500680 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/glacite_grotto/spike_processor.json @@ -0,0 +1,12 @@ +{ + "processors": [ + { + "processor_type": "minecraft:protected_blocks", + "value": "#snow" + }, + { + "processor_type": "block_ignore", + "blocks": [{"Name": "air"}] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/mud_beach/big_rocks_processor.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/mud_beach/big_rocks_processor.json new file mode 100644 index 000000000..87b8d9e48 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/mud_beach/big_rocks_processor.json @@ -0,0 +1,13 @@ +{ + "processors": [ + { + "processor_type": "gravity", + "heightmap": "OCEAN_FLOOR_WG", + "offset": -1 + }, + { + "processor_type": "block_ignore", + "blocks": [{"Name": "air"}] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/mud_beach/rocks_processor.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/mud_beach/rocks_processor.json new file mode 100644 index 000000000..0e4dbc24d --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/mud_beach/rocks_processor.json @@ -0,0 +1,13 @@ +{ + "processors": [ + { + "processor_type": "gravity", + "heightmap": "OCEAN_FLOOR_WG", + "offset": 0 + }, + { + "processor_type": "block_ignore", + "blocks": [{"Name": "air"}] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/sculk_plains/old_creaking_tree_processor.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/sculk_plains/old_creaking_tree_processor.json new file mode 100644 index 000000000..0e4dbc24d --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/sculk_plains/old_creaking_tree_processor.json @@ -0,0 +1,13 @@ +{ + "processors": [ + { + "processor_type": "gravity", + "heightmap": "OCEAN_FLOOR_WG", + "offset": 0 + }, + { + "processor_type": "block_ignore", + "blocks": [{"Name": "air"}] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/soul_forest/soul_pillar_processor.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/soul_forest/soul_pillar_processor.json new file mode 100644 index 000000000..d2180e94c --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/soul_forest/soul_pillar_processor.json @@ -0,0 +1,8 @@ +{ + "processors": [ + { + "processor_type": "block_ignore", + "blocks": [{"Name": "air"}] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/soul_forest/soul_tree_processor.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/soul_forest/soul_tree_processor.json new file mode 100644 index 000000000..0e4dbc24d --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/processor_list/soul_forest/soul_tree_processor.json @@ -0,0 +1,13 @@ +{ + "processors": [ + { + "processor_type": "gravity", + "heightmap": "OCEAN_FLOOR_WG", + "offset": 0 + }, + { + "processor_type": "block_ignore", + "blocks": [{"Name": "air"}] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/cloud_land/cloud_castle.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/cloud_land/cloud_castle.json new file mode 100644 index 000000000..e2bb6e170 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/cloud_land/cloud_castle.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "omc_dream:cloud_land", + "step": "raw_generation", + "spawn_overrides": {}, + "start_pool": "omc_dream:cloud_land/cloud_castle/part_1", + "size": 8, + "start_height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 140 + }, + "min_inclusive": { + "absolute": 130 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/glacite_grotto/base_camp.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/glacite_grotto/base_camp.json new file mode 100644 index 000000000..cdc8b583a --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/glacite_grotto/base_camp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "omc_dream:glacite_grotto", + "step": "raw_generation", + "spawn_overrides": {}, + "start_pool": "omc_dream:glacite_grotto/base_camp/part_1", + "size": 8, + "start_height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": -30 + }, + "min_inclusive": { + "absolute": -64 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/glacite_grotto/spike.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/glacite_grotto/spike.json new file mode 100644 index 000000000..6b304cd5b --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/glacite_grotto/spike.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "omc_dream:glacite_grotto", + "step": "surface_structures", + "spawn_overrides": {}, + "terrain_adaptation": "beard_box", + "start_pool": "omc_dream:glacite_grotto/spike", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 50 + }, + "min_inclusive": { + "absolute": -64 + } + }, + "max_distance_from_center": 1, + "use_expansion_hack": true +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/mud_beach/rocks.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/mud_beach/rocks.json new file mode 100644 index 000000000..ff8167a27 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/mud_beach/rocks.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "omc_dream:mud_beach", + "step": "raw_generation", + "spawn_overrides": {}, + "start_pool": "omc_dream:mud_beach/rocks", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 63 + }, + "min_inclusive": { + "absolute": 40 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/sculk_plains/old_creaking_tree.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/sculk_plains/old_creaking_tree.json new file mode 100644 index 000000000..4b058aadb --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/sculk_plains/old_creaking_tree.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "omc_dream:sculk_plains", + "step": "raw_generation", + "spawn_overrides": {}, + "start_pool": "omc_dream:sculk_plains/old_creaking_tree", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 75 + }, + "min_inclusive": { + "absolute": 60 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/soul_forest/cube_temple.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/soul_forest/cube_temple.json new file mode 100644 index 000000000..a4ebb3fb5 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/soul_forest/cube_temple.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "omc_dream:soul_forest", + "step": "raw_generation", + "spawn_overrides": {}, + "start_pool": "omc_dream:soul_forest/cube_temple/part_1", + "size": 8, + "start_height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 70 + }, + "min_inclusive": { + "absolute": 65 + } + }, + "terrain_adaptation": "beard_box", + "max_distance_from_center": 100, + "use_expansion_hack": false +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/soul_forest/soul_pillar.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/soul_forest/soul_pillar.json new file mode 100644 index 000000000..a8fcce5f3 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/soul_forest/soul_pillar.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "omc_dream:soul_forest", + "step": "raw_generation", + "spawn_overrides": {}, + "start_pool": "omc_dream:soul_forest/soul_pillar", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 70 + }, + "min_inclusive": { + "absolute": 60 + } + }, + "terrain_adaptation": "beard_box", + "max_distance_from_center": 80, + "use_expansion_hack": false +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/soul_forest/soul_tree.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/soul_forest/soul_tree.json new file mode 100644 index 000000000..bc3176ff1 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure/soul_forest/soul_tree.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "omc_dream:soul_forest", + "step": "raw_generation", + "spawn_overrides": {}, + "start_pool": "omc_dream:soul_forest/soul_tree", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 75 + }, + "min_inclusive": { + "absolute": 60 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/cloud_land/cloud_castle.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/cloud_land/cloud_castle.json new file mode 100644 index 000000000..b53b7bade --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/cloud_land/cloud_castle.json @@ -0,0 +1,14 @@ +{ + "structures": [ + { + "weight": 1, + "structure": "omc_dream:cloud_land/cloud_castle" + } + ], + "placement": { + "type": "minecraft:random_spread", + "separation": 27, + "spacing": 40, + "salt": 74673873 + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/glacite_grotto/base_camp.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/glacite_grotto/base_camp.json new file mode 100644 index 000000000..2e5f49d31 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/glacite_grotto/base_camp.json @@ -0,0 +1,14 @@ +{ + "structures": [ + { + "weight": 1, + "structure": "omc_dream:glacite_grotto/base_camp" + } + ], + "placement": { + "type": "minecraft:random_spread", + "separation": 22, + "spacing": 30, + "salt": 23232454 + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/glacite_grotto/spike_1.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/glacite_grotto/spike_1.json new file mode 100644 index 000000000..8364ed62c --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/glacite_grotto/spike_1.json @@ -0,0 +1,18 @@ +{ + "structures": [ + { + "weight": 1, + "structure": "omc_dream:glacite_grotto/spike" + } + ], + "placement": { + "type": "minecraft:random_spread", + "separation": 0, + "spacing": 1, + "salt": 1111, + "exclusion_zone": { + "chunk_count": 4, + "other_set": "omc_dream:glacite_grotto/base_camp" + } + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/glacite_grotto/spike_2.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/glacite_grotto/spike_2.json new file mode 100644 index 000000000..d4f7d3453 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/glacite_grotto/spike_2.json @@ -0,0 +1,18 @@ +{ + "structures": [ + { + "weight": 1, + "structure": "omc_dream:glacite_grotto/spike" + } + ], + "placement": { + "type": "minecraft:random_spread", + "separation": 0, + "spacing": 1, + "salt": 6767, + "exclusion_zone": { + "chunk_count": 4, + "other_set": "omc_dream:glacite_grotto/base_camp" + } + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/glacite_grotto/spike_3.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/glacite_grotto/spike_3.json new file mode 100644 index 000000000..ca2229358 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/glacite_grotto/spike_3.json @@ -0,0 +1,18 @@ +{ + "structures": [ + { + "weight": 1, + "structure": "omc_dream:glacite_grotto/spike" + } + ], + "placement": { + "type": "minecraft:random_spread", + "separation": 0, + "spacing": 1, + "salt": 98993, + "exclusion_zone": { + "chunk_count": 4, + "other_set": "omc_dream:glacite_grotto/base_camp" + } + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/mud_beach/rocks.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/mud_beach/rocks.json new file mode 100644 index 000000000..f39e071c5 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/mud_beach/rocks.json @@ -0,0 +1,14 @@ +{ + "structures": [ + { + "weight": 1, + "structure": "omc_dream:mud_beach/rocks" + } + ], + "placement": { + "type": "minecraft:random_spread", + "separation": 1, + "spacing": 2, + "salt": 9760983948 + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/sculk_plains/old_creaking_tree.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/sculk_plains/old_creaking_tree.json new file mode 100644 index 000000000..ce6fd0ac5 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/sculk_plains/old_creaking_tree.json @@ -0,0 +1,14 @@ +{ + "structures": [ + { + "weight": 1, + "structure": "omc_dream:sculk_plains/old_creaking_tree" + } + ], + "placement": { + "type": "minecraft:random_spread", + "separation": 2, + "spacing": 3, + "salt": 86753 + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/soul_forest/cube_temple.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/soul_forest/cube_temple.json new file mode 100644 index 000000000..d1719eb75 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/soul_forest/cube_temple.json @@ -0,0 +1,14 @@ +{ + "structures": [ + { + "weight": 1, + "structure": "omc_dream:soul_forest/cube_temple" + } + ], + "placement": { + "type": "minecraft:random_spread", + "separation": 17, + "spacing": 20, + "salt": 783734 + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/soul_forest/soul_pillar.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/soul_forest/soul_pillar.json new file mode 100644 index 000000000..9fe4157b4 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/soul_forest/soul_pillar.json @@ -0,0 +1,14 @@ +{ + "structures": [ + { + "weight": 1, + "structure": "omc_dream:soul_forest/soul_pillar" + } + ], + "placement": { + "type": "minecraft:random_spread", + "separation": 6, + "spacing": 8, + "salt": 77347634 + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/soul_forest/soul_tree.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/soul_forest/soul_tree.json new file mode 100644 index 000000000..c0c9b9b3d --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/structure_set/soul_forest/soul_tree.json @@ -0,0 +1,14 @@ +{ + "structures": [ + { + "weight": 1, + "structure": "omc_dream:soul_forest/soul_tree" + } + ], + "placement": { + "type": "minecraft:random_spread", + "separation": 1, + "spacing": 3, + "salt": 8233493 + } +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_1.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_1.json new file mode 100644 index 000000000..420b554b6 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_1.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:cloud_land/cloud_castle/part_1", + "processors": [] + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_2.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_2.json new file mode 100644 index 000000000..a9b2129bc --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_2.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:cloud_land/cloud_castle/part_2", + "processors": [] + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_3.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_3.json new file mode 100644 index 000000000..daa7254ed --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_3.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:cloud_land/cloud_castle/part_3", + "processors": [] + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_4.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_4.json new file mode 100644 index 000000000..50755e993 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_4.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:cloud_land/cloud_castle/part_4", + "processors": [] + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_5.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_5.json new file mode 100644 index 000000000..a9407bfb6 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_5.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:cloud_land/cloud_castle/part_5", + "processors": [] + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_6.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_6.json new file mode 100644 index 000000000..29c412668 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_6.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:cloud_land/cloud_castle/part_6", + "processors": [] + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_7.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_7.json new file mode 100644 index 000000000..f7e00db39 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_7.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:cloud_land/cloud_castle/part_7", + "processors": [] + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_8.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_8.json new file mode 100644 index 000000000..1d20b1552 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/cloud_land/cloud_castle/part_8.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:cloud_land/cloud_castle/part_8", + "processors": [] + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_1.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_1.json new file mode 100644 index 000000000..bb9457f7a --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_1.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/base_camp/part_1", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_2.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_2.json new file mode 100644 index 000000000..8b11d29c7 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_2.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/base_camp/part_2", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_3.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_3.json new file mode 100644 index 000000000..01f837789 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_3.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/base_camp/part_3", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_4.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_4.json new file mode 100644 index 000000000..2cfbe5426 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_4.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/base_camp/part_4", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_5.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_5.json new file mode 100644 index 000000000..f5350f741 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_5.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/base_camp/part_5", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_6.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_6.json new file mode 100644 index 000000000..6fb0c31f5 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_6.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/base_camp/part_6", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_7.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_7.json new file mode 100644 index 000000000..0794a359e --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_7.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/base_camp/part_7", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_8.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_8.json new file mode 100644 index 000000000..5994543f2 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/base_camp/part_8.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/base_camp/part_8", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/spike.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/spike.json new file mode 100644 index 000000000..99d5ae3bc --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/glacite_grotto/spike.json @@ -0,0 +1,77 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/spike_normal_1", + "processors": "omc_dream:glacite_grotto/spike_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/spike_normal_2", + "processors": "omc_dream:glacite_grotto/spike_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/spike_normal_4", + "processors": "omc_dream:glacite_grotto/spike_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/spike_vertical_1", + "processors": "omc_dream:glacite_grotto/spike_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/spike_vertical_2", + "processors": "omc_dream:glacite_grotto/spike_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/spike_vertical_3", + "processors": "omc_dream:glacite_grotto/spike_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/spike_vertical_4", + "processors": "omc_dream:glacite_grotto/spike_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:glacite_grotto/spike_vertical_5", + "processors": "omc_dream:glacite_grotto/spike_processor" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/mud_beach/rocks.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/mud_beach/rocks.json new file mode 100644 index 000000000..aa5790ad5 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/mud_beach/rocks.json @@ -0,0 +1,67 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:mud_beach/rock_1", + "processors": "omc_dream:mud_beach/rocks_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:mud_beach/rock_2", + "processors": "omc_dream:mud_beach/big_rocks_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:mud_beach/rock_3", + "processors": "omc_dream:mud_beach/rocks_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:mud_beach/rock_4", + "processors": "omc_dream:mud_beach/rocks_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:mud_beach/rock_5", + "processors": "omc_dream:mud_beach/big_rocks_processor" + } + },{ + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:mud_beach/rock_6", + "processors": "omc_dream:mud_beach/rocks_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:mud_beach/rock_7", + "processors": "omc_dream:mud_beach/big_rocks_processor" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/sculk_plains/old_creaking_tree.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/sculk_plains/old_creaking_tree.json new file mode 100644 index 000000000..d14e9f0e0 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/sculk_plains/old_creaking_tree.json @@ -0,0 +1,50 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:sculk_plains/tree_1", + "processors": "omc_dream:sculk_plains/old_creaking_tree_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:sculk_plains/tree_2", + "processors": "omc_dream:sculk_plains/old_creaking_tree_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:sculk_plains/tree_3", + "processors": "omc_dream:sculk_plains/old_creaking_tree_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:sculk_plains/tree_4", + "processors": "omc_dream:sculk_plains/old_creaking_tree_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:sculk_plains/tree_5", + "processors": "omc_dream:sculk_plains/old_creaking_tree_processor" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_1.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_1.json new file mode 100644 index 000000000..efd23b182 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_1.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:soul_forest/cube_temple/part_1", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_2.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_2.json new file mode 100644 index 000000000..cc48144c7 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_2.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:soul_forest/cube_temple/part_2", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_3.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_3.json new file mode 100644 index 000000000..0163d89be --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_3.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:soul_forest/cube_temple/part_3", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_4.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_4.json new file mode 100644 index 000000000..37f95ce9a --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_4.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:soul_forest/cube_temple/part_4", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_5.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_5.json new file mode 100644 index 000000000..2c0a4d79a --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_5.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:soul_forest/cube_temple/part_5", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_6.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_6.json new file mode 100644 index 000000000..defa14412 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_6.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:soul_forest/cube_temple/part_6", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_7.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_7.json new file mode 100644 index 000000000..ef2902a30 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_7.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:soul_forest/cube_temple/part_7", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_8.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_8.json new file mode 100644 index 000000000..225d647d7 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/cube_temple/part_8.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:soul_forest/cube_temple/part_8", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/soul_pillar.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/soul_pillar.json new file mode 100644 index 000000000..638351753 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/soul_pillar.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:soul_forest/pillar", + "processors": "omc_dream:soul_forest/soul_pillar_processor" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/soul_tree.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/soul_tree.json new file mode 100644 index 000000000..e015a7bd9 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/template_pool/soul_forest/soul_tree.json @@ -0,0 +1,41 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:soul_forest/tree_1", + "processors": "omc_dream:soul_forest/soul_tree_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:soul_forest/tree_2", + "processors": "omc_dream:soul_forest/soul_tree_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:soul_forest/tree_3", + "processors": "omc_dream:soul_forest/soul_tree_processor" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "omc_dream:soul_forest/tree_4", + "processors": "omc_dream:soul_forest/soul_tree_processor" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/pack.mcmeta b/src/main/resources/datapacks/omc_dream/pack.mcmeta new file mode 100644 index 000000000..40b54f602 --- /dev/null +++ b/src/main/resources/datapacks/omc_dream/pack.mcmeta @@ -0,0 +1,8 @@ +{ + "pack": { + "description": "", + "pack_format": 94.1, + "min_format": 94.1, + "max_format": 94.1 + } +} \ No newline at end of file diff --git a/src/main/resources/schem/base_camp.schem b/src/main/resources/schem/base_camp.schem deleted file mode 100644 index 41526ae17..000000000 Binary files a/src/main/resources/schem/base_camp.schem and /dev/null differ diff --git a/src/main/resources/schem/cloud_castle.schem b/src/main/resources/schem/cloud_castle.schem deleted file mode 100644 index a26b4545b..000000000 Binary files a/src/main/resources/schem/cloud_castle.schem and /dev/null differ diff --git a/src/main/resources/schem/soul_altar.schem b/src/main/resources/schem/soul_altar.schem deleted file mode 100644 index 9936aa149..000000000 Binary files a/src/main/resources/schem/soul_altar.schem and /dev/null differ diff --git a/src/main/resources/structures/omc_dream/glacite/geode.nbt b/src/main/resources/structures/omc_dream/glacite/geode.nbt deleted file mode 100644 index cdfce0497..000000000 Binary files a/src/main/resources/structures/omc_dream/glacite/geode.nbt and /dev/null differ diff --git a/src/main/resources/structures/omc_dream/glacite/spike_top_1.nbt b/src/main/resources/structures/omc_dream/glacite/spike_top_1.nbt deleted file mode 100644 index 91f58fbad..000000000 Binary files a/src/main/resources/structures/omc_dream/glacite/spike_top_1.nbt and /dev/null differ