From b2e84ec14de2ea61771327d47099dd95bc1494a8 Mon Sep 17 00:00:00 2001 From: ang-xd Date: Thu, 3 Nov 2022 20:37:52 -0400 Subject: [PATCH] Bump Paragon version (removes title screen text) + Re-add infested sculk drop. hotfix 1.13 --- common/build.gradle | 2 +- .../registry/blocks/DDBlocks.java | 2 +- fabric/build.gradle | 2 +- forge/build.gradle | 2 +- .../loot_tables/blocks/infested_sculk.json | 30 +++++++++++++++++++ .../forge/datagen/loot/DDBlockLoot.java | 4 ++- gradle.properties | 2 +- 7 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 forge/src/generated/resources/data/deeperdarker/loot_tables/blocks/infested_sculk.json diff --git a/common/build.gradle b/common/build.gradle index 7f30bcd14..f4ec45d78 100644 --- 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 index 21b2c8cb7..c25d7cf71 100644 --- 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 ECHO_WALL_SIGN = registerBlock("echo_wall_sign", false, () -> new WallSignBlock(BlockBehaviour.Properties.copy(Blocks.OAK_WALL_SIGN), DDWoodTypes.ECHO)); public static final Supplier ECHO_SIGN = registerSign("echo_sign", () -> new StandingSignBlock(BlockBehaviour.Properties.copy(Blocks.OAK_SIGN), DDWoodTypes.ECHO), ECHO_WALL_SIGN); public static final Supplier ECHO_SOIL = registerBlock("echo_soil", true, () -> new Block(BlockBehaviour.Properties.copy(Blocks.SCULK).strength(0.3f))); - public static final Supplier INFESTED_SCULK = registerBlock("infested_sculk", true, () -> new InfestedSculkBlock(BlockBehaviour.Properties.copy(Blocks.SCULK).noLootTable())); + public static final Supplier INFESTED_SCULK = registerBlock("infested_sculk", true, () -> new InfestedSculkBlock(BlockBehaviour.Properties.copy(Blocks.SCULK))); public static final Supplier 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 index b28cb6c3d..64648bf20 100644 --- 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 index 1d9134e59..6bdd9671f 100644 --- 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 new file mode 100644 index 000000000..e031a46da --- /dev/null +++ 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 + } + ] +} \ No newline at end of file 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 index 93ff659e8..7ad83ab87 100644 --- 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 index 09676dec0..7f8a62103 100644 --- 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