Bump Paragon version (removes title screen text) + Re-add infested sc…

…ulk drop. hotfix 1.13
KyaniteMods · Nov 4, 2022 · b2e84ec · b2e84ec
1 parent 713dcc6
commit b2e84ec
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 6 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     modImplementation "software.bernie.geckolib:geckolib-fabric-1.19:3.1.18"
 
     // Paragon
-    modImplementation("maven.modrinth:paragon:common-1.0.1b-1.19x")
+    modImplementation("maven.modrinth:paragon:common-1.0.3b-1.19x")
 }
 
 loom {

diff --git a/common/src/main/java/com/kyanite/deeperdarker/registry/blocks/DDBlocks.java b/common/src/main/java/com/kyanite/deeperdarker/registry/blocks/DDBlocks.java
@@ -55,7 +55,7 @@ protected boolean decaying(@NotNull BlockState state) {
     public static final Supplier<WallSignBlock> ECHO_WALL_SIGN = registerBlock("echo_wall_sign", false, () -> new WallSignBlock(BlockBehaviour.Properties.copy(Blocks.OAK_WALL_SIGN), DDWoodTypes.ECHO));
     public static final Supplier<StandingSignBlock> ECHO_SIGN = registerSign("echo_sign", () -> new StandingSignBlock(BlockBehaviour.Properties.copy(Blocks.OAK_SIGN), DDWoodTypes.ECHO), ECHO_WALL_SIGN);
     public static final Supplier<Block> ECHO_SOIL = registerBlock("echo_soil", true, () -> new Block(BlockBehaviour.Properties.copy(Blocks.SCULK).strength(0.3f)));
-    public static final Supplier<Block> INFESTED_SCULK = registerBlock("infested_sculk", true, () -> new InfestedSculkBlock(BlockBehaviour.Properties.copy(Blocks.SCULK).noLootTable()));
+    public static final Supplier<Block> INFESTED_SCULK = registerBlock("infested_sculk", true, () -> new InfestedSculkBlock(BlockBehaviour.Properties.copy(Blocks.SCULK)));
     public static final Supplier<SculkJawBlock> SCULK_JAW = registerBlock("sculk_jaw", true, () -> new SculkJawBlock(BlockBehaviour.Properties.copy(Blocks.SCULK).strength(6f)));
 
     // Sculk Stone

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     include modImplementation('net.kyrptonaught:customportalapi:0.0.1-beta52-1.19')
 
     // Paragon
-    include modImplementation("maven.modrinth:paragon:fabric-1.0.1b-1.19x")
+    include modImplementation("maven.modrinth:paragon:fabric-1.0.3b-1.19x")
 
 
 

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -39,7 +39,7 @@ dependencies {
     modImplementation ("software.bernie.geckolib:geckolib-forge-1.19:3.1.23")
 
     // Paragon
-    include modImplementation("maven.modrinth:paragon:forge-1.0.2b-1.19x")
+    include modImplementation("maven.modrinth:paragon:forge-1.0.3b-1.19x")
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }

diff --git a/forge/src/generated/resources/data/deeperdarker/loot_tables/blocks/infested_sculk.json b/forge/src/generated/resources/data/deeperdarker/loot_tables/blocks/infested_sculk.json
@@ -0,0 +1,30 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:match_tool",
+          "predicate": {
+            "enchantments": [
+              {
+                "enchantment": "minecraft:silk_touch",
+                "levels": {
+                  "min": 1
+                }
+              }
+            ]
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "deeperdarker:infested_sculk"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/forge/src/main/java/com/kyanite/deeperdarker/forge/datagen/loot/DDBlockLoot.java b/forge/src/main/java/com/kyanite/deeperdarker/forge/datagen/loot/DDBlockLoot.java
@@ -22,7 +22,7 @@
 
 import java.util.function.Supplier;
 
-public class DDBlockLoot extends BlockLoot {
+public class    DDBlockLoot extends BlockLoot {
     @Override
     protected void addTables() {
         this.dropSelf(DDBlocks.ECHO_PLANKS.get());
@@ -139,6 +139,8 @@ protected void addTables() {
         this.dropSelf(DDBlocks.CHISELED_GLOOMSLATE.get());
 
         this.add(DDBlocks.ANCIENT_VASE.get(), DDBlockLoot::ancientVaseDrop);
+
+        this.dropWhenSilkTouch(DDBlocks.INFESTED_SCULK.get());
     }
 
     private static LootTable.Builder sculkOreDrop(Block block, Item item) {

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.19.2
 supported_version=1.19-1.19.2
 
 archives_base_name=deeperdarker
-mod_version=1.1.2
+mod_version=1.1.3
 maven_group=com.kyanite
 
 architectury_version=6.2.46