Merge remote-tracking branch 'origin/1.20.1/fabric/prod' into 1.20.1/…

…fabric/prod # Conflicts: # pack.toml
Layers-of-Railways · Nov 30, 2024 · 244e898 · 244e898
2 parents f59589b + 948075f
commit 244e898
Show file tree

Hide file tree

Showing 20 changed files with 717 additions and 503 deletions.
diff --git a/config/item_obliterator.json5 b/config/item_obliterator.json5
@@ -32,14 +32,6 @@
         "createaddition:creative_energy",
         "spelunkery:flint_hammer_and_chisel",
         "spelunkery:obsidian_hammer_and_chisel",
-        "ae2:spatial_cell_component_2",
-        "ae2:spatial_cell_component_16",
-        "ae2:spatial_cell_component_128",
-        "ae2:spatial_storage_cell_2",
-        "ae2:spatial_storage_cell_16",
-        "ae2:spatial_storage_cell_128",
-        "ae2:spacial_pylon",
-        "ae2:spatial_io_port",
         "ae2:spatial_anchor",
         "ae2:matter_cannon"
     ],

diff --git a/index.toml b/index.toml
@@ -86,7 +86,7 @@ hash = "1de5a07a92ed99574f03555597da94db00d30b2f28ead3b1caf9abd86485452b"
 
 [[files]]
 file = "config/item_obliterator.json5"
-hash = "eed9ab70d89d525fa2a81b5ff3c2637dcfe132287a5be3c3223dd457ced5c4dc"
+hash = "7777b6acd3ec5b53c23f801a1d375c841b811bf9bf653c8daaa747364927b08a"
 
 [[files]]
 file = "config/lmft.json"
@@ -497,6 +497,10 @@ hash = "d93d05a3d1bad50c4d50318d0a9c1ef44d4e437a8042c7c9afb93c149bd4fdba"
 file = "kubejs/config/common.properties"
 hash = "cd5616617d0c1219c54eb85e3d56e3c0efa92fa492b0b2d4980b8b0870d264a9"
 
+[[files]]
+file = "kubejs/data/ae2/tags/blocks/blacklisted/spatial.json"
+hash = "5e581581f871bb6a1c75dc884fc0662d4cde83b9b0c6a90458183818599354c0"
+
 [[files]]
 file = "kubejs/data/create/recipes/crafting/curiosities/brown_toolbox.json"
 hash = "45d26a6d873bea2dbb9b693865225b218050b3cd61e11a3118c53c6814ed6e3c"
@@ -579,19 +583,15 @@ hash = "f6c2608bcb3e2d8d7cb63a6775b736448a5d3e019fd6a2ccfbb40a61a05e911b"
 
 [[files]]
 file = "kubejs/server_scripts/mods/farmersdelight.js"
-hash = "e7eca84aedff32c1346213753ae790cef04be79803aa091a953065405a54d8ae"
+hash = "8d599b88eda467bdfd6b2b2d72ce9516b06ed512f2f2e5f095c7acf5a4a4412e"
 
 [[files]]
 file = "kubejs/server_scripts/mods/phonos.js"
 hash = "0cdef75026facef7f1e3021f495cf4f11a4341e86c24c93301a2183ed9dfc2d7"
 
 [[files]]
 file = "kubejs/server_scripts/mods/tinkers.js"
-hash = "1cdd7282bfc4beb43c7145da573f84403356c45ca5e01a5d8e9382af85d6fd65"
-
-[[files]]
-file = "kubejs/server_scripts/poly's fixes/farmersdelight.js"
-hash = "7b1cbd8ed4d6f49300357c128cb1bb4ca8f8002665bb23c56c036cc6f9c6a0bf"
+hash = "e04bf2f439814a94bb3bac04325d260caefaa77ec5ea99e34c11ec379429f25c"
 
 [[files]]
 file = "kubejs/server_scripts/poly's fixes/lapisshard.js"
@@ -605,10 +605,6 @@ hash = "91bd04de6b114fade6b711508b7af9c8e401eb486f94cb1e6d59124184658cce"
 file = "kubejs/server_scripts/poly's fixes/thallasium.js"
 hash = "7fc60ad769e51ecd62a49c50e1e6d7d53497d931f8afb488af5eed0d438f2570"
 
-[[files]]
-file = "kubejs/server_scripts/poly's fixes/tinkersfixes.js"
-hash = "d56ca08d48dc43da87d350b93a4e2a01fe8711d6ae85205a64f5a029bb7cb96e"
-
 [[files]]
 file = "kubejs/server_scripts/recipe_removals.js"
 hash = "f6e82022fc644b4be24851a8efcf3ed4da3b0aa26d6948d12a2ba1a2920fc327"
@@ -753,6 +749,11 @@ file = "mods/bclib.pw.toml"
 hash = "d71225c33f2287ca8c0f61483a8d9da35c80a69cb14f252dceaf0e504435bb7f"
 metafile = true
 
+[[files]]
+file = "mods/beaconoverhaul.pw.toml"
+hash = "948e2afde3a7a98cca263230450e50d861fdd8984c87a464897c17a3105c6037"
+metafile = true
+
 [[files]]
 file = "mods/better-log4j-config.pw.toml"
 hash = "a6a8ef4b8f5acbe5b834e453b873aa95adf7c1debf0ff546ce2eed5177f948c2"
@@ -783,6 +784,11 @@ file = "mods/bluemap.pw.toml"
 hash = "f96656076717dcadf38073af32ce253b2cfd0f5ff1785c03450e146f06213ee3"
 metafile = true
 
+[[files]]
+file = "mods/bobby.pw.toml"
+hash = "b02a808166a12bda1a4bb63e2ac0596f0c9006461956207775f9255fcee24d2a"
+metafile = true
+
 [[files]]
 file = "mods/borderless-mining.pw.toml"
 hash = "c49d42cddfb05cf5e4882d5753bd98a525c9a994fda5f49651003e8266b7aa9d"
@@ -947,6 +953,11 @@ file = "mods/create-design-n-decor.pw.toml"
 hash = "6b4e4ced7cb3323842a46fa78fe1e5e8ff2badd6814d09dab5ea9e5ca0f28a7c"
 metafile = true
 
+[[files]]
+file = "mods/create-dynamic-lights.pw.toml"
+hash = "f225bfe9a222d6f75b6bb25889b10f839b433d0ca76e663c3e5ea64cc0eef02e"
+metafile = true
+
 [[files]]
 file = "mods/create-enchantment-industry-fabric.pw.toml"
 hash = "da0b1e65c3bb9f9eabfbaf4242b3adf22267752adb3824fe62b24077cf458340"
@@ -1022,6 +1033,11 @@ file = "mods/detail-armor-bar.pw.toml"
 hash = "89d22d515a1b5b1349b21eaa191a00bf529acca7673ba6af27dfda0380abea2b"
 metafile = true
 
+[[files]]
+file = "mods/distanthorizons.pw.toml"
+hash = "bfea39fa87d572fb36860c915666ca16daca9d93bfdbcdd9185f8b490f0ecb41"
+metafile = true
+
 [[files]]
 file = "mods/do-a-barrel-roll.pw.toml"
 hash = "5eddd4c6a5cba7cd4d3d9a0acd0e810ae040d92b6c1928984a9497a5187d143b"
@@ -1237,6 +1253,11 @@ file = "mods/glitchcore.pw.toml"
 hash = "493ed95320ee3cc9c2def86b9d0971c2ca4bb4215921c2a11208bee77d5dbfb5"
 metafile = true
 
+[[files]]
+file = "mods/gui-pack-utils.pw.toml"
+hash = "0878f3e8decf1bba498ef62d7c26ae0698dc10af89871f06bde87e77746d5ce5"
+metafile = true
+
 [[files]]
 file = "mods/hand-over-your-items.pw.toml"
 hash = "11483562aa9ba14ee03da7204c6edcc45a2f18ce5076aafa4ca5c2d3f6b7dc5f"
@@ -1289,12 +1310,12 @@ metafile = true
 
 [[files]]
 file = "mods/iris-flw-compat.pw.toml"
-hash = "3448fc32106cb97efb4da88e5ea44056ec62d4e5b172a2f71696dab0ca2ccbe8"
+hash = "dc1dae1567b0d338676f0c1aae73c79734ee719f04925b1ab2093773cae0e0e5"
 metafile = true
 
 [[files]]
 file = "mods/iris.pw.toml"
-hash = "aac37788ac1acd537a8b5b32fc2489cddf8034f196f7f38c0755837764b4f01d"
+hash = "a3703e73f03285a342d4344d30e2dfbc0fb72cb787351933bc1abefdced7be61"
 metafile = true
 
 [[files]]
@@ -1342,6 +1363,11 @@ file = "mods/kubejs.pw.toml"
 hash = "08466e36ec0585de1c99f28e5f91566160e06283e5d69ad47c74623f72ce9385"
 metafile = true
 
+[[files]]
+file = "mods/lambdynamiclights.pw.toml"
+hash = "afd9f1b92d4af4b01eb15885f929bfdf8d1495ae6b1f70835ed3c0c4189cf61a"
+metafile = true
+
 [[files]]
 file = "mods/lava-bucket-trash.pw.toml"
 hash = "e576a386a01938698a018c97800383846cddacdf2fa4abe6873c3b81881b3033"
@@ -1552,6 +1578,11 @@ file = "mods/numismatics.pw.toml"
 hash = "2209ce7afd887d1c1dfea7132d3d72d15d1f445215220af0c16db46d596b6cdb"
 metafile = true
 
+[[files]]
+file = "mods/observable.pw.toml"
+hash = "866fe66f4977cfc8cd8d81722269b9ad5666d347cb74c117fafdc60cd294d161"
+metafile = true
+
 [[files]]
 file = "mods/old-mc-logo.pw.toml"
 hash = "51104c4edcea7ece258ed464326721daa3f971b01104812d7442e1d9dce98e9e"
@@ -1919,6 +1950,16 @@ file = "mods/worldborderfix.pw.toml"
 hash = "0b24d3fbf38ac7340c0fc39e4f9e2331ae733c975050c195268b09042322c770"
 metafile = true
 
+[[files]]
+file = "mods/worldedit.pw.toml"
+hash = "6cc9dcf9d184bfc8f4943802906d7e50f96bcb01bfc40c6eaaee8bc5ebc79b96"
+metafile = true
+
+[[files]]
+file = "mods/worldeditcui-fabric.pw.toml"
+hash = "e7c22813e71e5c061f527b74c57f0acddb70660661f764f57d88214e769dce49"
+metafile = true
+
 [[files]]
 file = "mods/xaeros-minimap.pw.toml"
 hash = "10cfaa777886c9437f456e06ac45be7cc26249ab64a2bd97d45fe17a0e7b452c"
@@ -2001,7 +2042,7 @@ metafile = true
 
 [[files]]
 file = "resourcepacks/ferns-fancy-inventory.pw.toml"
-hash = "59fd0191db2076fcdb91fdb269ad72b0a2841a0e94a0f079825f2e9e5ae4e152"
+hash = "d43567494deb63db732f604867130b4009f9ed3ce76b3d70210597dba029e646"
 metafile = true
 
 [[files]]

diff --git a/kubejs/data/ae2/tags/blocks/blacklisted/spatial.json b/kubejs/data/ae2/tags/blocks/blacklisted/spatial.json
@@ -0,0 +1,26 @@
+{
+    "replace": false,
+    "values": [
+      "minecraft:bedrock",
+      "minecraft:end_portal",
+      "minecraft:end_portal_frame",
+      "minecraft:end_gateway",
+      "universal_graves:visual_grave",
+      "universal_graves:container_grave",
+      "universal_graves:grave",
+      "ae2:creative_energy_cell",
+      "createaddition:creative_energy",
+      "createaddition:accumulator",
+      "create:creative_crate",
+      "create:creative_fluid_tank",
+      "create:creative_motor",
+      "numismatics:creative_vendor",
+      "armourers_workshop:skin-library-creative",
+      "create:fluid_tank",
+      "create:item_vault",
+      {
+        "id": "#c:movement_restricted",
+        "required": false
+      }
+    ]
+  }
diff --git a/kubejs/server_scripts/mods/farmersdelight.js b/kubejs/server_scripts/mods/farmersdelight.js
@@ -7,4 +7,100 @@ ServerEvents.recipes((event) => {
             keepHeldItem: true,
         });
     });
+
+    event.remove({ output: 'brewinandchewin:kimchi' })
+    event.custom({
+        "type": "brewinandchewin:fermenting",
+        "experience": 0.6,
+        "fermentingtime": 12000,
+        "ingredients": [
+        {
+            "item": "farmersdelight:cabbage_leaf"
+        },
+        {
+            "tag": "c:foods/vegetables"
+        },
+        {
+            "item": "minecraft:kelp"
+        }
+        ],
+        "recipe_book_tab": "misc",
+        "result": {
+        "count": 2,
+        "item": "brewinandchewin:kimchi"
+        },
+        "temperature": 3
+    })
+
+    event.remove({ output: 'farmersdelight:hamburger' })
+    event.shapeless('farmersdelight:hamburger', [ 
+        'minecraft:bread',
+        'farmersdelight:beef_patty',
+        '#c:salad_ingredients',
+        '#c:crops/tomato',
+        '#c:crops/onion'
+    ])
+
+    event.custom({
+        "type": "farmersdelight:cooking",
+        "cookingtime": 200,
+        "experience": 1.0,
+        "ingredients": [
+            {
+            "item": "minecraft:carrot"
+            },
+            {
+            "item": "minecraft:brown_mushroom"
+            },
+            {
+            "item": "farmersdelight:raw_pasta"
+            },
+            {
+            "tag": "c:salad_ingredients"
+            },
+            {
+            "tag": "c:foods/vegetables"
+            }
+        ],
+        "recipe_book_tab": "meals",
+        "result": {
+            "item": "farmersdelight:vegetable_noodles"
+        }
+    })
+
+    event.custom({
+        "type": "farmersdelight:cooking",
+        "cookingtime": 200,
+        "experience": 1.0,
+        "ingredients": [
+            {
+            "item": "farmersdelight:wheat_dough"
+            },
+            {
+            "tag": "c:crops/cabbage"
+            },
+            {
+            "tag": "c:crops/onion"
+            },
+            [
+                {
+                    "tag": "c:foods/raw_meats/raw_chicken"
+                },
+                {
+                    "tag": "c:foods/raw_meats/raw_pork"
+                },
+                {
+                    "tag": "c:foods/raw_meats/raw_beef"
+                },
+                {
+                    "item": "minecraft:brown_mushroom"
+                }
+            ]
+        ],
+        "recipe_book_tab": "misc",
+        "result": {
+            "count": 2,
+            "item": "farmersdelight:dumplings"
+        }
+    })
 });