diff --git a/README.md b/README.md index f55d612da..64340405d 100644 --- a/README.md +++ b/README.md @@ -17,11 +17,11 @@ Nouveau plugin collaboratif pour un serveur : VOTRE serveur ! 3. Une fois qu'une fonctionnalité est implémentée et fonctionnelle, créez une pull request. 4. Après approbation, elle sera disponible sur le serveur de développement pour les tests. -Serveur de test : `dev.openmc.fr` (1.21.10 Java Edition) +Serveur de test : `dev.openmc.fr` (1.21.11 Java Edition) -Serveur de la beta : `beta.openmc.fr` (1.21.10 Java Edition) +Serveur de la beta : `beta.openmc.fr` (1.21.11 Java Edition) -Serveur de jeu : `play.openmc.fr` (1.21.10 Java Edition) +Serveur de jeu : `play.openmc.fr` (1.21.11 Java Edition) ## 📘 En apprendre plus. Vous voulez en savoir plus ? Vous voulez avoir des tutoriels à propos d'OpenMC ? diff --git a/build.gradle b/build.gradle index 5a2c1be0d..b0ba44f70 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,9 @@ dependencies { compileOnly "dev.lone:api-itemsadder:${itemsAdderVersion}" compileOnly "net.luckperms:api:${luckpermsVersion}" compileOnly "me.clip:placeholderapi:${placeholderApiVersion}" - compileOnly "com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit" + compileOnly ("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit:${fastAsyncWorldeditVersion}") { + exclude group: 'org.lz4', module: 'lz4-java' + } compileOnly "com.sk89q.worldedit:worldedit-bukkit:${worldeditVersion}" compileOnly "de.oliver:FancyNpcs:${fancyNpcsVersion}" compileOnly "net.dmulloy2:ProtocolLib:${protocolLibVersion}" diff --git a/gradle.properties b/gradle.properties index e6026cb61..4c85b76c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,13 @@ -minecraftVersion = 1.21.10 -paperWeightUserDevVersion = 2.0.0-beta.18 +minecraftVersion = 1.21.11 +paperWeightUserDevVersion = 2.0.0-beta.19 # Plugins worldguardVersion = 7.0.10 itemsAdderVersion = 4.0.10 luckpermsVersion = 5.5 placeholderApiVersion = 2.11.6 -worldeditVersion = 7.2.9 +fastAsyncWorldeditVersion = 2.14.3 +worldeditVersion = 7.3.18 fancyNpcsVersion = 2.6.0 protocolLibVersion = 5.4.0 @@ -20,4 +21,4 @@ lombokVersion = 1.18.38 slf4jVersion = 2.0.17 junitVersion = 5.13.1 mockbukkitVersion = 4.97.0 -h2DatabaseVersion = 2.3.232 \ No newline at end of file +h2DatabaseVersion = 2.3.232 diff --git a/src/main/java/fr/openmc/core/features/dream/generation/DreamDimensionManager.java b/src/main/java/fr/openmc/core/features/dream/generation/DreamDimensionManager.java index a16972a62..0e46d2277 100644 --- a/src/main/java/fr/openmc/core/features/dream/generation/DreamDimensionManager.java +++ b/src/main/java/fr/openmc/core/features/dream/generation/DreamDimensionManager.java @@ -15,10 +15,7 @@ import fr.openmc.core.features.dream.generation.structures.soulforest.SoulAltarStructure; import fr.openmc.core.utils.structure.FeaturesPopulator; import fr.openmc.core.utils.structure.SchematicsUtils; -import org.bukkit.Bukkit; -import org.bukkit.GameRule; -import org.bukkit.World; -import org.bukkit.WorldCreator; +import org.bukkit.*; import org.bukkit.block.Biome; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; @@ -122,15 +119,15 @@ public static void createDimension() { registeredFeatures.forEach(populator -> dream.getPopulators().add(populator)); // ** SET GAMERULE FOR THE WORLD ** - dream.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, false); - dream.setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, false); - dream.setGameRule(GameRule.DO_WEATHER_CYCLE, false); - dream.setGameRule(GameRule.DISABLE_RAIDS, true); - dream.setGameRule(GameRule.DO_PATROL_SPAWNING, false); - dream.setGameRule(GameRule.DO_TRADER_SPAWNING, false); - dream.setGameRule(GameRule.NATURAL_REGENERATION, false); - dream.setGameRule(GameRule.LOCATOR_BAR, false); - dream.setGameRule(GameRule.ALLOW_ENTERING_NETHER_USING_PORTALS, false); + dream.setGameRule(GameRules.ADVANCE_TIME, false); + dream.setGameRule(GameRules.SHOW_ADVANCEMENT_MESSAGES, false); + dream.setGameRule(GameRules.ADVANCE_WEATHER, false); + dream.setGameRule(GameRules.RAIDS, true); + dream.setGameRule(GameRules.SPAWN_PATROLS, false); + dream.setGameRule(GameRules.SPAWN_WANDERING_TRADERS, false); + dream.setGameRule(GameRules.NATURAL_HEALTH_REGENERATION, false); + dream.setGameRule(GameRules.LOCATOR_BAR, false); + dream.setGameRule(GameRules.ALLOW_ENTERING_NETHER_USING_PORTALS, false); dream.setTime(18000); diff --git a/src/main/java/fr/openmc/core/features/mainmenu/listeners/PacketListener.java b/src/main/java/fr/openmc/core/features/mainmenu/listeners/PacketListener.java index fe0714fe2..90ca5e8bf 100644 --- a/src/main/java/fr/openmc/core/features/mainmenu/listeners/PacketListener.java +++ b/src/main/java/fr/openmc/core/features/mainmenu/listeners/PacketListener.java @@ -11,9 +11,9 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.ClientboundUpdateAdvancementsPacket; import net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket; -import net.minecraft.resources.ResourceLocation; import net.minecraft.server.network.ServerGamePacketListenerImpl; import net.minecraft.world.item.ItemStack; +import net.minecraft.resources.Identifier; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -66,7 +66,7 @@ private static ClientboundUpdateAdvancementsPacket createEmptyAdvancementPacket( new AdvancementRequirements(new ArrayList<>()), false ); - AdvancementHolder advancementHolder = new AdvancementHolder(ResourceLocation.fromNamespaceAndPath("openmc", "advancement"), advancement); + AdvancementHolder advancementHolder = new AdvancementHolder(Identifier.fromNamespaceAndPath("openmc", "advancement"), advancement); return new ClientboundUpdateAdvancementsPacket( true, Collections.singletonList(advancementHolder), diff --git a/src/main/java/fr/openmc/core/listeners/SleepListener.java b/src/main/java/fr/openmc/core/listeners/SleepListener.java index fe204c918..794ccc140 100644 --- a/src/main/java/fr/openmc/core/listeners/SleepListener.java +++ b/src/main/java/fr/openmc/core/listeners/SleepListener.java @@ -1,6 +1,7 @@ package fr.openmc.core.listeners; import org.bukkit.GameRule; +import org.bukkit.GameRules; import org.bukkit.World; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -38,21 +39,21 @@ public class SleepListener implements Listener { @EventHandler public void onPlayerJoin(PlayerJoinEvent event) { World world = event.getPlayer().getWorld(); - world.setGameRule(GameRule.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(world.getPlayers().size() + 1)); + world.setGameRule(GameRules.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(world.getPlayers().size() + 1)); } @EventHandler public void onQuit(PlayerQuitEvent event) { World world = event.getPlayer().getWorld(); - world.setGameRule(GameRule.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(world.getPlayers().size() - 1)); + world.setGameRule(GameRules.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(world.getPlayers().size() - 1)); } @EventHandler public void onChangeWorld(PlayerChangedWorldEvent event) { World oldWorld = event.getFrom(); World newWorld = event.getPlayer().getWorld(); - oldWorld.setGameRule(GameRule.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(oldWorld.getPlayers().size())); - newWorld.setGameRule(GameRule.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(newWorld.getPlayers().size())); + oldWorld.setGameRule(GameRules.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(oldWorld.getPlayers().size())); + newWorld.setGameRule(GameRules.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(newWorld.getPlayers().size())); } /** diff --git a/src/main/java/fr/openmc/core/utils/DiscordWebhook.java b/src/main/java/fr/openmc/core/utils/DiscordWebhook.java index d1d67992b..7d1f798ed 100644 --- a/src/main/java/fr/openmc/core/utils/DiscordWebhook.java +++ b/src/main/java/fr/openmc/core/utils/DiscordWebhook.java @@ -1,6 +1,6 @@ package fr.openmc.core.utils; -import net.minidev.json.JSONObject; +import org.json.simple.JSONObject; import javax.net.ssl.HttpsURLConnection; import java.io.InputStream; diff --git a/src/main/resources/datapack/pack.mcmeta b/src/main/resources/datapack/pack.mcmeta index ca66febb4..4b14e0298 100644 --- a/src/main/resources/datapack/pack.mcmeta +++ b/src/main/resources/datapack/pack.mcmeta @@ -1,7 +1,7 @@ { "pack": { "description": "Le datapack d'OpenMC", - "min_format": [88, 0], - "max_format": [88, 0] + "min_format": [94, 0], + "max_format": [94, 0] } } diff --git a/src/test/resources/paper-plugin.yml b/src/test/resources/paper-plugin.yml index cf7c513b6..6f9c997e1 100644 --- a/src/test/resources/paper-plugin.yml +++ b/src/test/resources/paper-plugin.yml @@ -1,5 +1,5 @@ name: OpenMC version: ${version} main: fr.openmc.core.OMCPlugin -api-version: '1.21.10' +api-version: '1.21.11' prefix: OMC