Skip to content

Commit 3aec8de

Browse files
committed
feat: update to 1.21.11
closes #16
1 parent 27a2021 commit 3aec8de

9 files changed

Lines changed: 31 additions & 31 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Update to 1.21.10
1+
Update to 1.21.11

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "architectury-plugin" version "3.4-SNAPSHOT"
3-
id "dev.architectury.loom" version "1.11-SNAPSHOT" apply false
3+
id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
44
id "me.shedaniel.unified-publishing" version "0.1.+" apply false
55
id "com.github.breadmoirai.github-release" version "2.4.1"
66
}

common/src/client/java/io/github/jamalam360/sort_it_out/client/SortItOutClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import net.minecraft.client.multiplayer.ClientLevel;
3030
import net.minecraft.core.registries.BuiltInRegistries;
3131
import net.minecraft.network.chat.Component;
32-
import net.minecraft.resources.ResourceLocation;
32+
import net.minecraft.resources.Identifier;
3333
import net.minecraft.server.packs.PackType;
3434
import net.minecraft.world.inventory.AbstractContainerMenu;
3535
import net.minecraft.world.inventory.Slot;
@@ -121,7 +121,7 @@ private static void renderContainerForeground(AbstractContainerScreen<?> screen,
121121
}
122122

123123
if (isSlotIndexOverlayEnabled) {
124-
ResourceLocation type;
124+
Identifier type;
125125

126126
try {
127127
type = BuiltInRegistries.MENU.getKey(screen.getMenu().getType());

common/src/client/java/io/github/jamalam360/sort_it_out/client/button/ScreenSortButtons.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
import com.mojang.serialization.Codec;
44
import com.mojang.serialization.codecs.RecordCodecBuilder;
5-
import net.minecraft.resources.ResourceLocation;
5+
import net.minecraft.resources.Identifier;
66

77
import java.util.List;
88

9-
public record ScreenSortButtons(ResourceLocation type,
9+
public record ScreenSortButtons(Identifier type,
1010
List<ScreenSortButton> sortButtons) {
1111
public static final Codec<ScreenSortButtons> CODEC = RecordCodecBuilder.create(instance ->
1212
instance.group(
13-
ResourceLocation.CODEC.fieldOf("type").forGetter(ScreenSortButtons::type),
13+
Identifier.CODEC.fieldOf("type").forGetter(ScreenSortButtons::type),
1414
Codec.list(ScreenSortButton.CODEC).fieldOf("sortButtons").forGetter(ScreenSortButtons::sortButtons)
1515
).apply(instance, ScreenSortButtons::new)
1616
);

common/src/client/java/io/github/jamalam360/sort_it_out/client/button/ScreenSortButtonsLoader.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
55
import net.minecraft.core.registries.BuiltInRegistries;
66
import net.minecraft.resources.FileToIdConverter;
7-
import net.minecraft.resources.ResourceLocation;
7+
import net.minecraft.resources.Identifier;
88
import net.minecraft.server.packs.resources.ResourceManager;
99
import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener;
1010
import net.minecraft.util.profiling.ProfilerFiller;
@@ -23,7 +23,7 @@ private ScreenSortButtonsLoader() {
2323

2424
@Nullable
2525
public List<ScreenSortButton> getCustomButtonsForScreen(AbstractContainerScreen<?> screen) {
26-
ResourceLocation id;
26+
Identifier id;
2727

2828
try {
2929
id = BuiltInRegistries.MENU.getKey(screen.getMenu().getType());
@@ -41,7 +41,7 @@ public List<ScreenSortButton> getCustomButtonsForScreen(AbstractContainerScreen<
4141
}
4242

4343
@Override
44-
protected void apply(Map<ResourceLocation, ScreenSortButtons> values, ResourceManager resourceManager, ProfilerFiller profiler) {
44+
protected void apply(Map<Identifier, ScreenSortButtons> values, ResourceManager resourceManager, ProfilerFiller profiler) {
4545
this.values = List.copyOf(values.values());
4646
SortItOut.LOGGER.info("Loaded {} sort button locations", values.size());
4747
}

common/src/client/java/io/github/jamalam360/sort_it_out/client/gui/SortButton.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import net.minecraft.client.gui.components.SpriteIconButton;
88
import net.minecraft.client.gui.components.WidgetSprites;
99
import net.minecraft.network.chat.Component;
10-
import net.minecraft.resources.ResourceLocation;
10+
import net.minecraft.resources.Identifier;
1111
import net.minecraft.world.inventory.AbstractContainerMenu;
1212
import net.minecraft.world.inventory.Slot;
1313

@@ -17,8 +17,8 @@ public class SortButton extends SpriteIconButton.CenteredIcon {
1717
private static final int SPRITE_WIDTH = 11;
1818
private static final int SPRITE_HEIGHT = 11;
1919
private static final Component ANNOTATION = Component.translatable("text.sort_it_out.sort");
20-
private static final ResourceLocation SPRITE = SortItOut.id("sort_button");
21-
private static final ResourceLocation HOVERED_SPRITE = SortItOut.id("sort_button_hovered");
20+
private static final Identifier SPRITE = SortItOut.id("sort_button");
21+
private static final Identifier HOVERED_SPRITE = SortItOut.id("sort_button_hovered");
2222
private final AbstractContainerMenu menu;
2323
private final Slot slot;
2424

common/src/main/java/io/github/jamalam360/sort_it_out/SortItOut.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import io.github.jamalam360.sort_it_out.command.SortItOutCommands;
55
import io.github.jamalam360.sort_it_out.network.PacketHandlers;
66
import net.minecraft.network.protocol.game.ClientboundSoundPacket;
7-
import net.minecraft.resources.ResourceLocation;
7+
import net.minecraft.resources.Identifier;
88
import net.minecraft.server.level.ServerPlayer;
99
import net.minecraft.sounds.SoundEvents;
1010
import net.minecraft.sounds.SoundSource;
@@ -23,8 +23,8 @@ public static void init() {
2323
PacketHandlers.register();
2424
}
2525

26-
public static ResourceLocation id(String path) {
27-
return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
26+
public static Identifier id(String path) {
27+
return Identifier.fromNamespaceAndPath(MOD_ID, path);
2828
}
2929

3030
public static void playSortSound(Player player) {

gradle.properties

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ org.gradle.jvmargs=-Xmx3G
22
org.gradle.daemon=false
33
org.gradle.parallel=true
44

5-
version=1.1.4+1.21.10
6-
minecraft_version=1.21.10
5+
version=1.1.4+1.21.11
6+
minecraft_version=1.21.11
77

8-
additional_minecraft_versions=1.21.9
9-
minimum_minecraft_version=1.21.9
10-
minimum_architectury_api_version=18.0.3
11-
minimum_fabric_api_version=0.134.0+1.21.9
12-
minimum_jamlib_version=1.3.5+1.21.9
8+
additional_minecraft_versions=
9+
minimum_minecraft_version=1.21.11
10+
minimum_architectury_api_version=19.0.1
11+
minimum_fabric_api_version=0.141.1+1.21.11
12+
minimum_jamlib_version=1.3.5+1.21.11
1313

1414
branch=main
1515
group=io.github.jamalam360

libs.versions.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
[versions]
22
# https://modrinth.com/mod/architectury-api/versions
3-
architectury = "18.0.5"
3+
architectury = "19.0.1"
44

55
# https://parchmentmc.org/docs/getting-started
6-
parchment-minecraft = "1.21.10"
7-
parchment = "2025.10.12"
6+
parchment-minecraft = "1.21.11"
7+
parchment = "2025.12.20"
88

99
# https://projects.neoforged.net/neoforged/neoforge
10-
neoforge = "21.10.32-beta"
10+
neoforge = "21.11.25-beta"
1111

1212
# https://fabricmc.net/develop
13-
fabric-loader = "0.17.3"
14-
fabric-api = "0.136.0+1.21.10"
13+
fabric-loader = "0.18.4"
14+
fabric-api = "0.141.1+1.21.11"
1515

1616
# https://maven.jamalam.tech/#/releases
17-
jamlib = "1.3.5+1.21.10"
17+
jamlib = "1.3.5+1.21.11"
1818

1919
# https://modrinth.com/mod/modmenu/versions
20-
modmenu = "16.0.0-rc.1"
20+
modmenu = "17.0.0-beta.1"
2121

2222
[libraries]
2323
architectury-common = { module = "dev.architectury:architectury", version.ref = "architectury" }

0 commit comments

Comments
 (0)