convert a bunch of stuff to new APIs

This commit is contained in:
dfsek
2025-12-29 21:11:11 -07:00
parent 16705057e0
commit 9a16336f53
29 changed files with 167 additions and 87 deletions
@@ -1,5 +1,7 @@
package com.dfsek.terra.bukkit;
import com.dfsek.terra.api.util.generic.data.types.Maybe;
import io.papermc.paper.command.brigadier.CommandSourceStack;
import org.bukkit.ChatColor;
@@ -24,19 +26,19 @@ public class CloudCommandSender implements CommandSender {
}
@Override
public Optional<Entity> getEntity() {
public Maybe<Entity> getEntity() {
if(delegate instanceof org.bukkit.entity.Entity entity) {
return Optional.of(BukkitAdapter.adapt(entity));
return Maybe.just(BukkitAdapter.adapt(entity));
}
return Optional.empty();
return Maybe.nothing();
}
@Override
public Optional<Player> getPlayer() {
public Maybe<Player> getPlayer() {
if(delegate instanceof org.bukkit.entity.Player player) {
return Optional.of(BukkitAdapter.adapt(player));
return Maybe.just(BukkitAdapter.adapt(player));
}
return Optional.empty();
return Maybe.nothing();
}
@Override
@@ -73,7 +73,7 @@ public class PlatformImpl extends AbstractPlatform {
Bukkit.getWorlds().forEach(world -> {
if(world.getGenerator() instanceof BukkitChunkGeneratorWrapper wrapper) {
getConfigRegistry().get(wrapper.getPack().getRegistryKey()).ifPresent(pack -> {
getConfigRegistry().get(wrapper.getPack().getRegistryKey()).consume(pack -> {
wrapper.setPack(pack);
LOGGER.info("Replaced pack in chunk generator for world {}", world);
});
@@ -182,10 +182,10 @@ public class TerraBukkitPlugin extends JavaPlugin {
ChunkGenerator getDefaultWorldGenerator(@NotNull String worldName, String id) {
if(id == null || id.trim().isEmpty()) { return null; }
return new BukkitChunkGeneratorWrapper(generatorMap.computeIfAbsent(worldName, name -> {
ConfigPack pack = platform.getConfigRegistry().getByID(id).orElseThrow(
() -> new IllegalArgumentException("No such config pack \"" + id + "\""));
ConfigPack pack = platform.getConfigRegistry().getByID(id).collectThrow(
left -> new IllegalArgumentException("No such config pack \"" + id + "\": " + left));
return pack.getGeneratorProvider().newInstance(pack);
}), platform.getRawConfigRegistry().getByID(id).orElseThrow(), platform.getWorldHandle().air());
}), platform.getRawConfigRegistry().getByID(id).collectThrow(RuntimeException::new), platform.getWorldHandle().air());
}
public AsyncScheduler getAsyncScheduler() {
@@ -80,7 +80,7 @@ public class CommonListener implements Listener {
return;
}
ConfigPack pack = platform.getConfigRegistry().get(wrapper.getPack().getRegistryKey()).orElse(null);
ConfigPack pack = platform.getConfigRegistry().get(wrapper.getPack().getRegistryKey()).get((ConfigPack) null);
if(pack == null) {
return;
}