mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-10-26 14:00:14 +00:00
Fix minor Gaea related issues
This commit is contained in:
1 parent
95e39324c7
commit
3dc27f2b0a
3 files changed
+2
-10
No files matched your search
@@ -12,7 +12,7 @@ import java.io.Serializable;
|
|||||||
|
|
||||||
public class SerializationUtil {
|
public class SerializationUtil {
|
||||||
public static Object fromFile(File f) throws IOException, ClassNotFoundException {
|
public static Object fromFile(File f) throws IOException, ClassNotFoundException {
|
||||||
ObjectInputStream ois = new MovedObjectInputStream(new FileInputStream(f), "com.dfsek.betterend.gaea", "com.dfsek.terra.api.gaea"); // Backwards compat with old BetterEnd shade location
|
ObjectInputStream ois = new MovedObjectInputStream(new FileInputStream(f), "org.polydev.gaea", "com.dfsek.terra.api.gaea"); // Backwards compat with old Gaea location
|
||||||
Object o = ois.readObject();
|
Object o = ois.readObject();
|
||||||
ois.close();
|
ois.close();
|
||||||
return o;
|
return o;
|
||||||
|
|||||||
@@ -2,14 +2,11 @@ package com.dfsek.terra.command;
|
|||||||
|
|
||||||
import com.dfsek.terra.api.gaea.command.Command;
|
import com.dfsek.terra.api.gaea.command.Command;
|
||||||
import com.dfsek.terra.config.lang.LangUtil;
|
import com.dfsek.terra.config.lang.LangUtil;
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.plugin.Plugin;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
public class VersionCommand extends Command {
|
public class VersionCommand extends Command {
|
||||||
public VersionCommand(Command parent) {
|
public VersionCommand(Command parent) {
|
||||||
@@ -28,12 +25,8 @@ public class VersionCommand extends Command {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean execute(@NotNull CommandSender sender, org.bukkit.command.@NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
public boolean execute(@NotNull CommandSender sender, org.bukkit.command.@NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
||||||
Plugin gaea = Objects.requireNonNull(Bukkit.getPluginManager().getPlugin("Gaea"));
|
|
||||||
String gaeaVersion = gaea.getDescription().getVersion();
|
|
||||||
|
|
||||||
String terraVersion = getMain().getDescription().getVersion();
|
String terraVersion = getMain().getDescription().getVersion();
|
||||||
LangUtil.send("command.version", sender, terraVersion, gaeaVersion);
|
LangUtil.send("command.version", sender, terraVersion);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
name: "Terra"
|
name: "Terra"
|
||||||
depend: [ "Gaea" ]
|
|
||||||
main: "com.dfsek.terra.Terra"
|
main: "com.dfsek.terra.Terra"
|
||||||
version: "@VERSION@"
|
version: "@VERSION@"
|
||||||
load: "STARTUP"
|
load: "STARTUP"
|
||||||
|
|||||||
Reference in new issue
Block a user