diff --git a/defaultconfigs/firmaciv-server.toml b/defaultconfigs/firmaciv-server.toml index bc478702..03acd59a 100644 --- a/defaultconfigs/firmaciv-server.toml +++ b/defaultconfigs/firmaciv-server.toml @@ -7,5 +7,5 @@ #Force reduceDebugInfo gamerule. forceReducedDebugInfo = false #Disables vanilla boats and base TFC boats from working. - disableVanillaBoatFunctionality = true + disableVanillaBoatFunctionality = false diff --git a/kubejs/client_scripts/jei_hide/removals.js b/kubejs/client_scripts/jei_hide/removals.js index 9a96c500..6643d836 100644 --- a/kubejs/client_scripts/jei_hide/removals.js +++ b/kubejs/client_scripts/jei_hide/removals.js @@ -47,6 +47,8 @@ let hidePotions = (/** @type {Internal.HideJEIEventJS}*/ event) => { event.hide(`/^gtceu:${tool}_leggings/`) event.hide(`/^gtceu:${tool}_boots/`) }) + event.hide(`/^minecraft:.*_boat/`) + event.hide(`/^tfc:wood/boat/.*/`) //IE event.hide("immersiveengineering:cokebrick") diff --git a/kubejs/client_scripts/main_client.js b/kubejs/client_scripts/main_client.js index 8c7b69cd..fe15c1af 100644 --- a/kubejs/client_scripts/main_client.js +++ b/kubejs/client_scripts/main_client.js @@ -24,5 +24,4 @@ ClientEvents.lang("en_us", (event) => { ItemEvents.tooltip(event => { addModNameTooltipToCreativeTab(event) circuitTooltips(event) - boatToolTips(event) }) diff --git a/kubejs/client_scripts/tooltip/boats.js b/kubejs/client_scripts/tooltip/boats.js deleted file mode 100644 index feba03b0..00000000 --- a/kubejs/client_scripts/tooltip/boats.js +++ /dev/null @@ -1,129 +0,0 @@ - -const boats = [ - { - id: 'tfc:wood/boat/acacia', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/ash', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/aspen', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/birch', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/blackwood', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/chestnut', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/douglas_fir', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/hickory', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/kapok', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/mangrove', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/maple', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/oak', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/pine', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/rosewood', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/sequoia', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/spruce', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/sycamore', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/white_cedar', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - }, - { - id: 'tfc:wood/boat/willow', - text: 'Functionality Disabled.', - alt: 'Crafting Ingredient ONLY!', - colour: 0xFF0000 - } -] - -const boatToolTips = (/** @type {Internal.ItemTooltipEventJS} */ event) => { - boats.forEach((boat) => { - event.add(boat.id, - [ - Text.of(boat.text), - Text.of(boat.alt).color(boat.colour) - ] - ) - } - ) -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/acacia_boat.json b/kubejs/data/tfc/recipes/crafting/wood/acacia_boat.json deleted file mode 100644 index 0534da56..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/acacia_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/acacia" - } - }, - "result": { - "item": "tfc:wood/boat/acacia" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/ash_boat.json b/kubejs/data/tfc/recipes/crafting/wood/ash_boat.json deleted file mode 100644 index 5ad1a4e9..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/ash_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/ash" - } - }, - "result": { - "item": "tfc:wood/boat/ash" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/aspen_boat.json b/kubejs/data/tfc/recipes/crafting/wood/aspen_boat.json deleted file mode 100644 index 0ff18d2c..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/aspen_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/aspen" - } - }, - "result": { - "item": "tfc:wood/boat/aspen" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/birch_boat.json b/kubejs/data/tfc/recipes/crafting/wood/birch_boat.json deleted file mode 100644 index 079087ee..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/birch_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/birch" - } - }, - "result": { - "item": "tfc:wood/boat/birch" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/blackwood_boat.json b/kubejs/data/tfc/recipes/crafting/wood/blackwood_boat.json deleted file mode 100644 index 115e7f4b..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/blackwood_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/blackwood" - } - }, - "result": { - "item": "tfc:wood/boat/blackwood" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/chestnut_boat.json b/kubejs/data/tfc/recipes/crafting/wood/chestnut_boat.json deleted file mode 100644 index a80778ba..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/chestnut_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/chestnut" - } - }, - "result": { - "item": "tfc:wood/boat/chestnut" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/douglas_fir_boat.json b/kubejs/data/tfc/recipes/crafting/wood/douglas_fir_boat.json deleted file mode 100644 index 7991e0b8..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/douglas_fir_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/douglas_fir" - } - }, - "result": { - "item": "tfc:wood/boat/douglas_fir" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/hickory_boat.json b/kubejs/data/tfc/recipes/crafting/wood/hickory_boat.json deleted file mode 100644 index dd5ff5b3..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/hickory_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/hickory" - } - }, - "result": { - "item": "tfc:wood/boat/hickory" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/kapok_boat.json b/kubejs/data/tfc/recipes/crafting/wood/kapok_boat.json deleted file mode 100644 index 75f15bb1..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/kapok_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/kapok" - } - }, - "result": { - "item": "tfc:wood/boat/kapok" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/mangrove_boat.json b/kubejs/data/tfc/recipes/crafting/wood/mangrove_boat.json deleted file mode 100644 index 12b1561a..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/mangrove_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/mangrove" - } - }, - "result": { - "item": "tfc:wood/boat/mangrove" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/maple_boat.json b/kubejs/data/tfc/recipes/crafting/wood/maple_boat.json deleted file mode 100644 index a5b309d5..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/maple_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/maple" - } - }, - "result": { - "item": "tfc:wood/boat/maple" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/oak_boat.json b/kubejs/data/tfc/recipes/crafting/wood/oak_boat.json deleted file mode 100644 index 0e2fafe5..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/oak_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/oak" - } - }, - "result": { - "item": "tfc:wood/boat/oak" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/palm_boat.json b/kubejs/data/tfc/recipes/crafting/wood/palm_boat.json deleted file mode 100644 index 5f0fd585..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/palm_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/palm" - } - }, - "result": { - "item": "tfc:wood/boat/palm" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/pine_boat.json b/kubejs/data/tfc/recipes/crafting/wood/pine_boat.json deleted file mode 100644 index 38024619..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/pine_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/pine" - } - }, - "result": { - "item": "tfc:wood/boat/pine" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/rosewood_boat.json b/kubejs/data/tfc/recipes/crafting/wood/rosewood_boat.json deleted file mode 100644 index 2835aebb..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/rosewood_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/rosewood" - } - }, - "result": { - "item": "tfc:wood/boat/rosewood" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/sequoia_boat.json b/kubejs/data/tfc/recipes/crafting/wood/sequoia_boat.json deleted file mode 100644 index 1b1f83d5..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/sequoia_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/sequoia" - } - }, - "result": { - "item": "tfc:wood/boat/sequoia" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/spruce_boat.json b/kubejs/data/tfc/recipes/crafting/wood/spruce_boat.json deleted file mode 100644 index d787fdc0..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/spruce_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/spruce" - } - }, - "result": { - "item": "tfc:wood/boat/spruce" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/sycamore_boat.json b/kubejs/data/tfc/recipes/crafting/wood/sycamore_boat.json deleted file mode 100644 index 3e06880c..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/sycamore_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/sycamore" - } - }, - "result": { - "item": "tfc:wood/boat/sycamore" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/white_cedar_boat.json b/kubejs/data/tfc/recipes/crafting/wood/white_cedar_boat.json deleted file mode 100644 index 9a9f1ca5..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/white_cedar_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/white_cedar" - } - }, - "result": { - "item": "tfc:wood/boat/white_cedar" - } -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/crafting/wood/willow_boat.json b/kubejs/data/tfc/recipes/crafting/wood/willow_boat.json deleted file mode 100644 index 8445ab34..00000000 --- a/kubejs/data/tfc/recipes/crafting/wood/willow_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "item": "tfc:wood/planks/willow" - } - }, - "result": { - "item": "tfc:wood/boat/willow" - } -} \ No newline at end of file diff --git a/kubejs/server_scripts/recipes/removal.js b/kubejs/server_scripts/recipes/removal.js index 691910a6..4e43756c 100644 --- a/kubejs/server_scripts/recipes/removal.js +++ b/kubejs/server_scripts/recipes/removal.js @@ -11,6 +11,7 @@ const toolsToRemove = [ "red_steel" ] let recipeRemoval = (/** @type {Internal.RecipesEventJS} */ event) => { + event.remove({ id: "minecraft:andesite"}) event.remove({ id: "tfc:crafting/bloomery" }) //GT event.remove({ id: "gtceu:shaped/stick_wrought_iron" }) diff --git a/kubejs/server_scripts/worldgen/structures.js b/kubejs/server_scripts/worldgen/structures.js index b589b2fe..4acfbaeb 100644 --- a/kubejs/server_scripts/worldgen/structures.js +++ b/kubejs/server_scripts/worldgen/structures.js @@ -78,6 +78,7 @@ const strucBlocksWithPropertiesMap = { "minecraft:brown_bed": "tfc:thatch_bed", "minecraft:magenta_bed": "tfc:thatch_bed", "minecraft:stone_slab": "tfc:rock/raw/granite_slab", + "minecraft:stone_brick_slab": "tfc:rock/bricks/granite_slab", "minecraft:smooth_stone_slab": "tfc:rock/smooth/granite_slab", "minecraft:polished_andesite": 'tfc:rock/smooth/andesite', "minecraft:bookshelf": "tfc:wood/planks/spruce_bookshelf",