diff --git a/CHANGELOG.md b/CHANGELOG.md index aa1d85a0f..2033a6e98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ - Fixed pyrogallol and black and white film developer requiring too high of a heat on the pot recipe (#2909) @Pyritie - Fixed not being able to fire scraping blade clay mold (#2905) @Pyritie - Fixed stair and slab versions of road blocks not having speed bonuses (#2912) @Pyritie +- Fixed RNR roofs not having mineable tags, and blocked the stair/slab frame from Additional Placements (#2870) @Pyritie ### Translation updates - Chinese (simplified) @jmecn - Russian @Petr211071 + @Nixieeunrare diff --git a/config/additionalplacements-startup.toml b/config/additionalplacements-startup.toml index 90d42c665..60f7f30c2 100644 --- a/config/additionalplacements-startup.toml +++ b/config/additionalplacements-startup.toml @@ -14,13 +14,13 @@ [startup.types.additionalplacements.slab] #Blocklist for controlling which blocks (that are valid for this type) will generate variants of this type #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format - enabled = ["+*"] + enabled = ["+*", "-rnr:roof_frame_slab"] #Stairs [startup.types.additionalplacements.stairs] #Blocklist for controlling which blocks (that are valid for this type) will generate variants of this type #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format - enabled = ["+*"] + enabled = ["+*", "-rnr:roof_frame_stairs"] #Blocklist to control which blocks will allow for vertical stair connections. #Keep in mind vertical is RELATIVE to the placement of the stair - "vertical" for a vertically placed stair will be one of the two horizontal directions. #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 408acefbb..e62b99652 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -87,6 +87,7 @@ ServerEvents.tags('block', event => { registerMoreRedBlockTags(event) registerHotOrNotBlockTags(event) registerRailWaysBlockTags(event) + registerRnrBlockTags(event) registerSophisticatedBackpacksBlockTags(event) registerSpeciesBlockTags(event) registerTACZBlockTags(event) diff --git a/kubejs/server_scripts/rnr/tags.js b/kubejs/server_scripts/rnr/tags.js index 081432ce3..670010dcd 100644 --- a/kubejs/server_scripts/rnr/tags.js +++ b/kubejs/server_scripts/rnr/tags.js @@ -6,4 +6,31 @@ const registerRnrItemTags = (event) => { event.removeAllTagsFrom(item) event.add('c:hidden_from_recipe_viewers', item) }); -}; \ No newline at end of file +}; + +function registerRnrBlockTags(event) { + + global.TFC_WOOD_TYPES.forEach(wood => { + event.add('minecraft:mineable/axe', `rnr:wood/shingles/${wood}`) + event.add('minecraft:mineable/axe', `rnr:wood/shingles/${wood}_stairs`) + event.add('minecraft:mineable/axe', `rnr:wood/shingles/${wood}_slab`) + }); + + global.AFC_WOOD_TYPES.forEach(wood => { + event.add('minecraft:mineable/axe', `rnr:wood/shingles/${wood}`) + event.add('minecraft:mineable/axe', `rnr:wood/shingles/${wood}_stairs`) + event.add('minecraft:mineable/axe', `rnr:wood/shingles/${wood}_slab`) + }); + + event.add('minecraft:mineable/hoe', `rnr:thatch_roof`) + event.add('minecraft:mineable/hoe', `rnr:thatch_roof_stairs`) + event.add('minecraft:mineable/hoe', `rnr:thatch_roof_slab`) + + event.add('minecraft:mineable/pickaxe', `rnr:terracotta_roof`) + event.add('minecraft:mineable/pickaxe', `rnr:terracotta_roof_stairs`) + event.add('minecraft:mineable/pickaxe', `rnr:terracotta_roof_slab`) + event.add('minecraft:mineable/pickaxe', `rnr:ceramic_roof`) + event.add('minecraft:mineable/pickaxe', `rnr:ceramic_roof_stairs`) + event.add('minecraft:mineable/pickaxe', `rnr:ceramic_roof_slab`) + +} \ No newline at end of file