From af22513921d94e263a48ff5fa05009a61ad34881 Mon Sep 17 00:00:00 2001
From: Dmitry <ondyshev.dmitry@gmail.com>
Date: Sat, 6 Jan 2024 22:21:01 +0700
Subject: [PATCH] create pump fixes

---
 config/sophisticatedcore-common.toml        |  2 +-
 defaultconfigs/create-server.toml           |  4 +--
 kubejs/server_scripts/create/tags.js        |  5 +++
 kubejs/server_scripts/main_server_script.js | 39 ++++-----------------
 4 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/config/sophisticatedcore-common.toml b/config/sophisticatedcore-common.toml
index 69dfa27da..5c864f82c 100644
--- a/config/sophisticatedcore-common.toml
+++ b/config/sophisticatedcore-common.toml
@@ -2,5 +2,5 @@
 #Common Settings
 [common]
 	#Disable / enable any items here (disables their recipes)
-	enabledItems = []
+	enabledItems = ["sophisticatedbackpacks:compacting_upgrade|false", "sophisticatedbackpacks:advanced_restock_upgrade|false", "sophisticatedbackpacks:diamond_backpack|false", "sophisticatedbackpacks:tank_upgrade|false", "sophisticatedbackpacks:auto_smoking_upgrade|false", "sophisticatedbackpacks:filter_upgrade|false", "sophisticatedbackpacks:advanced_compacting_upgrade|false", "sophisticatedbackpacks:feeding_upgrade|false", "sophisticatedbackpacks:advanced_pickup_upgrade|false", "sophisticatedbackpacks:smoking_upgrade|false", "sophisticatedbackpacks:everlasting_upgrade|false", "sophisticatedbackpacks:advanced_feeding_upgrade|false", "sophisticatedbackpacks:crafting_upgrade|false", "sophisticatedbackpacks:stack_upgrade_tier_4|false", "sophisticatedbackpacks:stack_upgrade_tier_2|false", "sophisticatedbackpacks:stack_upgrade_tier_3|false", "sophisticatedbackpacks:stack_upgrade_tier_1|false", "sophisticatedbackpacks:advanced_pump_upgrade|false", "sophisticatedbackpacks:refill_upgrade|false", "sophisticatedbackpacks:auto_blasting_upgrade|false", "sophisticatedbackpacks:void_upgrade|false", "sophisticatedbackpacks:advanced_refill_upgrade|false", "sophisticatedbackpacks:advanced_tool_swapper_upgrade|false", "sophisticatedbackpacks:smelting_upgrade|false", "sophisticatedbackpacks:battery_upgrade|false", "sophisticatedbackpacks:magnet_upgrade|false", "sophisticatedbackpacks:advanced_magnet_upgrade|false", "sophisticatedbackpacks:blasting_upgrade|false", "sophisticatedbackpacks:deposit_upgrade|false", "sophisticatedbackpacks:iron_backpack|false", "sophisticatedbackpacks:stonecutter_upgrade|false", "sophisticatedbackpacks:backpack|false", "sophisticatedbackpacks:tool_swapper_upgrade|false", "sophisticatedbackpacks:jukebox_upgrade|false", "sophisticatedbackpacks:advanced_filter_upgrade|false", "sophisticatedbackpacks:inception_upgrade|false", "sophisticatedbackpacks:anvil_upgrade|false", "sophisticatedbackpacks:xp_pump_upgrade|false", "sophisticatedbackpacks:auto_smelting_upgrade|false", "sophisticatedbackpacks:pickup_upgrade|false", "sophisticatedbackpacks:upgrade_base|false", "sophisticatedbackpacks:gold_backpack|false", "sophisticatedbackpacks:advanced_deposit_upgrade|false", "sophisticatedbackpacks:advanced_void_upgrade|false", "sophisticatedbackpacks:restock_upgrade|false", "sophisticatedbackpacks:pump_upgrade|false", "sophisticatedbackpacks:netherite_backpack|false"]
 
diff --git a/defaultconfigs/create-server.toml b/defaultconfigs/create-server.toml
index 9fa8c2c49..d60c2b37c 100644
--- a/defaultconfigs/create-server.toml
+++ b/defaultconfigs/create-server.toml
@@ -331,14 +331,14 @@
 	#[-1 to disable this behaviour]
 	#The minimum amount of fluid blocks the hose pulley needs to find before deeming it an infinite source.
 	#Range: > -1
-	hosePulleyBlockThreshold = 10000
+	hosePulleyBlockThreshold = 0
 	#.
 	#Whether hose pulleys should continue filling up above-threshold sources.
 	fillInfinite = false
 	#.
 	#Configure which fluids can be drained infinitely.
 	#Allowed Values: ALLOW_ALL, DENY_ALL, ALLOW_BY_TAG, DENY_BY_TAG
-	bottomlessFluidMode = "ALLOW_ALL"
+	bottomlessFluidMode = "ALLOW_BY_TAG"
 	#.
 	#Whether hose pulleys should be allowed to place fluid sources.
 	fluidFillPlaceFluidSourceBlocks = false
diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js
index 1043ea240..ebd8a22cb 100644
--- a/kubejs/server_scripts/create/tags.js
+++ b/kubejs/server_scripts/create/tags.js
@@ -13,3 +13,8 @@ const registerCreateItemTags = (event) => {
         if (dye != 'white') event.add('tfg:colored_seats', `create:${dye}_seat`)
     })
 }
+
+const registerCreateFluidTags = (event) => {
+    event.add('create:bottomless/allow', 'tfc:fresh_water')
+    event.add('create:bottomless/allow', 'tfc:salt_water')
+}
\ No newline at end of file
diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js
index a4bebf0d0..0c0cd2c96 100644
--- a/kubejs/server_scripts/main_server_script.js
+++ b/kubejs/server_scripts/main_server_script.js
@@ -36,6 +36,7 @@ ServerEvents.tags('block', event => {
  */
 ServerEvents.tags('fluid', event => {
     registerTFCFluidTags(event)
+    registerCreateFluidTags(event)
 })
 
 /**
@@ -102,13 +103,6 @@ ServerEvents.recipes(event => {
     registerChiselAndBitsRecipes(event)
 })
 
-/**
- * Событие регистрации рудных жил.
- */
-GTCEuServerEvents.oreVeins(event => {
-    event.removeAll()
-})
-
 /**
  * Событие регистрации лут-тейблов.
  */
@@ -116,28 +110,9 @@ LootJS.modifiers((event) => {
     registerGTCEULoots(event)
 });
 
-//#endregion
-
-/*
-
-// 
-event.shaped('', [
-    'AAA',
-    'AAA',
-    'AAA' 
-], {
-    A: '',
-    B: '',
-    C: '',
-    D: '',
-    E: '',
-    F: '',
-    G: '',
-}).id('tfg:create/shaped/')
-
-//
-event.shapeless('', [
-    
-]).id('tfg:create/shapeless/')
-
-*/
\ No newline at end of file
+/**
+ * Событие регистрации рудных жил.
+ */
+GTCEuServerEvents.oreVeins(event => {
+    event.removeAll()
+})
\ No newline at end of file