Skip to content

Commit 1012926

Browse files
committed
feat: Update to Minecraft 1.21
1 parent a6fd42a commit 1012926

File tree

13 files changed

+36
-21
lines changed

13 files changed

+36
-21
lines changed
File renamed without changes.

.github/workflows/publish-snapshot.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: publish-snapshot
22
on:
33
push:
4-
tags:
5-
- '*'
4+
branches:
5+
- '**'
66

77
jobs:
88
publish-snapshot:
@@ -12,6 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
loader: [common, fabric, forge, neoforge]
15+
fail-fast: false
1516
steps:
1617
- name: Checkout repository
1718
uses: actions/checkout@v3
@@ -32,7 +33,7 @@ jobs:
3233
uses: TwelveIterationMods/bump-version@v1
3334
with:
3435
version: ${{ steps.extract-version.outputs.version }}
35-
bump: minor
36+
bump: patch
3637
id: bump-version
3738
- name: Publish
3839
run: ./gradlew :${{ matrix.loader }}:publish '-Pversion=${{ steps.bump-version.outputs.version }}-SNAPSHOT' '-PtwelveIterationsNexusUsername=${{ secrets.NEXUS_USER }}' '-PtwelveIterationsNexusPassword=${{ secrets.NEXUS_PASSWORD }}'

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,7 @@ build
2121
eclipse
2222
run
2323
runs
24+
runserver
2425
logs
26+
27+
common/src/generated/resources/.cache

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
Updated to Minecraft 1.21
2+
13
- Updated to Minecraft 1.20.6

common/src/main/java/net/blay09/mods/kleeslabs/KleeSlabs.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static void initialize() {
2929

3030
ModNetworking.initialize(Balm.getNetworking());
3131

32-
Balm.addServerReloadListener(new ResourceLocation(MOD_ID, "json_registry"), new JsonCompatLoader());
32+
Balm.addServerReloadListener(ResourceLocation.fromNamespaceAndPath(MOD_ID, "json_registry"), new JsonCompatLoader());
3333

3434
Balm.getEvents().onEvent(ServerStartedEvent.class, SlabDumpHandler::onServerStarted);
3535
Balm.getEvents().onEvent(PlayerLoginEvent.class, LoginSyncHandler::onPlayerLogin);

common/src/main/java/net/blay09/mods/kleeslabs/network/KleeSlabsRegistryMessage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
public class KleeSlabsRegistryMessage implements CustomPacketPayload {
1818

19-
public static CustomPacketPayload.Type<KleeSlabsRegistryMessage> TYPE = new CustomPacketPayload.Type<>(new ResourceLocation(KleeSlabs.MOD_ID, "registry"));
19+
public static CustomPacketPayload.Type<KleeSlabsRegistryMessage> TYPE = new CustomPacketPayload.Type<>(ResourceLocation.fromNamespaceAndPath(KleeSlabs.MOD_ID, "registry"));
2020

2121
private final boolean isFirst;
2222
private final List<SlabRegistryData> data;

common/src/main/java/net/blay09/mods/kleeslabs/registry/json/JsonCompatLoader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ private static Block parseBlock(String modId, String name) {
134134
name = name.substring(colon + 1);
135135
}
136136

137-
Block block = Balm.getRegistries().getBlock(new ResourceLocation(modId, name));
137+
Block block = Balm.getRegistries().getBlock(ResourceLocation.fromNamespaceAndPath(modId, name));
138138
return block != null ? block : Blocks.AIR;
139139
}
140140

fabric/dependencies.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ dependencies {
22
modImplementation("net.blay09.mods:balm-fabric:${balm_version}") {
33
changing = balm_version.contains("SNAPSHOT")
44
}
5-
modImplementation "com.terraformersmc:modmenu:$modmenu_version"
5+
modCompileOnly "com.terraformersmc:modmenu:$modmenu_version"
66
}

fabric/src/main/resources/fabric.mod.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
],
3636

3737
"depends": {
38-
"fabricloader": ">=0.14",
38+
"fabricloader": ">=${fabric_loader_version}",
3939
"fabric-api": "*",
4040
"balm-fabric": "*",
41-
"minecraft": ">=1.20.2",
42-
"java": ">=17"
41+
"minecraft": "${minecraft_version_range}",
42+
"java": ">=${java_version}"
4343
},
4444
"suggests": {
4545
},

forge/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'multiloader-loader'
3-
id 'net.minecraftforge.gradle' version '[6.0,6.2)'
3+
id 'net.minecraftforge.gradle' version '[6.0.25,6.2)'
44
id 'org.spongepowered.mixin'
55
id 'net.darkhax.curseforgegradle'
66
id "com.modrinth.minotaur"

gradle.properties

+9-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ mod_id = kleeslabs
33
mod_name = KleeSlabs
44
mod_main=KleeSlabs
55
description=Break only the half of a double slab that you're looking at.
6-
version = 17.0.1
6+
version = 21.0.0
77
group = net.blay09.mods
88
homepage=https://mods.twelveiterations.com/mc/kleeslabs
99
sources=https://github.com/TwelveIterationMods/KleeSlabs
@@ -18,15 +18,15 @@ modrinth_release_type = release
1818
modrinth_project_id = 7uh75ruZ
1919

2020
# Minecraft
21-
minecraft_version = 1.20.6
22-
minecraft_versions = 1.20.6
23-
minecraft_version_range = [1.20.6,1.21)
21+
minecraft_version = 1.21-pre4
22+
minecraft_versions = 1.21-pre4
23+
minecraft_version_range = 1.21-beta.4
2424
pack_format_number = 18
2525
java_version = 21
2626

2727
# Balm
28-
balm_version = 10.1.0-SNAPSHOT
29-
balm_version_range = [10.0.0,)
28+
balm_version = 21.0.1-SNAPSHOT
29+
balm_version_range = [21.0.0,)
3030

3131
# Forge
3232
forge_version = 50.0.22
@@ -39,7 +39,7 @@ neoforge_version_range = [20.6,)
3939
neoforge_loader_version_range = [1,)
4040

4141
# Fabric
42-
fabric_version = 0.98.0+1.20.6
42+
fabric_version = 0.100.0+1.21
4343
fabric_loader_version = 0.15.11
4444

4545
# Dependencies
@@ -50,4 +50,5 @@ modmenu_version=9.0.0
5050
org.gradle.jvmargs=-Xmx3G
5151
org.gradle.daemon=false
5252
mod_author = BlayTheNinth
53-
credits = BlayTheNinth
53+
credits = BlayTheNinth
54+
kuma_version = [21.0,22)

repositories.gradle

+8
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ repositories {
3333
url = "https://maven.terraformersmc.com/releases"
3434
content {
3535
includeGroup "com.terraformersmc"
36+
includeGroup "dev.emi"
3637
}
3738
}
3839

@@ -56,4 +57,11 @@ repositories {
5657
includeGroup "us.dynmap"
5758
}
5859
}
60+
61+
maven {
62+
url "https://maven.siphalor.de/"
63+
content {
64+
includeGroup "de.siphalor"
65+
}
66+
}
5967
}

settings.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ plugins {
5757

5858
include("common")
5959
include("fabric")
60-
include("forge")
61-
include("neoforge")
60+
// include("forge")
61+
// include("neoforge")

0 commit comments

Comments
 (0)