mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-20 23:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fleshed out addon loading

Browse Source
This commit is contained in:
dfsek
2021-02-19 22:49:11 -07:00
parent 5e761c3e29
commit 76f2a3fbc4
20 changed files with 217 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,10 @@
package com.dfsek.terra.bukkit;
import com.dfsek.tectonic.loading.TypeRegistry;
import com.dfsek.terra.addons.addon.TerraAddon;
import com.dfsek.terra.addons.annotations.Addon;
import com.dfsek.terra.addons.annotations.Author;
import com.dfsek.terra.addons.annotations.Version;
import com.dfsek.terra.api.core.TerraPlugin;
import com.dfsek.terra.api.core.event.EventManager;
import com.dfsek.terra.api.core.event.TerraEventManager;
@@ -56,21 +60,22 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
private WorldHandle handle = new BukkitWorldHandle();
private final GenericLoaders genericLoaders = new GenericLoaders(this);
private DebugLogger debugLogger;
private final AddonRegistry addonRegistry = new AddonRegistry();
private final EventManager eventManager = new TerraEventManager(this);
public static final Version BUKKIT_VERSION;
public static final BukkitVersion BUKKIT_VERSION;
static {
String ver = Bukkit.getServer().getClass().getPackage().getName();
if(ver.contains("1_16")) BUKKIT_VERSION = Version.V1_16;
else if(ver.contains("1_15")) BUKKIT_VERSION = Version.V1_15;
else if(ver.contains("1_14")) BUKKIT_VERSION = Version.V1_14;
else if(ver.contains("1_13")) BUKKIT_VERSION = Version.V1_13;
else BUKKIT_VERSION = Version.UNKNOWN;
if(ver.contains("1_16")) BUKKIT_VERSION = BukkitVersion.V1_16;
else if(ver.contains("1_15")) BUKKIT_VERSION = BukkitVersion.V1_15;
else if(ver.contains("1_14")) BUKKIT_VERSION = BukkitVersion.V1_14;
else if(ver.contains("1_13")) BUKKIT_VERSION = BukkitVersion.V1_13;
else BUKKIT_VERSION = BukkitVersion.UNKNOWN;
}
private final AddonRegistry addonRegistry = new AddonRegistry(new BukkitAddon(this), this);
public void reload() {
Map<World, TerraWorld> newMap = new HashMap<>();
@@ -122,10 +127,8 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
public void onEnable() {
debugLogger = new DebugLogger(getLogger());
eventManager.registerListener(new TerraListener(this)); // Register tree injection event
getLogger().info("Running on version " + BUKKIT_VERSION);
if(BUKKIT_VERSION.equals(Version.UNKNOWN)) {
if(BUKKIT_VERSION == BukkitVersion.UNKNOWN) {
getLogger().warning("Terra is running on an unknown Bukkit version. Proceed with caution.");
}
@@ -138,7 +141,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
LangUtil.load(config.getLanguage(), this); // Load language.
debugLogger.setDebug(isDebug());
addonRegistry.loadAll(this);
addonRegistry.loadAll();
registry.loadAll(this); // Load all config packs.
PluginCommand c = Objects.requireNonNull(getCommand("terra"));
@@ -253,7 +256,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
return addonRegistry;
}
public enum Version {
public enum BukkitVersion {
V1_13(13),
V1_14(14),
@@ -266,7 +269,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
private final int index;
Version(int index) {
BukkitVersion(int index) {
this.index = index;
}
@@ -276,8 +279,24 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
* @param other Other version
* @return Whether this version is equal to or later than other.
*/
public boolean above(Version other) {
public boolean above(BukkitVersion other) {
return this.index >= other.index;
}
}
@Addon("Terra")
@Version("1.0.0")
@Author("Terra")
private static final class BukkitAddon extends TerraAddon {
private final TerraPlugin main;
private BukkitAddon(TerraPlugin main) {
this.main = main;
}
@Override
public void initialize() {
main.getEventManager().registerListener(this, new TerraListener(main));
}
}
}

41
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/AddonsCommand.java Normal file
View File

@@ -0,0 +1,41 @@
package com.dfsek.terra.bukkit.command.command;
import com.dfsek.terra.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
import java.util.Collections;
import java.util.List;
public class AddonsCommand extends Command {
public AddonsCommand(Command parent) {
super(parent);
}
@Override
public String getName() {
return "addons";
}
@Override
public List<Command> getSubCommands() {
return Collections.emptyList();
}
@Override
public boolean execute(@NotNull CommandSender sender, org.bukkit.command.@NotNull Command command, @NotNull String label, @NotNull String[] args) {
sender.sendMessage("Installed Addons:");
getMain().getAddons().forEach(addon -> sender.sendMessage(" - " + addon.getName() + " v" + addon.getVersion() + " by " + addon.getAuthor()));
return true;
}
@Override
public int arguments() {
return 0;
}
@Override
public List<String> getTabCompletions(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) {
return Collections.emptyList();
}
}

3
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/TerraCommand.java
View File

@@ -25,7 +25,8 @@ public class TerraCommand extends Command {
new FixChunkCommand(this),
new VersionCommand(this),
new GetBlockCommand(this),
new PacksCommand(this));
new PacksCommand(this),
new AddonsCommand(this));
public TerraCommand(TerraPlugin main) {
super(main);

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java
View File

@@ -2,6 +2,7 @@ package com.dfsek.terra.bukkit.listeners;
import com.dfsek.terra.api.core.TerraPlugin;
import com.dfsek.terra.api.core.event.EventListener;
import com.dfsek.terra.api.core.event.annotations.Global;
import com.dfsek.terra.api.core.event.events.config.ConfigPackPreLoadEvent;
import com.dfsek.terra.bukkit.world.BukkitAdapter;
import com.dfsek.terra.bukkit.world.BukkitTree;
@@ -14,6 +15,7 @@ public class TerraListener implements EventListener {
this.main = main;
}
@Global
public void injectTrees(ConfigPackPreLoadEvent event) {
for(TreeType value : TreeType.values()) {
event.getPack().getTreeRegistry().add(BukkitAdapter.TREE_TRANSFORMER.translate(value), new BukkitTree(value, main));

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitBlockData.java
View File

@@ -28,7 +28,7 @@ public class BukkitBlockData implements BlockData {
if(bukkitData instanceof Rail) return new BukkitRail((Rail) bukkitData);
if(bukkitData instanceof Stairs) return new BukkitStairs((Stairs) bukkitData);
if(bukkitData instanceof Slab) return new BukkitSlab((Slab) bukkitData);
if(TerraBukkitPlugin.BUKKIT_VERSION.above(TerraBukkitPlugin.Version.V1_16) && bukkitData instanceof Wall) { // Wall only exists on 1.16 and up.
if(TerraBukkitPlugin.BUKKIT_VERSION.above(TerraBukkitPlugin.BukkitVersion.V1_16) && bukkitData instanceof Wall) { // Wall only exists on 1.16 and up.
return new BukkitWall((Wall) bukkitData);
}