remove most references to ConfigPack from API

This commit is contained in:
dfsek
2022-08-21 01:02:10 -07:00
parent 997d2204c7
commit ec8564df2f
33 changed files with 32 additions and 520 deletions

View File

@@ -2,6 +2,7 @@ package com.dfsek.terra.bukkit.world;
import org.bukkit.Location;
import org.bukkit.generator.LimitedRegion;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,12 +87,12 @@ public class BukkitProtoWorld implements ProtoWorld {
}
@Override
public ChunkGenerator getGenerator() {
public @NotNull ChunkGenerator generator() {
return ((BukkitChunkGeneratorWrapper) delegate.getWorld().getGenerator()).getHandle();
}
@Override
public BiomeProvider getBiomeProvider() {
public @NotNull BiomeProvider biomeProvider() {
return biomeProvider;
}

View File

@@ -32,6 +32,8 @@ import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper;
import com.dfsek.terra.bukkit.world.block.state.BukkitBlockEntity;
import com.dfsek.terra.bukkit.world.entity.BukkitEntityType;
import org.jetbrains.annotations.NotNull;
public class BukkitServerWorld implements ServerWorld {
private final org.bukkit.World delegate;
@@ -82,12 +84,12 @@ public class BukkitServerWorld implements ServerWorld {
}
@Override
public ChunkGenerator getGenerator() {
public @NotNull ChunkGenerator generator() {
return ((BukkitChunkGeneratorWrapper) delegate.getGenerator()).getHandle();
}
@Override
public BiomeProvider getBiomeProvider() {
public @NotNull BiomeProvider biomeProvider() {
return ((BukkitChunkGeneratorWrapper) delegate.getGenerator()).getPack().getBiomeProvider();
}

View File

@@ -1,6 +1,5 @@
package com.dfsek.terra.bukkit.nms.v1_19_R1;
import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.bukkit.BukkitAddon;

View File

@@ -3,6 +3,7 @@ package com.dfsek.terra.cli.world;
import com.google.common.collect.Streams;
import net.jafama.FastMath;
import net.querz.mca.MCAFile;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -190,12 +191,12 @@ public class CLIWorld implements ServerWorld, NBTSerializable<Stream<Pair<Vector
}
@Override
public ChunkGenerator getGenerator() {
public @NotNull ChunkGenerator generator() {
return chunkGenerator;
}
@Override
public BiomeProvider getBiomeProvider() {
public @NotNull BiomeProvider biomeProvider() {
return biomeProvider;
}
@@ -265,12 +266,12 @@ public class CLIWorld implements ServerWorld, NBTSerializable<Stream<Pair<Vector
}
@Override
public ChunkGenerator getGenerator() {
public @NotNull ChunkGenerator generator() {
return delegate.chunkGenerator;
}
@Override
public BiomeProvider getBiomeProvider() {
public @NotNull BiomeProvider biomeProvider() {
return biomeProvider;
}

View File

@@ -23,7 +23,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.dfsek.terra.api.addon.BaseAddon;
import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
import com.dfsek.terra.api.event.events.config.pack.ConfigPackPostLoadEvent;
import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;