diff --git a/config/dynamicview.json b/config/dynamicview.json new file mode 100644 index 0000000..49ec10c --- /dev/null +++ b/config/dynamicview.json @@ -0,0 +1,34 @@ +{ + "minChunkViewDist": { + "desc:": "The minimum chunk view distance allowed to use. Default: 10, minimum 3, maximum 200", + "minChunkViewDist": 6 + }, + "maxChunkViewDist": { + "desc:": "The maximum chunk view distance allowed to use. Set to the max a player could benefit from. Default: 10, minimum 3, maximum 200", + "maxChunkViewDist": 12 + }, + "meanAvgTickTime": { + "desc:": "The average tick time to stabilize the distances around. Setting it higher than 50ms is not advised, as after 50ms the TPS will go below 20. Default: 45ms, min: 10, max:100", + "meanAvgTickTime": 45 + }, + "viewDistanceUpdateRate": { + "desc:": "The change frequency of distances in seconds. Default: 30, min:1, max:1000", + "viewDistanceUpdateRate": 60 + }, + "minSimulationDist": { + "desc:": "The minimum simulation distance allowed to use. Default: 4, minimum 1, maximum 200", + "minSimulationDist": 4 + }, + "maxSimulationDist": { + "desc:": "The maximum simulation distance allowed to use. Default: 10, minimum 1, maximum 200", + "maxSimulationDist": 8 + }, + "adjustSimulationDistance": { + "desc:": "Enables automatic simulation distance adjustment. Default: true", + "adjustSimulationDistance": true + }, + "logMessages": { + "desc:": "Whether to output log messages for actions done. This can be helpful to balance the other settings nicely. Default = false", + "logMessages": false + } +} diff --git a/config/toms_storage-common.toml b/config/toms_storage-common.toml deleted file mode 100644 index 4c955de..0000000 --- a/config/toms_storage-common.toml +++ /dev/null @@ -1,11 +0,0 @@ -#IMPORTANT NOTICE: -#THIS IS ONLY THE COMMON CONFIG. It does not contain all the values adjustable for Tom's Simple Storage -#The settings have been moved to toms_storage-server.toml -#That file is PER WORLD, meaning you have to go into 'saves//serverconfig' to adjust it. Those changes will then only apply for THAT WORLD. -#You can then take that config file and put it in the 'defaultconfigs' folder to make it apply automatically to all NEW worlds you generate FROM THERE ON. -#This may appear confusing to many of you, but it is a new sensible way to handle configuration, because the server configuration is synced when playing multiplayer. -importantInfo = true -#List of mod ids whose blocks is ignored by the inventory connector -blockedMods = [] -#List of block ids ignored by the inventory connector -blockedBlocks = [] diff --git a/config/toms_storage-server.toml b/config/toms_storage-server.toml new file mode 100644 index 0000000..77f0138 --- /dev/null +++ b/config/toms_storage-server.toml @@ -0,0 +1,59 @@ +#Inventory Connector Range +# Default: 16 +# Range: 4 ~ 256 +inventoryConnectorRange = 16 +#Only Allow Trims to Connect Inventories +onlyTrimsConnect = false +#Inventory Cable Connector Maximum number of cables +# Default: 2048 +# Range: > 16 +invCableConnectorMaxScanSize = 2048 +#Wireless terminal reach +# Default: 16 +# Range: 4 ~ 64 +wirelessReach = 16 +#Wireless terminal reach +# Default: 64 +# Range: 16 ~ 512 +advWirelessRange = 32 +#Adv Wireless terminal requied beacon level for infinite range +#Value of 0 only requires a single beacon block nearby +#Value of -1 disables this feature entirely +# Default: 1 +# Range: -1 ~ 4 +wirelessTermBeaconLvl = -1 +#Adv Wireless terminal requied beacon level for cross dimensional access +#Value of 0 only requires a single beacon block nearby +#Value of -1 disables this feature entirely +# Default: 4 +# Range: -1 ~ 4 +wirelessTermBeaconLvlDim = -1 +#Inventory Cable Connector requied beacon level for inventory linking +#Value of 0 only requires a single beacon block +#Value of -1 disables this feature entirely +# Default: 0 +# Range: -1 ~ 4 +invLinkBeaconLvl = 0 +#Inventory Linking range with beacons +#Value of 0 disables this feature entirely +# Default: 4096 +# Range: > 0 +invLinkBeaconRange = 4096 +#Inventory Cable Connector requied beacon level for same dimension access with unlimited range +#Value of 0 only requires a single beacon block +#Value of -1 disables this feature entirely +# Default: 1 +# Range: -1 ~ 4 +invLinkBeaconLvlSameDim = -1 +#Inventory Cable Connector requied beacon level for cross dimensional access +#Value of 0 only requires a single beacon block +#Value of -1 disables this feature entirely +# Default: 2 +# Range: -1 ~ 4 +invLinkBeaconLvlCrossDim = -1 +#Use multithreading to improve performance +runMultithreaded = true +#Base tick cooldown for Basic Inventory Hopper item transfer +# Default: 10 +# Range: 1 ~ 200 +basicHopperCooldown = 10 diff --git a/index.toml b/index.toml index 35e447f..0eacf8e 100644 --- a/index.toml +++ b/index.toml @@ -68,6 +68,10 @@ hash = "41f5a7ac2f60ed98c384cdb33a5586a2106144001ee5d32edb8f0e97f98762bd" file = "config/defaultoptions/keybindings.txt" hash = "f78b301f223be57085448a7ea605540bf4ebeaae36b15732addd9d3f2af8cdc2" +[[files]] +file = "config/dynamicview.json" +hash = "83f8e1beb5ee9a80b873df9e1a0427a28a605561499cbd637da1e92f3539959b" + [[files]] file = "config/enhancedai/Mobs/Custom targeting/custom_hostile.json" hash = "17f29fe7e8b3220a73bf87b05a08602f56cd836cad3fae42de1e53971fa336e8" @@ -153,8 +157,8 @@ file = "config/supplementaries-client.toml" hash = "80e5996a4fd4b93a98b66e0ea4892767932cae2cc1789650b6016e976cedc001" [[files]] -file = "config/toms_storage-common.toml" -hash = "b54cd94393754928944a5705e3c3c783144efa6541231895482eb3e031834605" +file = "config/toms_storage-server.toml" +hash = "7e3680bc94d28b4a16c6155f0affd1f09db21cdf7d77f64d7e0e914092c799e9" [[files]] file = "config/treechop-common.toml" @@ -260,14 +264,6 @@ hash = "79c26cf20110a8e22f5860814577145846fb5578a5ad80c795e15210403c9738" file = "kubejs/assets/toms_storage/textures/block/trim.png" hash = "093e2ca74695222dfe16afc6efef3fcca0af8b875f4ba2f1f7e9c908eba394b5" -[[files]] -file = "kubejs/assets/toms_storage/textures/gui/crafting_terminal.png" -hash = "4b0461c6bea1301e83a63a270e3d0e7880363b6797da7c948cd9ad46ab4351a1" - -[[files]] -file = "kubejs/assets/toms_storage/textures/gui/storage_terminal.png" -hash = "a4a05102ee564955d71566a7d8c085880be35a497661a2d4645fcf6e5e3c13e9" - [[files]] file = "kubejs/assets/toms_storage/textures/item/adv_wireless_terminal.png" hash = "060161bd209cb7ff6c1649f5d9dbb0de84531e854f65cdc3047d4ad6fef75ec1" @@ -294,7 +290,7 @@ hash = "7010330160f4af3b97c2cd99ef529b724dffa11a320e99cc202fff51aae7227c" [[files]] file = "kubejs/server_scripts/simple_storage.js" -hash = "0c098f71ad46ae7353c74ca62e7d37e581c0a3930bd9154a8635635ca602b95e" +hash = "9c77aa097a10746dfba03f3d33d80b1f5e736ea73fe47de99a87ca7920915455" [[files]] file = "kubejs/server_scripts/waystones.js" @@ -1029,6 +1025,11 @@ file = "mods/dynamic-fps.pw.toml" hash = "ae6fd52d8bdcbeca5bbe6db840f22f92c1928fe0fda22017b19612b9b00a245a" metafile = true +[[files]] +file = "mods/dynamic-view.pw.toml" +hash = "628baba407713012052036ee76b3a311b89cbacad953cb2b29d0683d909cac02" +metafile = true + [[files]] file = "mods/easy-anvils.pw.toml" hash = "9f511e824978b45d8d90244e921dafcbb9bc01d1e4aced66afac71740ffa5ff6" @@ -1323,11 +1324,6 @@ file = "mods/inventory-particles.pw.toml" hash = "dd0e33b72227eced263649c930c4a11162365591c02b5e7008ae111c0ea16070" metafile = true -[[files]] -file = "mods/inventory-tabs.pw.toml" -hash = "77e564f0ba938056be27bf43b0422c0fcb767aa206e8cd0ee351aada0f664591" -metafile = true - [[files]] file = "mods/iris.pw.toml" hash = "f67aa60c765593a8c70f78296a460349c6aef5f4a16d173eae02e8803b545ad4" diff --git a/kubejs/assets/toms_storage/textures/gui/crafting_terminal.png b/kubejs/assets/toms_storage/textures/gui/crafting_terminal.png deleted file mode 100644 index 563fa09..0000000 Binary files a/kubejs/assets/toms_storage/textures/gui/crafting_terminal.png and /dev/null differ diff --git a/kubejs/assets/toms_storage/textures/gui/storage_terminal.png b/kubejs/assets/toms_storage/textures/gui/storage_terminal.png deleted file mode 100644 index 4f25585..0000000 Binary files a/kubejs/assets/toms_storage/textures/gui/storage_terminal.png and /dev/null differ diff --git a/kubejs/server_scripts/simple_storage.js b/kubejs/server_scripts/simple_storage.js index 756e301..75f259a 100644 --- a/kubejs/server_scripts/simple_storage.js +++ b/kubejs/server_scripts/simple_storage.js @@ -1,3 +1,183 @@ ServerEvents.recipes((event) => { - event.remove({ mod: 'toms_storage'}) + // filers + event.remove({ output: "toms_storage:item_filter"}) + event.shaped( + Item.of('toms_storage:item_filter', 1), + [ + ' A ', + 'AFA', + ' A ' + ], + { + F: 'create:filter', + A: 'minecraft:andesite' + } + ) + event.remove({ output: "toms_storage:polymorphic_item_filter"}) + event.shaped( + Item.of('toms_storage:polymorphic_item_filter', 1), + [ + 'B', + 'I', + ], + { + I: 'toms_storage:item_filter', + B: '#c:plates/brass' + } + ) + event.remove({ output: 'toms_storage:tag_item_filter'}) + event.shaped( + Item.of('toms_storage:tag_item_filter', 1), + [ + 'B ', + 'IP', + ], + { + I: 'toms_storage:item_filter', + B: '#c:plates/brass', + P: 'minecraft:paper' + } + ) + // trims + event.remove({ not: {input: "minecraft:water_bucket"} ,output: 'toms_storage:trim'}) + event.shaped( + Item.of('toms_storage:trim', 1), + [ + 'ASA', + 'SCS', + 'ASA' + ], + { + A: 'create:andesite_alloy', + S: 'minecraft:stick', + C: '#c:chests' + }) + // Terminals + event.remove({ output: 'toms_storage:wireless_terminal'}) + event.remove({ output: 'toms_storage:adv_wireless_terminal'}) + event.remove({ output: 'toms_storage:storage_terminal'}) + event.shaped( + Item.of('toms_storage:storage_terminal', 1), + [ + " X ", + "CIG", + " X " + ], + { + X: 'create:electron_tube', + I: 'create:brass_casing', + C: 'create:redstone_link', + G: 'minecraft:glass' + } + ) + event.remove({ output: 'toms_storage:crafting_terminal'}) + event.shaped( + Item.of('toms_storage:crafting_terminal', 1), + [ + " X ", + "AHI", + " G " + ], + { + X: 'create:electron_tube', + I: 'toms_storage:storage_terminal', + H: 'create:brass_casing', + G: 'create:linked_controller', + A: 'minecraft:crafting_table' + } + ) + // Inventory cables & connectors + event.remove({ output: 'toms_storage:inventory_cable'}) + event.shapeless( + Item.of('toms_storage:inventory_cable', 4), + [ + "minecraft:dried_kelp", + "create:brass_sheet", + "minecraft:ender_pearl" + ] + ) + event.remove({ not: {input: "minecraft:water_bucket"} ,output: 'toms_storage:basic_inventory_hopper'}) + event.remove({ output: 'toms_storage:basic_inventory_hopper'}) + event.shapeless( + Item.of('toms_storage:basic_inventory_hopper', 1), + [ + "toms_storage:inventory_cable", + "create:brass_sheet", + "create:chute" + ] + ) + event.remove({ not: {input: "minecraft:water_bucket"} ,output: 'toms_storage:inventory_proxy'}) + event.shaped( + Item.of('toms_storage:inventory_proxy', 1), + [ + " S ", + "OHO", + " I " + ], + { + "H":"create:brass_casing", + "O":"create:brass_hand", + "I":"create:redstone_link", + "S":"create:electron_tube" + } + ) + event.remove({ output: 'toms_storage:inventory_connector'}) + event.shaped( + Item.of('toms_storage:inventory_connector', 1), + [ + " X ", + "CIC", + " O " + ], + { + "C":"#c:chests", + "O":"create:brass_hand", + "I":"create:brass_casing", + "X":"create:electron_tube" + } + ) + event.remove({ output: 'toms_storage:inventory_cable_connector'}) + event.shaped( + Item.of('toms_storage:inventory_cable_connector', 1), + [ + "ISH" + ], + { + "I":"toms_storage:inventory_cable", + "S":"create:brass_sheet", + "H":"create:brass_hand" + } + ) + //Others + event.remove({ output: 'toms_storage:open_crate'}) + event.shaped( + Item.of('toms_storage:open_crate', 1), + [ + "PSP", + "ACA", + "PSP" + ], + { + "C":"#c:chests", + "S":"minecraft:stick", + "A":"create:andesite_alloy", + "P":"#c:planks" + } + ) + event.remove({ output: 'toms_storage:level_emitter'}) + event.shaped( + Item.of('toms_storage:level_emitter', 1), + [ + " L ", + "CIC" + ], + { + "I":"toms_storage:inventory_cable", + "C":"create:brass_sheet", + "L":"create:analog_lever", + } + ) + + + }) \ No newline at end of file diff --git a/mods/dynamic-view.pw.toml b/mods/dynamic-view.pw.toml new file mode 100644 index 0000000..53eb1e1 --- /dev/null +++ b/mods/dynamic-view.pw.toml @@ -0,0 +1,13 @@ +name = "Dynamic View and Simulation Distances" +filename = "dynview-1.21-4.0.jar" +side = "server" + +[download] +hash-format = "sha1" +hash = "8fa1d09a85cab699b4473dba000f383f957529df" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 5570957 +project-id = 366140 diff --git a/mods/inventory-tabs.pw.toml b/mods/inventory-tabs.pw.toml deleted file mode 100644 index fd4f0a1..0000000 --- a/mods/inventory-tabs.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Inventory Tabs" -filename = "inventory-tabs-1.4.4+1.21.jar" -side = "client" - -[download] -url = "https://cdn.modrinth.com/data/VD1aynYU/versions/kH13neOQ/inventory-tabs-1.4.4%2B1.21.jar" -hash-format = "sha512" -hash = "c858bac0f7fbd16670ed23c0c1dfd55aaa741d8508c61037d1960832976aba6dcaf7ccbaca487417760b319d0517bc14c5891646a366843e0c1bf35be5b399ce" - -[update] -[update.modrinth] -mod-id = "VD1aynYU" -version = "kH13neOQ" diff --git a/pack.toml b/pack.toml index 77f5e29..9266cd4 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "a730bcc8a26f92895632458bc1a0e21eed729ea63d2f8ea28db5ddd899fd2e13" +hash = "0dc33c4171bd5932dd9a6312977f8766b1ba6299ffc2321033eb58fe0e20b60d" [versions] minecraft = "1.21.1"