From fd20837b555293902a15cf634b654d8ea74d51ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Sun, 17 Dec 2023 15:29:18 -0700 Subject: [PATCH 1/2] fix error on startup --- .../main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java index 8540f64e5..a8701da17 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java @@ -63,14 +63,13 @@ public class TerraBukkitPlugin extends JavaPlugin { return; } + platform.getEventManager().callEvent(new PlatformInitializationEvent()); + if(!Initializer.init(platform)) { Bukkit.getPluginManager().disablePlugin(this); return; } - platform.getEventManager().callEvent(new PlatformInitializationEvent()); - - try { PaperCommandManager commandManager = getCommandSenderPaperCommandManager(); From 3745c3e947c8b1f955e9c934f12ea402ef29907f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Sun, 17 Dec 2023 15:32:35 -0700 Subject: [PATCH 2/2] fix typos --- .../com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java | 4 ++-- .../java/com/dfsek/terra/mod/handle/MinecraftWorldHandle.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java index 1d8744bcf..e3b92b069 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java @@ -46,7 +46,7 @@ public class BukkitWorldHandle implements WorldHandle { data = "minecraft:short_grass"; logger.warn( "Translating minecraft:grass to minecraft:short_grass. In 1.20.3 minecraft:grass was renamed to minecraft:short_grass" + - ". You are advised to preform this rename in your config backs as this translation will be removed in the next major " + + ". You are advised to perform this rename in your config backs as this translation will be removed in the next major " + "version of Terra."); } org.bukkit.block.data.BlockData bukkitData = Bukkit.createBlockData( @@ -65,7 +65,7 @@ public class BukkitWorldHandle implements WorldHandle { String newid = "minecraft:" + id.toLowerCase();; logger.warn( "Translating " + id + " to " + newid + ". In 1.20.3 entity parsing was reworked" + - ". You are advised to preform this rename in your config backs as this translation will be removed in the next major " + + ". You are advised to perform this rename in your config backs as this translation will be removed in the next major " + "version of Terra."); } if(!id.startsWith("minecraft:")) throw new IllegalArgumentException("Invalid entity identifier " + id); diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/handle/MinecraftWorldHandle.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/handle/MinecraftWorldHandle.java index bc00f3a12..3b5e1fe49 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/handle/MinecraftWorldHandle.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/handle/MinecraftWorldHandle.java @@ -45,7 +45,7 @@ public class MinecraftWorldHandle implements WorldHandle { data = "minecraft:short_grass"; logger.warn( "Translating minecraft:grass to minecraft:short_grass. In 1.20.3 minecraft:grass was renamed to minecraft:short_grass" + - ". You are advised to preform this rename in your config packs as this translation will be removed in the next major " + + ". You are advised to perform this rename in your config packs as this translation will be removed in the next major " + "version of Terra."); } net.minecraft.block.BlockState state = BlockArgumentParser.block(Registries.BLOCK.getReadOnlyWrapper(), data, true) @@ -68,7 +68,7 @@ public class MinecraftWorldHandle implements WorldHandle { String newid = "minecraft:" + id.toLowerCase();; logger.warn( "Translating " + id + " to " + newid + ". In 1.20.3 entity parsing was reworked" + - ". You are advised to preform this rename in your config packs as this translation will be removed in the next major " + + ". You are advised to perform this rename in your config packs as this translation will be removed in the next major " + "version of Terra."); id = newid; }