diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 55babea..9d21436 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -51,6 +51,8 @@ body: label: Mod Version description: The version of the mod you were using when the bug occured options: + - "1.3.2" + - "1.3.1" - "1.3.0" - "1.2.1" - "1.2" @@ -68,6 +70,7 @@ body: label: Minecraft Version description: The version of Minecraft you were using when the bug occured options: + - "1.20.1" - "1.20" - "1.19.4" - "1.19.2" diff --git a/.github/config/labels.yml b/.github/config/labels.yml index c0b4275..2e31fb3 100644 --- a/.github/config/labels.yml +++ b/.github/config/labels.yml @@ -4,6 +4,10 @@ - "1.18.2" 1.19.2: - "1.19.2" +1.20: + - "1.20" +1.20.1: + - "1.20.1" forge: - "Forge" fabric: diff --git a/CHANGELOG.md b/CHANGELOG.md index 219aac9..39d5b76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ -# Bygone Nether +

Logo

+ > To advance the ancient history of the nether dimension. Herein lies my changelog and motivation for developing a mod for Minecraft aiming to advance the lore behind the nether dimension, as well as provide additional challenges and compelling gameplay in the survival game mode. @@ -60,6 +61,18 @@ The structures should be as procedural as possible so that few many spawns play
## 📦 CHANGELOG + +### v1.3.2 +#### Feature +* Updated Github Issues Tracking +* Updated graphics and logos +* Added Create crushing recipes for cobbled blackstone and soul stone +#### Bug +* Fixed Saving Private Swine advancement being triggered when summoning any mob +* Fixed poorly-balanced Create crushing recipes for warped nether brick +* Added missing recipes for vertical slabs +
+ ### v1.3.1 #### Feature * Ported to 1.20.1 diff --git a/README.md b/README.md index 663c933..0dc7d58 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

Logo

+

Logo

To advance the ancient history of the nether dimension @@ -14,8 +14,8 @@ Welcome to the **Bygone Nether** GitHub page! Explore new structures, fight and befriend new mobs, gather new resources and win new loot! -Having been conceived as part of a Vanilla+ mod to bring back alpha difficulty, **Bygone Nether** has grown to be one of the most downloaded nether mods! I semi-frequently update for bug-fixes, new features, and ports to latest Minecraft versions! +Having been conceived as part of a Vanilla+ mod to bring back alpha difficulty, **Bygone Nether** has grown to be one of the most downloaded nether mods! I semi-frequently update for bug-fixes, new features, and ports to the latest Minecraft versions!


Find out more about Bygone Nether on Curseforge or Modrinth Page

-

Looking for the Fabric port? Find it here on Curseforge

\ No newline at end of file +

Looking for the Fabric port? Find it here on Curseforge

\ No newline at end of file diff --git a/build.gradle b/build.gradle index ec8e5cd..96afc86 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,7 @@ def intoTargets = ["$rootDir/out/production/resources/", "$rootDir/out/productio def replaceProperties = [mod_id: mod_id, mod_name: mod_name, mod_version: mod_version, mod_authors: mod_authors, mod_description: mod_description, banner_image: banner_image, minecraft_version_range: minecraft_version_range, forge_version_range: forge_version_range, - loader_version_range: loader_version_range] + loader_version_range: loader_version_range, issues_link: issues_link, license: license] processResources { inputs.properties replaceProperties replaceProperties.put 'project', project diff --git a/gradle.properties b/gradle.properties index b9077ee..124d456 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,11 +11,13 @@ mappings_version=1.18.2 mod_id=bygonenether mod_name=Bygone Nether -mod_version=1.3.1 +mod_version=1.3.2 mod_base_package=com.izofar.bygonenether mod_authors=izofar mod_description=Remnants of the nether dimension's ancient history banner_image=bygonenether.png +issues_link=https://github.com/izofar/bygone-nether/issues +license=MIT # Dependencies mixin_version=0.8.5 \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 4ec9ca0..e157697 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,7 +1,8 @@ modLoader="javafml" loaderVersion="${loader_version_range}" -license="MIT" +license="${license}" +issueTrackerURL="${issues_link}" [[mods]] modId="${mod_id}" @@ -11,6 +12,7 @@ logoFile="${banner_image}" authors="${mod_authors}" description='''${mod_description}''' +displayTest="MATCH_VERSION" [[dependencies.bygonenether]] modId="minecraft" diff --git a/src/main/resources/bygonenether.png b/src/main/resources/bygonenether.png index 28bdbed..fd208b8 100644 Binary files a/src/main/resources/bygonenether.png and b/src/main/resources/bygonenether.png differ diff --git a/src/main/resources/data/bygonenether/advancements/rescue_piglin_prisoner.json b/src/main/resources/data/bygonenether/advancements/rescue_piglin_prisoner.json new file mode 100644 index 0000000..98a55c0 --- /dev/null +++ b/src/main/resources/data/bygonenether/advancements/rescue_piglin_prisoner.json @@ -0,0 +1,42 @@ +{ + "parent": "bygonenether:piglin_manor", + "display": { + "icon": { + "item": "bygonenether:netherite_bell" + }, + "title": { + "translate": "advancements.bygonenether.rescue_piglin_prisoner.title" + }, + "description": { + "translate": "advancements.bygonenether.rescue_piglin_prisoner.description" + }, + "frame": "challenge", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "rewards": { + "experience": 500 + }, + "criteria": { + "rescue_prisoner": { + "trigger": "minecraft:summoned_entity", + "conditions": { + "entity": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "type": "bygonenether:piglin_prisoner" + } + } + ] + } + } + }, + "requirements": [ + [ + "rescue_prisoner" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bygonenether/recipes/crafting/cracked_withered_blackstone_vertical_slab.json b/src/main/resources/data/bygonenether/recipes/crafting/cracked_withered_blackstone_vertical_slab.json index b49d16d..59cf7a4 100644 --- a/src/main/resources/data/bygonenether/recipes/crafting/cracked_withered_blackstone_vertical_slab.json +++ b/src/main/resources/data/bygonenether/recipes/crafting/cracked_withered_blackstone_vertical_slab.json @@ -1,13 +1,18 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "bygonenether:cracked_withered_blackstone_vertical_slab" - } + "type": "minecraft:crafting_shaped", + "pattern": [ + "#", + "#", + "#" ], + "key": { + "#": { + "item": "bygonenether:cracked_withered_blackstone" + } + }, "result": { - "item": "bygonenether:cracked_withered_blackstone_slab", - "count": 1 + "item": "bygonenether:cracked_withered_blackstone_vertical_slab", + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/bygonenether/recipes/crafting/cracked_withered_blackstone_vertical_slab_convert.json b/src/main/resources/data/bygonenether/recipes/crafting/cracked_withered_blackstone_vertical_slab_convert.json new file mode 100644 index 0000000..2343385 --- /dev/null +++ b/src/main/resources/data/bygonenether/recipes/crafting/cracked_withered_blackstone_vertical_slab_convert.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "#", + "#", + "#" + ], + "key": { + "#": { + "item": "bygonenether:cracked_withered_blackstone_slab" + } + }, + "result": { + "item": "bygonenether:cracked_withered_blackstone_vertical_slab", + "count": 3 + }, + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "quark" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bygonenether/recipes/crafting/cracked_withered_blackstone_vertical_slab_revert.json b/src/main/resources/data/bygonenether/recipes/crafting/cracked_withered_blackstone_vertical_slab_revert.json index 59cf7a4..b49d16d 100644 --- a/src/main/resources/data/bygonenether/recipes/crafting/cracked_withered_blackstone_vertical_slab_revert.json +++ b/src/main/resources/data/bygonenether/recipes/crafting/cracked_withered_blackstone_vertical_slab_revert.json @@ -1,18 +1,13 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "#", - "#", - "#" - ], - "key": { - "#": { - "item": "bygonenether:cracked_withered_blackstone" + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "bygonenether:cracked_withered_blackstone_vertical_slab" } - }, + ], "result": { - "item": "bygonenether:cracked_withered_blackstone_vertical_slab", - "count": 6 + "item": "bygonenether:cracked_withered_blackstone_slab", + "count": 1 }, "conditions": [ { diff --git a/src/main/resources/data/bygonenether/recipes/crafting/warped_nether_brick_vertical_slab.json b/src/main/resources/data/bygonenether/recipes/crafting/warped_nether_brick_vertical_slab.json index da4fc1e..d16b610 100644 --- a/src/main/resources/data/bygonenether/recipes/crafting/warped_nether_brick_vertical_slab.json +++ b/src/main/resources/data/bygonenether/recipes/crafting/warped_nether_brick_vertical_slab.json @@ -1,13 +1,18 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "bygonenether:warped_nether_brick_vertical_slab" - } + "type": "minecraft:crafting_shaped", + "pattern": [ + "#", + "#", + "#" ], + "key": { + "#": { + "item": "bygonenether:warped_nether_bricks" + } + }, "result": { - "item": "bygonenether:warped_nether_brick_slab", - "count": 1 + "item": "bygonenether:warped_nether_brick_vertical_slab", + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/bygonenether/recipes/crafting/warped_nether_brick_vertical_slab_convert.json b/src/main/resources/data/bygonenether/recipes/crafting/warped_nether_brick_vertical_slab_convert.json new file mode 100644 index 0000000..c4c0b5e --- /dev/null +++ b/src/main/resources/data/bygonenether/recipes/crafting/warped_nether_brick_vertical_slab_convert.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "#", + "#", + "#" + ], + "key": { + "#": { + "item": "bygonenether:warped_nether_brick_slab" + } + }, + "result": { + "item": "bygonenether:warped_nether_brick_vertical_slab", + "count": 3 + }, + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "quark" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bygonenether/recipes/crafting/warped_nether_brick_vertical_slab_revert.json b/src/main/resources/data/bygonenether/recipes/crafting/warped_nether_brick_vertical_slab_revert.json index d16b610..da4fc1e 100644 --- a/src/main/resources/data/bygonenether/recipes/crafting/warped_nether_brick_vertical_slab_revert.json +++ b/src/main/resources/data/bygonenether/recipes/crafting/warped_nether_brick_vertical_slab_revert.json @@ -1,18 +1,13 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "#", - "#", - "#" - ], - "key": { - "#": { - "item": "bygonenether:warped_nether_bricks" + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "bygonenether:warped_nether_brick_vertical_slab" } - }, + ], "result": { - "item": "bygonenether:warped_nether_brick_vertical_slab", - "count": 6 + "item": "bygonenether:warped_nether_brick_slab", + "count": 1 }, "conditions": [ { diff --git a/src/main/resources/data/bygonenether/recipes/crafting/withered_blackstone_vertical_slab_convert.json b/src/main/resources/data/bygonenether/recipes/crafting/withered_blackstone_vertical_slab_convert.json new file mode 100644 index 0000000..d588d67 --- /dev/null +++ b/src/main/resources/data/bygonenether/recipes/crafting/withered_blackstone_vertical_slab_convert.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "#", + "#", + "#" + ], + "key": { + "#": { + "item": "bygonenether:withered_blackstone_slab" + } + }, + "result": { + "item": "bygonenether:withered_blackstone_vertical_slab", + "count": 3 + }, + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "quark" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bygonenether/recipes/crushing/chiseled_warped_nether_bricks.json b/src/main/resources/data/bygonenether/recipes/crushing/chiseled_warped_nether_bricks.json index 5d02b77..261c1ea 100644 --- a/src/main/resources/data/bygonenether/recipes/crushing/chiseled_warped_nether_bricks.json +++ b/src/main/resources/data/bygonenether/recipes/crushing/chiseled_warped_nether_bricks.json @@ -8,13 +8,13 @@ "processingTime": 250, "results": [ { - "count": 3, - "item": "minecraft:nether_bricks" + "count": 1, + "item": "minecraft:nether_brick" }, { - "chance": 0.25, - "count": 2, - "item": "minecraft:nether_bricks" + "chance": 0.75, + "count": 1, + "item": "minecraft:nether_brick" }, { "chance": 0.5, diff --git a/src/main/resources/data/bygonenether/recipes/crushing/cobbled_blackstone.json b/src/main/resources/data/bygonenether/recipes/crushing/cobbled_blackstone.json new file mode 100644 index 0000000..9be8dd9 --- /dev/null +++ b/src/main/resources/data/bygonenether/recipes/crushing/cobbled_blackstone.json @@ -0,0 +1,21 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "bygonenether:cobbled_blackstone" + } + ], + "processingTime": 250, + "results": [ + { + "count": 1, + "item": "minecraft:gravel" + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bygonenether/recipes/crushing/soul_stone.json b/src/main/resources/data/bygonenether/recipes/crushing/soul_stone.json new file mode 100644 index 0000000..1d8a131 --- /dev/null +++ b/src/main/resources/data/bygonenether/recipes/crushing/soul_stone.json @@ -0,0 +1,21 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "bygonenether:soul_stone" + } + ], + "processingTime": 250, + "results": [ + { + "count": 1, + "item": "minecraft:soul_soil" + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bygonenether/recipes/crushing/warped_nether_brick_slab.json b/src/main/resources/data/bygonenether/recipes/crushing/warped_nether_brick_slab.json index 865d531..d18dde8 100644 --- a/src/main/resources/data/bygonenether/recipes/crushing/warped_nether_brick_slab.json +++ b/src/main/resources/data/bygonenether/recipes/crushing/warped_nether_brick_slab.json @@ -2,23 +2,19 @@ "type": "create:crushing", "ingredients": [ { - "item": "bygonenether:warped_nether_bricks" + "item": "bygonenether:warped_nether_brick_slab" } ], "processingTime": 250, "results": [ { + "chance": 0.75, "count": 1, "item": "minecraft:nether_brick" }, { "chance": 0.25, "count": 1, - "item": "minecraft:nether_brick" - }, - { - "chance": 0.5, - "count": 1, "item": "minecraft:warped_roots" } ], diff --git a/src/main/resources/data/bygonenether/recipes/crushing/warped_nether_brick_stairs.json b/src/main/resources/data/bygonenether/recipes/crushing/warped_nether_brick_stairs.json index 277b946..09be084 100644 --- a/src/main/resources/data/bygonenether/recipes/crushing/warped_nether_brick_stairs.json +++ b/src/main/resources/data/bygonenether/recipes/crushing/warped_nether_brick_stairs.json @@ -8,11 +8,11 @@ "processingTime": 250, "results": [ { - "count": 2, + "count": 1, "item": "minecraft:nether_brick" }, { - "chance": 0.25, + "chance": 0.75, "count": 1, "item": "minecraft:nether_brick" }, diff --git a/src/main/resources/data/bygonenether/recipes/crushing/warped_nether_brick_vertical_slab.json b/src/main/resources/data/bygonenether/recipes/crushing/warped_nether_brick_vertical_slab.json new file mode 100644 index 0000000..77f0546 --- /dev/null +++ b/src/main/resources/data/bygonenether/recipes/crushing/warped_nether_brick_vertical_slab.json @@ -0,0 +1,31 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "bygonenether:warped_nether_brick_vertical_slab" + } + ], + "processingTime": 250, + "results": [ + { + "chance": 0.75, + "count": 1, + "item": "minecraft:nether_brick" + }, + { + "chance": 0.25, + "count": 1, + "item": "minecraft:warped_roots" + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + }, + { + "type": "forge:mod_loaded", + "modid": "quark" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bygonenether/recipes/crushing/warped_nether_bricks.json b/src/main/resources/data/bygonenether/recipes/crushing/warped_nether_bricks.json index 30adc3f..607a991 100644 --- a/src/main/resources/data/bygonenether/recipes/crushing/warped_nether_bricks.json +++ b/src/main/resources/data/bygonenether/recipes/crushing/warped_nether_bricks.json @@ -8,12 +8,12 @@ "processingTime": 250, "results": [ { - "count": 3, + "count": 1, "item": "minecraft:nether_brick" }, { - "chance": 0.25, - "count": 2, + "chance": 0.75, + "count": 1, "item": "minecraft:nether_brick" }, { diff --git a/src/main/resources/data/bygonenether/recipes/crushing/withered_stone_slab.json b/src/main/resources/data/bygonenether/recipes/crushing/withered_stone_slab.json new file mode 100644 index 0000000..7f74fcf --- /dev/null +++ b/src/main/resources/data/bygonenether/recipes/crushing/withered_stone_slab.json @@ -0,0 +1,25 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "tag": "bygonenether:withered_stone_slab" + } + ], + "processingTime": 250, + "results": [ + { + "chance": 0.0075, + "item": "bygonenether:crushed_withered_debris" + }, + { + "chance": 0.00075, + "item": "bygonenether:netherite_scrap_nugget" + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bygonenether/recipes/stonecutting/cracked_withered_blackstone_slab_from_cracked_withered_blackstone_stonecutting.json b/src/main/resources/data/bygonenether/recipes/stonecutting/cracked_withered_blackstone_slab_from_cracked_withered_blackstone_stonecutting.json new file mode 100644 index 0000000..bd19d77 --- /dev/null +++ b/src/main/resources/data/bygonenether/recipes/stonecutting/cracked_withered_blackstone_slab_from_cracked_withered_blackstone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "bygonenether:cracked_withered_blackstone" + }, + "result": "bygonenether:cracked_withered_blackstone_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/bygonenether/recipes/stonecutting/cracked_withered_blackstone_vertical_slab_from_cracked_withered_blackstone_stonecutting.json b/src/main/resources/data/bygonenether/recipes/stonecutting/cracked_withered_blackstone_vertical_slab_from_cracked_withered_blackstone_stonecutting.json new file mode 100644 index 0000000..f32de69 --- /dev/null +++ b/src/main/resources/data/bygonenether/recipes/stonecutting/cracked_withered_blackstone_vertical_slab_from_cracked_withered_blackstone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "bygonenether:cracked_withered_blackstone" + }, + "result": "bygonenether:cracked_withered_blackstone_vertical_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/bygonenether/recipes/stonecutting/warped_nether_brick_vertical_slab_from_warped_nether_bricks_stonecutting.json b/src/main/resources/data/bygonenether/recipes/stonecutting/warped_nether_brick_vertical_slab_from_warped_nether_bricks_stonecutting.json new file mode 100644 index 0000000..00a79e2 --- /dev/null +++ b/src/main/resources/data/bygonenether/recipes/stonecutting/warped_nether_brick_vertical_slab_from_warped_nether_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "bygonenether:warped_nether_bricks" + }, + "result": "bygonenether:warped_nether_brick_vertical_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/bygonenether/recipes/stonecutting/withered_blackstone_vertical_slab_from_withered_blackstone_stonecutting.json b/src/main/resources/data/bygonenether/recipes/stonecutting/withered_blackstone_vertical_slab_from_withered_blackstone_stonecutting.json new file mode 100644 index 0000000..1e21d43 --- /dev/null +++ b/src/main/resources/data/bygonenether/recipes/stonecutting/withered_blackstone_vertical_slab_from_withered_blackstone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "bygonenether:withered_blackstone" + }, + "result": "bygonenether:withered_blackstone_vertical_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/bygonenether/tags/items/withered_stone.json b/src/main/resources/data/bygonenether/tags/items/withered_stone.json index 34734c2..0894884 100644 --- a/src/main/resources/data/bygonenether/tags/items/withered_stone.json +++ b/src/main/resources/data/bygonenether/tags/items/withered_stone.json @@ -2,10 +2,8 @@ "values": [ "bygonenether:withered_blackstone", "bygonenether:withered_blackstone_stairs", - "bygonenether:withered_blackstone_slab", "bygonenether:cracked_withered_blackstone", "bygonenether:cracked_withered_blackstone_stairs", - "bygonenether:cracked_withered_blackstone_slab", "bygonenether:chiseled_withered_blackstone" ] } \ No newline at end of file diff --git a/src/main/resources/data/bygonenether/tags/items/withered_stone_slab.json b/src/main/resources/data/bygonenether/tags/items/withered_stone_slab.json new file mode 100644 index 0000000..2d0e390 --- /dev/null +++ b/src/main/resources/data/bygonenether/tags/items/withered_stone_slab.json @@ -0,0 +1,14 @@ +{ + "values": [ + "bygonenether:withered_blackstone_slab", + "bygonenether:cracked_withered_blackstone_slab", + { + "id": "bygonenether:withered_blackstone_vertical_slab", + "required": false + }, + { + "id": "bygonenether:cracked_withered_blackstone_vertical_slab", + "required": false + } + ] +} \ No newline at end of file