Skip to content

Commit 9f35530

Browse files
committed
[core] Port to 26.1.1
* dependency updates - Minecraft 26.1.1 - fabric api 0.145.4+26.1.1 - fabric loader 0.18.6 - SoundCategories
1 parent 3e75426 commit 9f35530

7 files changed

Lines changed: 8 additions & 24 deletions

File tree

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ org.gradle.caching=true
55
org.gradle.configureondemand=true
66
# Fabric Properties
77
# check these on https://fabricmc.net/develop/
8-
minecraft_version=26.1
9-
loader_version=0.18.4
8+
minecraft_version=26.1.1
9+
loader_version=0.18.6
1010
loom_version=1.15-SNAPSHOT
1111
#Fabric api
12-
fabric_api_version=0.144.0+26.1
12+
fabric_api_version=0.145.4+26.1.1
1313
# Java
1414
java_lang_version=25
1515
# Mod Properties

versioned/es26.1/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
minecraft_version=26.1
1+
minecraft_version=26.1.1
22

33
rei_version=21.9.812

versioned/es26.1/src/main/java/dev/stashy/extrasounds/mc26_1/VersionedMixinPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ protected String earlierVersion() {
1010

1111
@Override
1212
protected String laterVersion() {
13-
return "26.1";
13+
return "26.1.1";
1414
}
1515
}

versioned/es26.1/src/main/java/dev/stashy/extrasounds/mc26_1/entry/VanillaGenerator.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import dev.stashy.extrasounds.logics.entry.BaseVanillaGenerator;
44
import dev.stashy.extrasounds.mapping.SoundDefinition;
55
import dev.stashy.extrasounds.mapping.SoundGenerator;
6-
import dev.stashy.extrasounds.mc26_1.mixin.access.BucketItemAccessor;
76
import net.minecraft.client.resources.sounds.Sound;
87
import net.minecraft.client.resources.sounds.SoundEventRegistration;
98
import net.minecraft.resources.Identifier;
@@ -39,10 +38,8 @@ protected SoundGenerator generate() {
3938
} else if (item instanceof DiscFragmentItem) {
4039
return SoundDefinition.of(single(METAL_BITS.getId(), 0.7f, 0.85f, Sound.Type.SOUND_EVENT));
4140
} else if (item instanceof BucketItem bucketItem) {
42-
if (bucketItem instanceof BucketItemAccessor accessor) {
43-
final SoundEventRegistration soundEntry = accessor.getContent().getPickupSound().map(sound -> event(sound.location(), 0.4f)).orElse(aliased(METAL));
44-
return SoundDefinition.of(soundEntry);
45-
}
41+
final SoundEventRegistration soundEntry = bucketItem.getContent().getPickupSound().map(sound -> event(sound.location(), 0.4f)).orElse(aliased(METAL));
42+
return SoundDefinition.of(soundEntry);
4643
} else if (item instanceof SpyglassItem) {
4744
return SoundDefinition.of(aliased(Gear.COPPER));
4845
}

versioned/es26.1/src/main/java/dev/stashy/extrasounds/mc26_1/mixin/access/BucketItemAccessor.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

versioned/es26.1/src/main/resources/extrasounds.mixins.mc26_1.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
],
99
"client": [
1010
"access.ArmorStandAccessor",
11-
"access.BucketItemAccessor",
1211
"access.ItemPickerMenuAccessor",
1312

1413
"action.block.MultiPlayerGameModeMixin",

0 commit comments

Comments
 (0)