Skip to content

Commit 0c6458a

Browse files
committed
Update to 1.19.4
compatible with >=1.19.3 (current latest 1.20.2)
1 parent 84b781f commit 0c6458a

File tree

9 files changed

+83
-45
lines changed

9 files changed

+83
-45
lines changed

build.gradle

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,43 @@
11
plugins {
2-
id 'fabric-loom' version '0.11-SNAPSHOT'
2+
id 'fabric-loom' version '1.4-SNAPSHOT'
33
id 'maven-publish'
44
}
55

6-
sourceCompatibility = JavaVersion.VERSION_17
7-
targetCompatibility = JavaVersion.VERSION_17
8-
9-
archivesBaseName = project.archives_base_name
106
version = project.mod_version
117
group = project.maven_group
128

9+
base {
10+
archivesName = project.archives_base_name
11+
}
12+
1313
repositories {
1414
// Add repositories to retrieve artifacts from in here.
1515
// You should only use this when depending on other mods because
1616
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
1717
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
1818
// for more information about repositories.
19+
//* cloth-config
1920
maven { url "https://maven.shedaniel.me/" }
2021
}
2122

2223
dependencies {
23-
//to change the versions see the gradle.properties file
24+
// To change the versions see the gradle.properties file
2425
minecraft "com.mojang:minecraft:${project.minecraft_version}"
2526
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
2627
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
2728

2829
// Fabric API. This is technically optional, but you probably want it anyway.
2930
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
3031

31-
include "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}"
32+
// Uncomment the following line to enable the deprecated Fabric API modules.
33+
// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
34+
35+
// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
36+
37+
//* Cloth Config https://www.curseforge.com/minecraft/mc-mods/cloth-config
3238
modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}") {
3339
exclude(group: "net.fabricmc.fabric-api")
3440
}
35-
3641
}
3742

3843
processResources {
@@ -44,7 +49,6 @@ processResources {
4449
}
4550

4651
tasks.withType(JavaCompile).configureEach {
47-
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
4852
it.options.release = 17
4953
}
5054

@@ -53,10 +57,15 @@ java {
5357
// if it is present.
5458
// If you remove this line, sources will not be generated.
5559
withSourcesJar()
60+
61+
sourceCompatibility = JavaVersion.VERSION_17
62+
targetCompatibility = JavaVersion.VERSION_17
5663
}
5764

5865
jar {
59-
from "LICENSE"
66+
from("LICENSE") {
67+
rename { "${it}_${project.base.archivesName.get()}" }
68+
}
6069
}
6170

6271
// configure the maven publication
@@ -74,4 +83,4 @@ publishing {
7483
// The repositories here will be used for publishing your artifact, not for
7584
// retrieving dependencies.
7685
}
77-
}
86+
}

gradle.properties

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
# Done to increase the memory available to gradle.
22
org.gradle.jvmargs=-Xmx1G
3+
org.gradle.parallel=true
4+
35
# Fabric Properties
46
# check these on https://fabricmc.net/develop
5-
minecraft_version=1.18.2
6-
yarn_mappings=1.18.2+build.2
7-
loader_version=0.13.3
7+
minecraft_version=1.19.4
8+
yarn_mappings=1.19.4+build.2
9+
loader_version=0.14.22
810

911
# Mod Properties
1012
mod_version=1.0
1113
maven_group=com.gmail.gorayan3838
1214
archives_base_name=NoteBetterFabric
1315

1416
# Dependencies
15-
fabric_version=0.48.0+1.18.2
16-
# check this on https://www.curseforge.com/minecraft/mc-mods/cloth-config/files
17-
cloth_version=6.2.57
17+
fabric_version=0.87.0+1.19.4
18+
#* check this on https://www.curseforge.com/minecraft/mc-mods/cloth-config/files
19+
cloth_version=10.1.105

gradle/wrapper/gradle-wrapper.jar

3.81 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

Lines changed: 23 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/com/gmail/gorayan3838/notebetterfabric/NoteBetterFabric.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import net.fabricmc.api.ModInitializer;
88
import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
99
import net.minecraft.server.command.CommandManager;
10-
import net.minecraft.text.TranslatableText;
10+
import net.minecraft.text.Text;
1111

1212
public class NoteBetterFabric implements ModInitializer {
1313

@@ -30,7 +30,7 @@ public void registerCommand() {
3030
.executes(context -> {
3131
AutoConfig.getConfigHolder(SoundConfig.class).load();
3232
CONFIG = AutoConfig.getConfigHolder(SoundConfig.class).get();
33-
context.getSource().sendFeedback(new TranslatableText("commands.notebetterfabric.reload.success"), true);
33+
context.getSource().sendFeedback(Text.translatable("commands.notebetterfabric.reload.success"), true);
3434
return 1;
3535
})
3636
);

src/main/java/com/gmail/gorayan3838/notebetterfabric/mixin/NoteBlockMixin.java

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

33
import com.gmail.gorayan3838.notebetterfabric.NoteBetterFabric;
44
import com.gmail.gorayan3838.notebetterfabric.config.SoundConfig;
5+
import net.minecraft.block.Block;
56
import net.minecraft.block.NoteBlock;
67
import net.minecraft.entity.player.PlayerEntity;
8+
import net.minecraft.registry.entry.RegistryEntry;
79
import net.minecraft.sound.SoundCategory;
810
import net.minecraft.sound.SoundEvent;
911
import net.minecraft.util.Identifier;
1012
import net.minecraft.util.math.BlockPos;
11-
import net.minecraft.util.registry.Registry;
13+
import net.minecraft.registry.Registries;
1214
import net.minecraft.world.World;
1315
import org.jetbrains.annotations.Nullable;
1416
import org.spongepowered.asm.mixin.Mixin;
@@ -21,24 +23,28 @@
2123
@Mixin(NoteBlock.class)
2224
public class NoteBlockMixin {
2325

24-
@Redirect(method = "onSyncedBlockEvent", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;playSound(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/sound/SoundEvent;Lnet/minecraft/sound/SoundCategory;FF)V"))
25-
private void injected(World world, @Nullable PlayerEntity player, BlockPos pos, SoundEvent sound, SoundCategory category, float volume, float pitch) {
26+
@Redirect(method = "onSyncedBlockEvent", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;playSound(Lnet/minecraft/entity/player/PlayerEntity;DDDLnet/minecraft/registry/entry/RegistryEntry;Lnet/minecraft/sound/SoundCategory;FFJ)V"))
27+
private void injected(World world, @Nullable PlayerEntity player, double x, double y, double z, RegistryEntry<SoundEvent> sound, SoundCategory category, float volume, float pitch, long seed) {
28+
BlockPos pos = new BlockPos((int) x, (int) y, (int) z);
2629
SoundConfig.Mapping[] mappings = NoteBetterFabric.CONFIG.getMappings();
27-
List<SoundConfig.Mapping> filteredMappings = Arrays.stream(mappings).filter(mapping -> world.getBlockState(pos.down()).getBlock().equals(Registry.BLOCK.get(new Identifier(mapping.getBlock())))).toList();
30+
List<SoundConfig.Mapping> filteredMappings = Arrays.stream(mappings).filter(mapping -> world.getBlockState(pos.down()).getBlock().equals(Registries.BLOCK.get(new Identifier(mapping.getBlock())))).toList();
2831
filteredMappings.forEach(mapping -> {
2932
SoundConfig.Sound soundInfo = mapping.getSound();
3033
world.playSound(
3134
null,
32-
pos,
33-
new SoundEvent(new Identifier(soundInfo.getSound())),
35+
x,
36+
y,
37+
z,
38+
SoundEvent.of(new Identifier(soundInfo.getSound())),
3439
SoundCategory.RECORDS,
3540
soundInfo.getVolume(),
36-
soundInfo.getPitch() * pitch
41+
soundInfo.getPitch() * pitch,
42+
seed
3743
);
3844
});
3945
if (!filteredMappings.isEmpty()) {
4046
return;
4147
}
42-
world.playSound(null, pos, sound, SoundCategory.RECORDS, volume, pitch);
48+
world.playSound(null, x, y, z, sound, SoundCategory.RECORDS, volume, pitch, seed);
4349
}
4450
}

src/main/resources/fabric.mod.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@
2121
"NoteBetterFabric.mixins.json"
2222
],
2323
"depends": {
24-
"fabricloader": ">=0.13.3",
24+
"fabricloader": ">=0.14.22",
2525
"fabric": "*",
26-
"minecraft": "1.18.x",
27-
"java": ">=17"
26+
"minecraft": ">=1.19.3",
27+
"java": ">=17",
28+
"cloth-config": "*"
2829
}
2930
}

0 commit comments

Comments
 (0)