diff --git a/build.gradle b/build.gradle index 6f8926470..35d1b828b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "com.gradleup.shadow" version "9.4.1" + id "com.gradleup.shadow" version "9.4.2" id "io.papermc.paperweight.userdev" version "${paperWeightUserDevVersion}" id("xyz.jpenilla.run-paper") version "3.0.2" // Will use ${minecraftVersion} for the paper version } diff --git a/gradle.properties b/gradle.properties index 1033ab9f6..89bfc59ba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -minecraftVersion = 26.1.2 +minecraftVersion = 26.2 paperWeightUserDevVersion = 2.0.0-beta.21 # Plugins @@ -17,7 +17,7 @@ ormVersion = 6.1 lombokVersion = 1.18.46 # Test Dependencies -slf4jVersion = 2.0.17 -junitVersion = 6.0.3 +slf4jVersion = 2.1.0-alpha1 +junitVersion = 6.1 mockbukkitVersion = 4.113.1 h2DatabaseVersion = 2.4.240 diff --git a/src/main/java/fr/openmc/api/datapacks/injectors/PackMetadataInjector.java b/src/main/java/fr/openmc/api/datapacks/injectors/PackMetadataInjector.java index ee06d15b2..dc6681ffc 100644 --- a/src/main/java/fr/openmc/api/datapacks/injectors/PackMetadataInjector.java +++ b/src/main/java/fr/openmc/api/datapacks/injectors/PackMetadataInjector.java @@ -8,7 +8,7 @@ import java.nio.file.Path; public class PackMetadataInjector implements DatapackInjector { - private static final double[] PACK_FORMAT = new double[] {101.1, 1}; + private static final double[] PACK_FORMAT = new double[] {107.1, 1}; @Override public void inject(File rootFile) { diff --git a/src/main/java/fr/openmc/core/bootstrap/integration/ResourcePacksGenerator.java b/src/main/java/fr/openmc/core/bootstrap/integration/ResourcePacksGenerator.java index abd7ab6aa..fc4104b6f 100644 --- a/src/main/java/fr/openmc/core/bootstrap/integration/ResourcePacksGenerator.java +++ b/src/main/java/fr/openmc/core/bootstrap/integration/ResourcePacksGenerator.java @@ -16,7 +16,7 @@ public class ResourcePacksGenerator { // https://minecraft.wiki/w/Pack_format - private static final String FORMAT_VERSION = "84"; + private static final String FORMAT_VERSION = "88"; /** * Generate the base structure of a resource pack in the plugin's data folder, with the given name. diff --git a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/lake/glacite_lake.json b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/lake/glacite_lake.json index b17afc6fe..2d163f2ab 100644 --- a/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/lake/glacite_lake.json +++ b/src/main/resources/datapacks/omc_dream/data/omc_dream/worldgen/configured_feature/glacite/lake/glacite_lake.json @@ -12,6 +12,15 @@ "state": { "Name": "blue_ice" } + }, + "can_place_feature": { + "type": "minecraft:true" + }, + "can_replace_with_air_or_fluid": { + "type": "minecraft:true" + }, + "can_replace_with_barrier": { + "type": "minecraft:true" } } } \ No newline at end of file diff --git a/src/main/resources/datapacks/omc_dream/pack.mcmeta b/src/main/resources/datapacks/omc_dream/pack.mcmeta index 50948629b..d34453c06 100644 --- a/src/main/resources/datapacks/omc_dream/pack.mcmeta +++ b/src/main/resources/datapacks/omc_dream/pack.mcmeta @@ -1,8 +1,8 @@ { "pack": { "description": "Le Pack de données des Rêves d'OpenMC", - "pack_format": 101, - "min_format": 101, - "max_format": 101 + "pack_format": 107.1, + "min_format": 107.1, + "max_format": 107.1 } } \ No newline at end of file