mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2026-10-26 14:00:26 +00:00
Biome Writer
This commit is contained in:
1 parent
986c7f12cd
commit
ca10edef0c
7 files changed
+108
-7
No files matched your search
@@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
package art.arcane.iris.engine.actuator;
|
package art.arcane.iris.engine.actuator;
|
||||||
|
|
||||||
import art.arcane.iris.core.nms.INMS;
|
|
||||||
import art.arcane.iris.engine.framework.Engine;
|
import art.arcane.iris.engine.framework.Engine;
|
||||||
import art.arcane.iris.engine.framework.EngineAssignedActuator;
|
import art.arcane.iris.engine.framework.EngineAssignedActuator;
|
||||||
import art.arcane.iris.engine.object.IrisBiome;
|
import art.arcane.iris.engine.object.IrisBiome;
|
||||||
@@ -31,6 +30,7 @@ import art.arcane.volmlib.util.matter.MatterBiomeInject;
|
|||||||
import art.arcane.volmlib.util.matter.slices.BiomeInjectMatter;
|
import art.arcane.volmlib.util.matter.slices.BiomeInjectMatter;
|
||||||
import art.arcane.volmlib.util.scheduling.ChronoLatch;
|
import art.arcane.volmlib.util.scheduling.ChronoLatch;
|
||||||
import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
|
import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
|
||||||
|
import art.arcane.iris.spi.IrisPlatforms;
|
||||||
import art.arcane.iris.spi.PlatformBiome;
|
import art.arcane.iris.spi.PlatformBiome;
|
||||||
import org.bukkit.block.Biome;
|
import org.bukkit.block.Biome;
|
||||||
|
|
||||||
@@ -56,7 +56,7 @@ public class IrisBiomeActuator extends EngineAssignedActuator<PlatformBiome> {
|
|||||||
|
|
||||||
if (ib.isCustom()) {
|
if (ib.isCustom()) {
|
||||||
IrisBiomeCustom custom = ib.getCustomBiome(rng, x, 0, z);
|
IrisBiomeCustom custom = ib.getCustomBiome(rng, x, 0, z);
|
||||||
matter = BiomeInjectMatter.get(INMS.get().getBiomeBaseIdForKey(getDimension().getLoadKey() + ":" + custom.getId()));
|
matter = BiomeInjectMatter.get(IrisPlatforms.get().biomeWriter().biomeIdFor(getDimension().getLoadKey() + ":" + custom.getId()));
|
||||||
} else {
|
} else {
|
||||||
Biome v = ib.getSkyBiome(rng, x, 0, z);
|
Biome v = ib.getSkyBiome(rng, x, 0, z);
|
||||||
matter = BiomeInjectMatter.get(v);
|
matter = BiomeInjectMatter.get(v);
|
||||||
|
|||||||
+2
-2
@@ -20,7 +20,6 @@ package art.arcane.iris.engine.modifier;
|
|||||||
|
|
||||||
import art.arcane.iris.Iris;
|
import art.arcane.iris.Iris;
|
||||||
import art.arcane.iris.core.loader.IrisData;
|
import art.arcane.iris.core.loader.IrisData;
|
||||||
import art.arcane.iris.core.nms.INMS;
|
|
||||||
import art.arcane.iris.engine.IrisComplex;
|
import art.arcane.iris.engine.IrisComplex;
|
||||||
import art.arcane.iris.engine.decorator.FloatingDecorator;
|
import art.arcane.iris.engine.decorator.FloatingDecorator;
|
||||||
import art.arcane.iris.engine.decorator.IrisSeaSurfaceDecorator;
|
import art.arcane.iris.engine.decorator.IrisSeaSurfaceDecorator;
|
||||||
@@ -47,6 +46,7 @@ import art.arcane.volmlib.util.matter.MatterBiomeInject;
|
|||||||
import art.arcane.volmlib.util.matter.slices.BiomeInjectMatter;
|
import art.arcane.volmlib.util.matter.slices.BiomeInjectMatter;
|
||||||
import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
|
import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
|
||||||
import art.arcane.iris.platform.bukkit.BukkitBlockState;
|
import art.arcane.iris.platform.bukkit.BukkitBlockState;
|
||||||
|
import art.arcane.iris.spi.IrisPlatforms;
|
||||||
import art.arcane.iris.spi.PlatformBlockState;
|
import art.arcane.iris.spi.PlatformBlockState;
|
||||||
import org.bukkit.block.Biome;
|
import org.bukkit.block.Biome;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
@@ -403,7 +403,7 @@ public class IrisFloatingChildBiomeModifier extends EngineAssignedModifier<Platf
|
|||||||
private MatterBiomeInject createSkyBiomeMatter(IrisBiome target, int wx, int wz) {
|
private MatterBiomeInject createSkyBiomeMatter(IrisBiome target, int wx, int wz) {
|
||||||
if (target.isCustom()) {
|
if (target.isCustom()) {
|
||||||
IrisBiomeCustom custom = target.getCustomBiome(rng, wx, 0, wz);
|
IrisBiomeCustom custom = target.getCustomBiome(rng, wx, 0, wz);
|
||||||
return BiomeInjectMatter.get(INMS.get().getBiomeBaseIdForKey(getDimension().getLoadKey() + ":" + custom.getId()));
|
return BiomeInjectMatter.get(IrisPlatforms.get().biomeWriter().biomeIdFor(getDimension().getLoadKey() + ":" + custom.getId()));
|
||||||
}
|
}
|
||||||
|
|
||||||
Biome v = target.getSkyBiome(rng, wx, 0, wz);
|
Biome v = target.getSkyBiome(rng, wx, 0, wz);
|
||||||
|
|||||||
@@ -1,16 +1,26 @@
|
|||||||
package art.arcane.iris.engine.platform;
|
package art.arcane.iris.engine.platform;
|
||||||
|
|
||||||
import art.arcane.iris.core.nms.INMS;
|
import art.arcane.iris.spi.IrisPlatforms;
|
||||||
import art.arcane.volmlib.util.collection.KList;
|
import art.arcane.iris.spi.PlatformBiome;
|
||||||
import org.bukkit.block.Biome;
|
import org.bukkit.block.Biome;
|
||||||
import org.bukkit.generator.BiomeProvider;
|
import org.bukkit.generator.BiomeProvider;
|
||||||
import org.bukkit.generator.WorldInfo;
|
import org.bukkit.generator.WorldInfo;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class DummyBiomeProvider extends BiomeProvider {
|
public class DummyBiomeProvider extends BiomeProvider {
|
||||||
private final List<Biome> ALL = INMS.get().getBiomes();
|
private final List<Biome> ALL = resolveAll();
|
||||||
|
|
||||||
|
private static List<Biome> resolveAll() {
|
||||||
|
List<PlatformBiome> platformBiomes = IrisPlatforms.get().biomeWriter().allBiomes();
|
||||||
|
List<Biome> biomes = new ArrayList<>(platformBiomes.size());
|
||||||
|
for (PlatformBiome biome : platformBiomes) {
|
||||||
|
biomes.add((Biome) biome.nativeHandle());
|
||||||
|
}
|
||||||
|
return biomes;
|
||||||
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
/*
|
||||||
|
* Iris is a World Generator for Minecraft Bukkit Servers
|
||||||
|
* Copyright (c) 2026 Arcane Arts (Volmit Software)
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package art.arcane.iris.platform.bukkit;
|
||||||
|
|
||||||
|
import art.arcane.iris.core.nms.INMS;
|
||||||
|
import art.arcane.iris.spi.PlatformBiome;
|
||||||
|
import art.arcane.iris.spi.PlatformBiomeWriter;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bukkit adapter for biome resolution backed by the active NMS binding.
|
||||||
|
*/
|
||||||
|
public final class BukkitBiomeWriter implements PlatformBiomeWriter {
|
||||||
|
@Override
|
||||||
|
public int biomeIdFor(String key) {
|
||||||
|
return INMS.get().getBiomeBaseIdForKey(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<PlatformBiome> allBiomes() {
|
||||||
|
List<?> natives = INMS.get().getBiomes();
|
||||||
|
List<PlatformBiome> biomes = new ArrayList<>(natives.size());
|
||||||
|
for (Object biome : natives) {
|
||||||
|
biomes.add(BukkitPlatform.wrapBiome(biome));
|
||||||
|
}
|
||||||
|
return biomes;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -23,6 +23,8 @@ import art.arcane.iris.core.nms.INMS;
|
|||||||
import art.arcane.iris.engine.object.IrisPosition;
|
import art.arcane.iris.engine.object.IrisPosition;
|
||||||
import art.arcane.iris.spi.IrisPlatform;
|
import art.arcane.iris.spi.IrisPlatform;
|
||||||
import art.arcane.iris.spi.LogLevel;
|
import art.arcane.iris.spi.LogLevel;
|
||||||
|
import art.arcane.iris.spi.PlatformBiome;
|
||||||
|
import art.arcane.iris.spi.PlatformBiomeWriter;
|
||||||
import art.arcane.iris.spi.PlatformCapabilities;
|
import art.arcane.iris.spi.PlatformCapabilities;
|
||||||
import art.arcane.iris.spi.PlatformRegistries;
|
import art.arcane.iris.spi.PlatformRegistries;
|
||||||
import art.arcane.iris.spi.PlatformScheduler;
|
import art.arcane.iris.spi.PlatformScheduler;
|
||||||
@@ -32,6 +34,7 @@ import art.arcane.iris.util.common.scheduling.J;
|
|||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
|
import org.bukkit.block.Biome;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
@@ -47,11 +50,16 @@ public final class BukkitPlatform implements IrisPlatform {
|
|||||||
private final BukkitScheduler scheduler = new BukkitScheduler();
|
private final BukkitScheduler scheduler = new BukkitScheduler();
|
||||||
private final PlatformCapabilities capabilities = new BukkitCapabilities();
|
private final PlatformCapabilities capabilities = new BukkitCapabilities();
|
||||||
private final BukkitStructureHooks structureHooks = new BukkitStructureHooks();
|
private final BukkitStructureHooks structureHooks = new BukkitStructureHooks();
|
||||||
|
private final BukkitBiomeWriter biomeWriter = new BukkitBiomeWriter();
|
||||||
|
|
||||||
public static World unwrapWorld(PlatformWorld world) {
|
public static World unwrapWorld(PlatformWorld world) {
|
||||||
return (World) world.nativeHandle();
|
return (World) world.nativeHandle();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static PlatformBiome wrapBiome(Object biome) {
|
||||||
|
return BukkitBiome.of((Biome) biome);
|
||||||
|
}
|
||||||
|
|
||||||
public static Class<?> classifyMantleValue(Object value) {
|
public static Class<?> classifyMantleValue(Object value) {
|
||||||
if (value instanceof World) {
|
if (value instanceof World) {
|
||||||
return World.class;
|
return World.class;
|
||||||
@@ -116,6 +124,11 @@ public final class BukkitPlatform implements IrisPlatform {
|
|||||||
return structureHooks;
|
return structureHooks;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PlatformBiomeWriter biomeWriter() {
|
||||||
|
return biomeWriter;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public File dataFolder() {
|
public File dataFolder() {
|
||||||
return Iris.instance.getDataFolder();
|
return Iris.instance.getDataFolder();
|
||||||
|
|||||||
@@ -36,6 +36,8 @@ public interface IrisPlatform {
|
|||||||
|
|
||||||
PlatformStructureHooks structureHooks();
|
PlatformStructureHooks structureHooks();
|
||||||
|
|
||||||
|
PlatformBiomeWriter biomeWriter();
|
||||||
|
|
||||||
File dataFolder();
|
File dataFolder();
|
||||||
|
|
||||||
void dispatchConsoleCommand(String command);
|
void dispatchConsoleCommand(String command);
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
/*
|
||||||
|
* Iris is a World Generator for Minecraft Bukkit Servers
|
||||||
|
* Copyright (c) 2026 Arcane Arts (Volmit Software)
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package art.arcane.iris.spi;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resolves pack biome keys to platform biome ids for mantle injection and enumerates the platform's biome registry.
|
||||||
|
*/
|
||||||
|
public interface PlatformBiomeWriter {
|
||||||
|
int biomeIdFor(String key);
|
||||||
|
|
||||||
|
List<PlatformBiome> allBiomes();
|
||||||
|
}
|
||||||
Reference in new issue
Block a user