diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml.disabled similarity index 100% rename from .github/workflows/build.yml rename to .github/workflows/build.yml.disabled diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 9b36687..a23204f 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -1,8 +1,8 @@ name: publish-snapshot on: push: - tags: - - '*' + branches: + - '**' jobs: publish-snapshot: @@ -12,6 +12,7 @@ jobs: strategy: matrix: loader: [common, fabric, forge, neoforge] + fail-fast: false steps: - name: Checkout repository uses: actions/checkout@v3 @@ -32,7 +33,7 @@ jobs: uses: TwelveIterationMods/bump-version@v1 with: version: ${{ steps.extract-version.outputs.version }} - bump: minor + bump: patch id: bump-version - name: Publish run: ./gradlew :${{ matrix.loader }}:publish '-Pversion=${{ steps.bump-version.outputs.version }}-SNAPSHOT' '-PtwelveIterationsNexusUsername=${{ secrets.NEXUS_USER }}' '-PtwelveIterationsNexusPassword=${{ secrets.NEXUS_PASSWORD }}' \ No newline at end of file diff --git a/.gitignore b/.gitignore index f11fac4..b0b2411 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,7 @@ build eclipse run runs +runserver logs + +common/src/generated/resources/.cache \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 53f2922..0d72dc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,3 @@ +Updated to Minecraft 1.21 + - Updated to Minecraft 1.20.6 \ No newline at end of file diff --git a/common/src/main/java/net/blay09/mods/kleeslabs/KleeSlabs.java b/common/src/main/java/net/blay09/mods/kleeslabs/KleeSlabs.java index 69daefa..861f523 100644 --- a/common/src/main/java/net/blay09/mods/kleeslabs/KleeSlabs.java +++ b/common/src/main/java/net/blay09/mods/kleeslabs/KleeSlabs.java @@ -29,7 +29,7 @@ public static void initialize() { ModNetworking.initialize(Balm.getNetworking()); - Balm.addServerReloadListener(new ResourceLocation(MOD_ID, "json_registry"), new JsonCompatLoader()); + Balm.addServerReloadListener(ResourceLocation.fromNamespaceAndPath(MOD_ID, "json_registry"), new JsonCompatLoader()); Balm.getEvents().onEvent(ServerStartedEvent.class, SlabDumpHandler::onServerStarted); Balm.getEvents().onEvent(PlayerLoginEvent.class, LoginSyncHandler::onPlayerLogin); diff --git a/common/src/main/java/net/blay09/mods/kleeslabs/network/KleeSlabsRegistryMessage.java b/common/src/main/java/net/blay09/mods/kleeslabs/network/KleeSlabsRegistryMessage.java index 94aece7..ad7741d 100644 --- a/common/src/main/java/net/blay09/mods/kleeslabs/network/KleeSlabsRegistryMessage.java +++ b/common/src/main/java/net/blay09/mods/kleeslabs/network/KleeSlabsRegistryMessage.java @@ -16,7 +16,7 @@ public class KleeSlabsRegistryMessage implements CustomPacketPayload { - public static CustomPacketPayload.Type TYPE = new CustomPacketPayload.Type<>(new ResourceLocation(KleeSlabs.MOD_ID, "registry")); + public static CustomPacketPayload.Type TYPE = new CustomPacketPayload.Type<>(ResourceLocation.fromNamespaceAndPath(KleeSlabs.MOD_ID, "registry")); private final boolean isFirst; private final List data; diff --git a/common/src/main/java/net/blay09/mods/kleeslabs/registry/json/JsonCompatLoader.java b/common/src/main/java/net/blay09/mods/kleeslabs/registry/json/JsonCompatLoader.java index c35b49f..518f7cf 100644 --- a/common/src/main/java/net/blay09/mods/kleeslabs/registry/json/JsonCompatLoader.java +++ b/common/src/main/java/net/blay09/mods/kleeslabs/registry/json/JsonCompatLoader.java @@ -134,7 +134,7 @@ private static Block parseBlock(String modId, String name) { name = name.substring(colon + 1); } - Block block = Balm.getRegistries().getBlock(new ResourceLocation(modId, name)); + Block block = Balm.getRegistries().getBlock(ResourceLocation.fromNamespaceAndPath(modId, name)); return block != null ? block : Blocks.AIR; } diff --git a/fabric/dependencies.gradle b/fabric/dependencies.gradle index 23de598..622578b 100644 --- a/fabric/dependencies.gradle +++ b/fabric/dependencies.gradle @@ -2,5 +2,5 @@ dependencies { modImplementation("net.blay09.mods:balm-fabric:${balm_version}") { changing = balm_version.contains("SNAPSHOT") } - modImplementation "com.terraformersmc:modmenu:$modmenu_version" + modCompileOnly "com.terraformersmc:modmenu:$modmenu_version" } \ No newline at end of file diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 8e44641..97f89f1 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -35,11 +35,11 @@ ], "depends": { - "fabricloader": ">=0.14", + "fabricloader": ">=${fabric_loader_version}", "fabric-api": "*", "balm-fabric": "*", - "minecraft": ">=1.20.2", - "java": ">=17" + "minecraft": "${minecraft_version_range}", + "java": ">=${java_version}" }, "suggests": { }, diff --git a/forge/build.gradle b/forge/build.gradle index 73f2ced..d7fd24e 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -1,6 +1,6 @@ plugins { id 'multiloader-loader' - id 'net.minecraftforge.gradle' version '[6.0,6.2)' + id 'net.minecraftforge.gradle' version '[6.0.25,6.2)' id 'org.spongepowered.mixin' id 'net.darkhax.curseforgegradle' id "com.modrinth.minotaur" diff --git a/gradle.properties b/gradle.properties index 2d077fd..118bf8c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ mod_id = kleeslabs mod_name = KleeSlabs mod_main=KleeSlabs description=Break only the half of a double slab that you're looking at. -version = 17.0.1 +version = 21.0.0 group = net.blay09.mods homepage=https://mods.twelveiterations.com/mc/kleeslabs sources=https://github.com/TwelveIterationMods/KleeSlabs @@ -18,15 +18,15 @@ modrinth_release_type = release modrinth_project_id = 7uh75ruZ # Minecraft -minecraft_version = 1.20.6 -minecraft_versions = 1.20.6 -minecraft_version_range = [1.20.6,1.21) +minecraft_version = 1.21-pre4 +minecraft_versions = 1.21-pre4 +minecraft_version_range = 1.21-beta.4 pack_format_number = 18 java_version = 21 # Balm -balm_version = 10.1.0-SNAPSHOT -balm_version_range = [10.0.0,) +balm_version = 21.0.1-SNAPSHOT +balm_version_range = [21.0.0,) # Forge forge_version = 50.0.22 @@ -39,7 +39,7 @@ neoforge_version_range = [20.6,) neoforge_loader_version_range = [1,) # Fabric -fabric_version = 0.98.0+1.20.6 +fabric_version = 0.100.0+1.21 fabric_loader_version = 0.15.11 # Dependencies @@ -50,4 +50,5 @@ modmenu_version=9.0.0 org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false mod_author = BlayTheNinth -credits = BlayTheNinth \ No newline at end of file +credits = BlayTheNinth +kuma_version = [21.0,22) \ No newline at end of file diff --git a/repositories.gradle b/repositories.gradle index fdf3850..2f83bb0 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -33,6 +33,7 @@ repositories { url = "https://maven.terraformersmc.com/releases" content { includeGroup "com.terraformersmc" + includeGroup "dev.emi" } } @@ -56,4 +57,11 @@ repositories { includeGroup "us.dynmap" } } + + maven { + url "https://maven.siphalor.de/" + content { + includeGroup "de.siphalor" + } + } } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index a389f90..5e156c8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -57,5 +57,5 @@ plugins { include("common") include("fabric") -include("forge") -include("neoforge") \ No newline at end of file +// include("forge") +// include("neoforge") \ No newline at end of file