Skip to content

Commit 3f32319

Browse files
Update to 1.21 (#50)
1 parent 4c82877 commit 3f32319

File tree

4 files changed

+34
-35
lines changed

4 files changed

+34
-35
lines changed

gradle.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
org.gradle.jvmargs=-Xmx1G
33
# Fabric Properties
44
# check these on https://modmuss50.me/fabric.html
5-
minecraft_version=1.20.5
6-
yarn_mappings=1.20.5+build.1
7-
loader_version=0.15.10
5+
minecraft_version=1.21
6+
yarn_mappings=1.21+build.1
7+
loader_version=0.15.11
88
# Mod Properties
9-
mod_version=1.1.12
9+
mod_version=1.1.13
1010
maven_group=us.potatoboy
1111
archives_base_name=htm
1212
# Dependencies
1313
# check this on https://modmuss50.me/fabric.html
14-
fabric_version=0.97.6+1.20.5
15-
translation_version=2.3.0+1.20.5-rc2
14+
fabric_version=0.100.1+1.21
15+
translation_version=2.3.1+1.21-pre2

src/main/java/com/github/fabricservertools/htm/config/HTMConfig.java

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,31 @@ public class HTMConfig {
2727
public final Map<String, Boolean> defaultFlags = new HashMap<>();
2828

2929
public final ArrayList<Identifier> autolockingContainers = new ArrayList<>(Arrays.asList(
30-
new Identifier("chest"),
31-
new Identifier("trapped_chest"),
32-
new Identifier("barrel"),
33-
34-
new Identifier("furnace"),
35-
new Identifier("blast_furnace"),
36-
new Identifier("smoker"),
37-
38-
new Identifier("shulker_box"),
39-
new Identifier("white_shulker_box"),
40-
new Identifier("orange_shulker_box"),
41-
new Identifier("magenta_shulker_box"),
42-
new Identifier("light_blue_shulker_box"),
43-
new Identifier("yellow_shulker_box"),
44-
new Identifier("lime_shulker_box"),
45-
new Identifier("pink_shulker_box"),
46-
new Identifier("gray_shulker_box"),
47-
new Identifier("light_gray_shulker_box"),
48-
new Identifier("cyan_shulker_box"),
49-
new Identifier("purple_shulker_box"),
50-
new Identifier("blue_shulker_box"),
51-
new Identifier("brown_shulker_box"),
52-
new Identifier("green_shulker_box"),
53-
new Identifier("red_shulker_box"),
54-
new Identifier("black_shulker_box")
30+
Identifier.of("chest"),
31+
Identifier.of("trapped_chest"),
32+
Identifier.of("barrel"),
33+
34+
Identifier.of("furnace"),
35+
Identifier.of("blast_furnace"),
36+
Identifier.of("smoker"),
37+
38+
Identifier.of("shulker_box"),
39+
Identifier.of("white_shulker_box"),
40+
Identifier.of("orange_shulker_box"),
41+
Identifier.of("magenta_shulker_box"),
42+
Identifier.of("light_blue_shulker_box"),
43+
Identifier.of("yellow_shulker_box"),
44+
Identifier.of("lime_shulker_box"),
45+
Identifier.of("pink_shulker_box"),
46+
Identifier.of("gray_shulker_box"),
47+
Identifier.of("light_gray_shulker_box"),
48+
Identifier.of("cyan_shulker_box"),
49+
Identifier.of("purple_shulker_box"),
50+
Identifier.of("blue_shulker_box"),
51+
Identifier.of("brown_shulker_box"),
52+
Identifier.of("green_shulker_box"),
53+
Identifier.of("red_shulker_box"),
54+
Identifier.of("black_shulker_box")
5555
));
5656

5757
public HTMConfig() {

src/main/java/com/github/fabricservertools/htm/world/data/GlobalTrustState.java

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

33
import com.google.common.collect.HashMultimap;
44
import com.google.common.collect.Multimap;
5-
import net.fabricmc.fabric.api.util.NbtType;
65
import net.minecraft.nbt.NbtCompound;
76
import net.minecraft.nbt.NbtElement;
87
import net.minecraft.nbt.NbtHelper;
@@ -22,13 +21,13 @@ public GlobalTrustState() {
2221
public static GlobalTrustState fromNbt(NbtCompound tag,
2322
RegistryWrapper.WrapperLookup registryLookup) {
2423
GlobalTrustState trustState = new GlobalTrustState();
25-
NbtList trustList = tag.getList("GlobalTrusts", NbtType.COMPOUND);
24+
NbtList trustList = tag.getList("GlobalTrusts", NbtElement.COMPOUND_TYPE);
2625

2726
trustList.forEach(tag1 -> {
2827
NbtCompound compoundTag = (NbtCompound) tag1;
2928
UUID truster = compoundTag.getUuid("Truster");
3029

31-
NbtList trustedTag = compoundTag.getList("Trusted", NbtType.INT_ARRAY);
30+
NbtList trustedTag = compoundTag.getList("Trusted", NbtElement.INT_ARRAY_TYPE);
3231

3332
for (NbtElement value : trustedTag) {
3433
trustState.globalTrust.put(truster, NbtHelper.toUuid(value));

src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
"depends": {
2626
"fabricloader": ">=0.12.3",
2727
"fabric": "*",
28-
"minecraft": ">=1.20.4"
28+
"minecraft": ">=1.21"
2929
}
3030
}

0 commit comments

Comments
 (0)