Merge branch '1.19.3' into 1.19.4

FrozenBlock · Jan 29, 2023 · 1fffa0b · 1fffa0b
2 parents b250cdc + 6942461
commit 1fffa0b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -183,6 +183,9 @@ dependencies {
 	modCompileOnly("org.joml:joml:1.10.4")
 	modCompileOnly("org.anarres:jcpp:1.4.14")
 
+	// BetterNether
+	modCompileOnly("maven.modrinth:betternether:7.1.2")
+
 	// only affects runClient, does not affect gradlew build.
 	// add -PuseThirdPartyMods=false to not use these
 	/*if (findProperty("useThirdPartyMods") != "false") {

diff --git a/src/main/java/net/frozenblock/wilderwild/misc/mod_compat/BetterNetherIntegration.java b/src/main/java/net/frozenblock/wilderwild/misc/mod_compat/BetterNetherIntegration.java
@@ -2,6 +2,7 @@
 
 import net.frozenblock.lib.integration.api.ModIntegration;
 import net.frozenblock.wilderwild.misc.config.ClothConfigInteractionHandler;
+import org.betterx.betternether.registry.NetherBlocks;
 
 import static net.frozenblock.lib.sound.api.block_sound_group.BlockSoundGroupOverwrites.*;
 import static net.frozenblock.wilderwild.registry.RegisterBlockSoundGroups.LEAVES;
@@ -13,9 +14,9 @@ public BetterNetherIntegration() {
 
     @Override
     public void init() {
-        addBlock(id("willow_leaves"), LEAVES, ClothConfigInteractionHandler::leafSounds);
-        addBlock(id("rubeous_leaves"), LEAVES, ClothConfigInteractionHandler::leafSounds);
-        addBlock(id("anchor_tree_leaves"), LEAVES, ClothConfigInteractionHandler::leafSounds);
-        addBlock(id("nether_sakura_leaves"), LEAVES, ClothConfigInteractionHandler::leafSounds);
+        addBlock(NetherBlocks.WILLOW_LEAVES, LEAVES, ClothConfigInteractionHandler::leafSounds);
+        addBlock(NetherBlocks.RUBEUS_LEAVES, LEAVES, ClothConfigInteractionHandler::leafSounds);
+        addBlock(NetherBlocks.ANCHOR_TREE_LEAVES, LEAVES, ClothConfigInteractionHandler::leafSounds);
+        addBlock(NetherBlocks.NETHER_SAKURA_LEAVES, LEAVES, ClothConfigInteractionHandler::leafSounds);
     }
 }