Merge pull request #717 from Nebby1999/main

Create Sails: Recipe Improvements
TerraFirmaGreg-Team · Jan 17, 2025 · 11ad77c · 11ad77c
2 parents 26e1d84 + c49c9e7
commit 11ad77c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js
@@ -35,8 +35,6 @@ const registerCreateRecipes = (event) => {
         { id: 'create:crafting/kinetics/deployer' },
         { id: 'create:crafting/kinetics/portable_storage_interface' },
         { id: 'create:crafting/kinetics/mechanical_roller' },
-        { id: 'create:crafting/kinetics/sail_framefrom_conversion' },
-        { id: 'create:crafting/kinetics/white_sailfrom_conversion' },
         { id: 'create:crafting/kinetics/sequenced_gearshift' },
         { id: 'create:crafting/kinetics/rotation_speed_controller' },
         { id: 'create:crafting/kinetics/track_signal' },
@@ -590,16 +588,28 @@ const registerCreateRecipes = (event) => {
         .duration(200)
         .EUt(20)
 
-    // Парус ветряной мельницы
-    event.shaped('2x create:white_sail', [
-        'AB',
-        'BC' 
+    // Create sail creation using custom sail items.
+
+    event.shaped('8x create:sail_frame',[
+        'ABA',
+        'BCB',
+        'ABA'
     ], {
-        A: '#minecraft:wool',
-        B: '#forge:rods/wooden',
-        C: '#forge:screws/wrought_iron'
+        A: '#forge:screws/wrought_iron',
+        B: '#tfc:lumber',
+        C: ''
+    }).id('tfg:create/shaped/sail_frame')
+
+    event.shaped('8x create:white_sail', [
+        'AAA',
+        'ABA',
+        'AAA'
+    ], {
+        A: 'create:sail_frame',
+        B: '#tfg:usable_in_sail_frame'
     }).id('tfg:create/shaped/white_sail')
 
+
     // Андезитовый корпус
     event.recipes.createItemApplication(['create:andesite_casing'], ['#minecraft:logs', '#forge:plates/wrought_iron'])
         .id('tfg:create/item_application/andesite_casing')

diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js
@@ -15,8 +15,14 @@ const registerCreateItemTags = (event) => {
         if (dye != 'white') event.add('tfg:colored_seats', `create:${dye}_seat`)
     })
 
+    // Add "cloth" items so sails can be created with any kind of cloth instead of wool blocks
+    event.add('tfg:usable_in_sail_frame', 'tfc:burlap_cloth')
+    event.add('tfg:usable_in_sail_frame', 'tfc:wool_cloth')
+    event.add('tfg:usable_in_sail_frame', "tfc:silk_cloth")
+
     event.add('minecraft:trimmable_armor', 'create:copper_diving_helmet')
     event.add('minecraft:trimmable_armor', 'create:copper_diving_boots')
+
 }
 
 const registerCreateBlockTags = (event) => {