fix boats, worldgen replacements fix, vanilla andesite recipe removal

AllTheMods · Dec 20, 2023 · ba621e7 · ba621e7
1 parent a3fbcca
commit ba621e7
Show file tree

Hide file tree

Showing 26 changed files with 5 additions and 451 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/kubejs/data/tfc/recipes/crafting/wood/acacia_boat.json b/kubejs/data/tfc/recipes/crafting/wood/acacia_boat.json
diff --git a/kubejs/data/tfc/recipes/crafting/wood/ash_boat.json b/kubejs/data/tfc/recipes/crafting/wood/ash_boat.json
diff --git a/kubejs/data/tfc/recipes/crafting/wood/aspen_boat.json b/kubejs/data/tfc/recipes/crafting/wood/aspen_boat.json
diff --git a/kubejs/data/tfc/recipes/crafting/wood/birch_boat.json b/kubejs/data/tfc/recipes/crafting/wood/birch_boat.json
diff --git a/kubejs/data/tfc/recipes/crafting/wood/blackwood_boat.json b/kubejs/data/tfc/recipes/crafting/wood/blackwood_boat.json
diff --git a/kubejs/data/tfc/recipes/crafting/wood/chestnut_boat.json b/kubejs/data/tfc/recipes/crafting/wood/chestnut_boat.json
diff --git a/kubejs/data/tfc/recipes/crafting/wood/douglas_fir_boat.json b/kubejs/data/tfc/recipes/crafting/wood/douglas_fir_boat.json
diff --git a/kubejs/data/tfc/recipes/crafting/wood/hickory_boat.json b/kubejs/data/tfc/recipes/crafting/wood/hickory_boat.json
diff --git a/kubejs/data/tfc/recipes/crafting/wood/kapok_boat.json b/kubejs/data/tfc/recipes/crafting/wood/kapok_boat.json
diff --git a/kubejs/data/tfc/recipes/crafting/wood/mangrove_boat.json b/kubejs/data/tfc/recipes/crafting/wood/mangrove_boat.json
diff --git a/kubejs/data/tfc/recipes/crafting/wood/maple_boat.json b/kubejs/data/tfc/recipes/crafting/wood/maple_boat.json
diff --git a/kubejs/data/tfc/recipes/crafting/wood/oak_boat.json b/kubejs/data/tfc/recipes/crafting/wood/oak_boat.json
diff --git a/kubejs/data/tfc/recipes/crafting/wood/palm_boat.json b/kubejs/data/tfc/recipes/crafting/wood/palm_boat.json