Merge branch 'master' into 1.19.3

# Conflicts: # gradle.properties
FrozenBlock · Jan 29, 2023 · 5c51e80 · 5c51e80
2 parents 6942461 + cb8b417
commit 5c51e80
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -183,8 +183,11 @@ dependencies {
 	modCompileOnly("org.joml:joml:1.10.4")
 	modCompileOnly("org.anarres:jcpp:1.4.14")
 
+	// BetterEnd
+	modCompileOnly("maven.modrinth:betterend:${betterend_version}")
+
 	// BetterNether
-	modCompileOnly("maven.modrinth:betternether:7.1.2")
+	modCompileOnly("maven.modrinth:betternether:${betternether_version}")
 
 	// only affects runClient, does not affect gradlew build.
 	// add -PuseThirdPartyMods=false to not use these

diff --git a/gradle.properties b/gradle.properties
@@ -27,13 +27,15 @@
 	frozenlib_version=1.1.10-mc1.19.3
 
 # External Mods
+    betterend_version=3.1.2
+    betternether_version=8.1.3
 	modmenu_version=5.0.1
 	cloth_config_version=9.0.94
 	copperpipes_version=1.11.4-1.19.3
 	nbtcrafting_version=2.2.3+mc1.19
-    tomsstorage_version=1.19.3-1.4.5-fabric
+	terrablender_version=1.19.3-2.1.0.139
     terralith_version=2.3.5
-    terrablender_version=1.19.3-2.1.0.139
+    tomsstorage_version=1.19.3-1.4.5-fabric
 
 	# Optimization
 	sodium_version=mc1.19.2-0.4.4

diff --git a/src/main/java/net/frozenblock/wilderwild/misc/mod_compat/BetterEndIntegration.java b/src/main/java/net/frozenblock/wilderwild/misc/mod_compat/BetterEndIntegration.java
@@ -2,6 +2,7 @@
 
 import net.frozenblock.lib.integration.api.ModIntegration;
 import net.frozenblock.wilderwild.misc.config.ClothConfigInteractionHandler;
+import org.betterx.betterend.registry.EndBlocks;
 
 import static net.frozenblock.lib.sound.api.block_sound_group.BlockSoundGroupOverwrites.addBlock;
 import static net.frozenblock.wilderwild.registry.RegisterBlockSoundGroups.LEAVES;
@@ -13,11 +14,11 @@ public BetterEndIntegration() {
 
     @Override
     public void init() {
-        addBlock(id("pythadendron_leaves"), LEAVES, ClothConfigInteractionHandler::leafSounds);
-        addBlock(id("lacugrove_leaves"), LEAVES, ClothConfigInteractionHandler::leafSounds);
-        addBlock(id("dragon_tree_leaves"), LEAVES, ClothConfigInteractionHandler::leafSounds);
-        addBlock(id("tenanea_leaves"), LEAVES, ClothConfigInteractionHandler::leafSounds);
-        addBlock(id("helix_tree_leaves"), LEAVES, ClothConfigInteractionHandler::leafSounds);
-        addBlock(id("lucernia_leaves"), LEAVES, ClothConfigInteractionHandler::leafSounds);
+        addBlock(EndBlocks.PYTHADENDRON_LEAVES, LEAVES, ClothConfigInteractionHandler::leafSounds);
+        addBlock(EndBlocks.LACUGROVE_LEAVES, LEAVES, ClothConfigInteractionHandler::leafSounds);
+        addBlock(EndBlocks.DRAGON_TREE_LEAVES, LEAVES, ClothConfigInteractionHandler::leafSounds);
+        addBlock(EndBlocks.TENANEA_LEAVES, LEAVES, ClothConfigInteractionHandler::leafSounds);
+        addBlock(EndBlocks.HELIX_TREE_LEAVES, LEAVES, ClothConfigInteractionHandler::leafSounds);
+        addBlock(EndBlocks.LUCERNIA_LEAVES, LEAVES, ClothConfigInteractionHandler::leafSounds);
     }
 }