mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-03 22:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

create TaskScheduler

Browse Source
This commit is contained in:
dfsek
2021-04-21 15:37:10 -07:00
parent 901677d2c3
commit 5821302eb8
9 changed files with 127 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
View File

@@ -18,6 +18,7 @@ import com.dfsek.terra.api.platform.world.Biome;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.LockedRegistry;
import com.dfsek.terra.api.task.TaskScheduler;
import com.dfsek.terra.api.util.logging.DebugLogger;
import com.dfsek.terra.api.util.logging.JavaLogger;
import com.dfsek.terra.api.util.logging.Logger;
@@ -32,6 +33,7 @@ import com.dfsek.terra.bukkit.listeners.CommonListener;
import com.dfsek.terra.bukkit.listeners.PaperListener;
import com.dfsek.terra.bukkit.listeners.SpigotListener;
import com.dfsek.terra.bukkit.listeners.TerraListener;
import com.dfsek.terra.bukkit.task.BukkitTaskScheduler;
import com.dfsek.terra.bukkit.util.PaperUtil;
import com.dfsek.terra.bukkit.world.BukkitBiome;
import com.dfsek.terra.commands.CommandUtil;
@@ -64,6 +66,8 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
private final Map<World, TerraWorld> worldMap = new HashMap<>();
private final Map<String, ConfigPack> worlds = new HashMap<>();
private final TaskScheduler scheduler = new BukkitTaskScheduler(this);
private final ConfigRegistry registry = new ConfigRegistry();
private final CheckedRegistry<ConfigPack> checkedRegistry = new CheckedRegistry<>(registry);
@@ -141,6 +145,11 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
Bukkit.getScheduler().runTask(this, task);
}
@Override
public TaskScheduler getScheduler() {
return scheduler;
}
@Override
public void onDisable() {
BukkitChunkGeneratorWrapper.saveAll();

33
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/task/BukkitTaskScheduler.java Normal file
View File

@@ -0,0 +1,33 @@
package com.dfsek.terra.bukkit.task;
import com.dfsek.terra.api.task.TaskScheduler;
import com.dfsek.terra.bukkit.TerraBukkitPlugin;
import org.bukkit.Bukkit;
public class BukkitTaskScheduler implements TaskScheduler {
private final TerraBukkitPlugin plugin;
public BukkitTaskScheduler(TerraBukkitPlugin plugin) {
this.plugin = plugin;
}
@Override
public void runTaskAsynchronously(Runnable task, long ticks) {
Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, task, ticks);
}
@Override
public void runTask(Runnable task, long ticks) {
Bukkit.getScheduler().runTaskLater(plugin, task, ticks);
}
@Override
public void runTask(Runnable task) {
Bukkit.getScheduler().runTask(plugin, task);
}
@Override
public void runTaskAsynchronously(Runnable task) {
Bukkit.getScheduler().runTask(plugin, task);
}
}

10
platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
View File

@@ -24,6 +24,7 @@ import com.dfsek.terra.api.platform.world.Tree;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.LockedRegistry;
import com.dfsek.terra.api.task.TaskScheduler;
import com.dfsek.terra.api.transform.NotNullValidator;
import com.dfsek.terra.api.transform.Transformer;
import com.dfsek.terra.api.util.logging.DebugLogger;
@@ -38,6 +39,7 @@ import com.dfsek.terra.config.pack.ConfigPack;
import com.dfsek.terra.config.templates.BiomeTemplate;
import com.dfsek.terra.fabric.inventory.FabricItemHandle;
import com.dfsek.terra.fabric.mixin.GeneratorTypeAccessor;
import com.dfsek.terra.fabric.task.FabricTaskScheduler;
import com.dfsek.terra.fabric.world.FabricAdapter;
import com.dfsek.terra.fabric.world.FabricBiome;
import com.dfsek.terra.fabric.world.FabricTree;
@@ -98,7 +100,6 @@ import static net.minecraft.server.command.CommandManager.literal;
public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
public static final PopulatorFeature POPULATOR_FEATURE = new PopulatorFeature(DefaultFeatureConfig.CODEC);
public static final ConfiguredFeature<?, ?> POPULATOR_CONFIGURED_FEATURE = POPULATOR_FEATURE.configure(FeatureConfig.DEFAULT).decorate(Decorator.NOPE.configure(NopeDecoratorConfig.INSTANCE));
private static TerraFabricPlugin instance;
@@ -134,6 +135,8 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
private final Transformer<String, Biome> biomeFixer = new Transformer.Builder<String, Biome>()
.addTransform(id -> BuiltinRegistries.BIOME.get(Identifier.tryParse(id)), new NotNullValidator<>())
.addTransform(id -> BuiltinRegistries.BIOME.get(Identifier.tryParse("minecraft:" + id.toLowerCase())), new NotNullValidator<>()).build();
private final TaskScheduler scheduler = new FabricTaskScheduler();
private File dataFolder;
public static TerraFabricPlugin getInstance() {
@@ -391,6 +394,11 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
return eventManager;
}
@Override
public TaskScheduler getScheduler() {
return scheduler;
}
@Addon("Terra-Fabric")
@Author("Terra")
@Version("1.0.0")

20
platforms/fabric/src/main/java/com/dfsek/terra/fabric/task/FabricTaskScheduler.java Normal file
View File

@@ -0,0 +1,20 @@
package com.dfsek.terra.fabric.task;
import com.dfsek.terra.api.task.TaskScheduler;
import net.minecraft.server.MinecraftServer;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
public class FabricTaskScheduler implements TaskScheduler {
private final ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()-1);
@Override
public void runTaskAsynchronously(Runnable task, long ticks) {
runTask(() -> executorService.execute(task), ticks);
}
@Override
public void runTask(Runnable task, long ticks) {
// TODO implementation
}
}

6
platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java
View File

@@ -12,6 +12,7 @@ import com.dfsek.terra.api.platform.world.Biome;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.LockedRegistry;
import com.dfsek.terra.api.task.TaskScheduler;
import com.dfsek.terra.api.util.logging.DebugLogger;
import com.dfsek.terra.api.util.logging.JavaLogger;
import com.dfsek.terra.config.GenericLoaders;
@@ -147,4 +148,9 @@ public class StandalonePlugin implements TerraPlugin {
public EventManager getEventManager() {
return eventManager;
}
@Override
public TaskScheduler getScheduler() {
return null;
}
}

6
platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java
View File

@@ -10,6 +10,7 @@ import com.dfsek.terra.api.platform.handle.WorldHandle;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.LockedRegistry;
import com.dfsek.terra.api.task.TaskScheduler;
import com.dfsek.terra.api.util.logging.DebugLogger;
import com.dfsek.terra.config.PluginConfig;
import com.dfsek.terra.config.lang.Language;
@@ -138,4 +139,9 @@ public class TerraSpongePlugin implements TerraPlugin {
public EventManager getEventManager() {
return eventManager;
}
@Override
public TaskScheduler getScheduler() {
return null;
}
}