From 020bd560170bd0ecc99e27e0094ec1495d1d75a0 Mon Sep 17 00:00:00 2001 From: Thomas Hinkle Date: Sat, 6 May 2023 17:52:03 -0500 Subject: [PATCH] improved our economy and made it so people can (hopefully) open doors. --- CHANGELOG.md | 8 +- config/starterkit/starterkit.txt | 4 +- index.toml | 23 +++- kubejs/client_scripts/hide.js | 20 ++++ kubejs/server_scripts/currency.js | 171 ++-------------------------- mods/plenty-plates.pw.toml | 13 +++ mods/reblured.pw.toml | 1 + mods/the-accurate-backrooms.pw.toml | 9 ++ mods/wallets.pw.toml | 13 +++ pack.toml | 2 +- 10 files changed, 92 insertions(+), 172 deletions(-) create mode 100644 mods/plenty-plates.pw.toml create mode 100644 mods/the-accurate-backrooms.pw.toml create mode 100644 mods/wallets.pw.toml diff --git a/CHANGELOG.md b/CHANGELOG.md index 13df918..cc05f88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,9 @@ This will be the initial release for the production server. I will avoid adding ## Config Changes -- Modified the starter kit to include the new shop block instead of the old one. +- Modified the starter kit. + - Added the new store block to replace the old one. + - Added the new wallet and removed the old satchel and currency. - Added our updated config for FTBChunks. - Made Create ores (besides zinc) slightly less common. @@ -33,6 +35,8 @@ This will be the initial release for the production server. I will avoid adding - Lets you see light levels by pressing F7. Red = Monsters will spawn anytime, Yellow = Monsters will spawn at night. - Mindful Darkness - Adds a dark mode for Minecraft GUIs. Optional. +- Plenty Plates + - Adds several specialized pressure plates. For example, the obsidian pressure plate only works with players. - ReBlured - Blurs backgrounds when GUIs are open. Optional. - Seamless @@ -41,6 +45,8 @@ This will be the initial release for the production server. I will avoid adding - Adds hats. - Tom's Trading Network - A better trading mod for a server economy. +- Wallets + - Adds a better currency system with denominations and a wallet. - Wavey Capes ### Updates diff --git a/config/starterkit/starterkit.txt b/config/starterkit/starterkit.txt index 1134d48..f27874d 100644 --- a/config/starterkit/starterkit.txt +++ b/config/starterkit/starterkit.txt @@ -9,7 +9,7 @@ 3 : '{Count:1b,id:"minecraft:white_bed"}', 4 : '{Count:1b,id:"solsweetpotato:food_book"}', 5 : '{Count:2b,id:"toms_trading_network:vending_machine"}', -6 : '{Count:1b,id:"thermal:satchel",tag:{ItemInv:{ItemInv:[{Count:20b,Slot:0b,id:"thermal:bronze_coin"}]},RepairCost:0,display:{Name:'{"text":"Wallet"}'}}}', +6 : '{Count:1b,id:"wallets:wallet",tag:{coin_value:100}}', 7 : '{Count:1b,ForgeCaps:{Parent:{Items:[{Count:4b,Slot:0,id:"minecraft:cooked_mutton"},{Count:6b,Slot:1,id:"minecraft:bread"},{Count:8b,Slot:2,id:"minecraft:apple"},{Count:2b,Slot:3,id:"minecraft:cookie"}],Size:5}},id:"solsweetpotato:lunchbag"}', 8 : '{Count:16b,id:"minecraft:torch"}', 9 : '{Count:64b,id:"cgm:basic_bullet"}', @@ -38,4 +38,4 @@ 32 : '', 33 : '', 34 : '', -35 : '', +35 : '', \ No newline at end of file diff --git a/index.toml b/index.toml index ff92dde..cd964c4 100644 --- a/index.toml +++ b/index.toml @@ -66,7 +66,7 @@ hash = "f4f94b6b9dcbbf19a828c842217306169bcff7f9570b81af612b5404bc4bda87" [[files]] file = "config/starterkit/starterkit.txt" -hash = "c3d57b88f8d5217f33736ffc10736137b90bee6f9597835097deef4cbd8355e1" +hash = "95f16b64340c8980823a39b711bbb4a810f26c68f8f58f5c005da796dcacf236" [[files]] file = "config/toastcontrol-common.toml" @@ -94,7 +94,7 @@ hash = "00fd68c7cebeb9d6f09da20fed39c0bdd8e608ed6afaee9f6ef048208f50e86e" [[files]] file = "kubejs/client_scripts/hide.js" -hash = "46555dc2fd7e829686eaf0b24b33a09675bc6d0f1d994a19ab9004d8d6cf0b99" +hash = "2255b7d532be636cb1cc8a6cbbc69cb1afb496623af5fa526b8d5c1fc4a64a07" [[files]] file = "kubejs/server_scripts/balance.js" @@ -106,7 +106,7 @@ hash = "6b956902beb69b0abe652b87a12fc49cd260b10ea2568a9fed6378cdf8bd5d87" [[files]] file = "kubejs/server_scripts/currency.js" -hash = "fdb06bfee31a9cae4bebc3475a0d84344103d1e68f641e8aa81b51f3a878c480" +hash = "a7cb07fa43e9f01ff5472ba08f13483e346b88560d4a2304ffb6f1e64621b367" [[files]] file = "mods/additional-enchanted-miner.pw.toml" @@ -883,6 +883,11 @@ file = "mods/placebo.pw.toml" hash = "cb0af91d7b5f99b46022e3af2ef7e128028f6a2f91feb0a8f4fa22e9556f30b3" metafile = true +[[files]] +file = "mods/plenty-plates.pw.toml" +hash = "d911db93a78ffedcf830ec1d56601f7bba69ef56af027f65ca22f98f7be43891" +metafile = true + [[files]] file = "mods/pluto.pw.toml" hash = "4ccba84a626f957a1e5bbdcc93be31b6b9fc688061f6ba5aacfb43bc4465a562" @@ -920,7 +925,7 @@ metafile = true [[files]] file = "mods/reblured.pw.toml" -hash = "22df3e457b5b70c9ad2e43e745b8106daece24e3be2788e64ff2478dc8876272" +hash = "6e88ae08c4560b5ee52c0112a191d8f173fdcec993f83360c98a47d45b533967" metafile = true [[files]] @@ -1143,6 +1148,11 @@ file = "mods/terrablender.pw.toml" hash = "64036b0bc617a33d904a0e6371ddc7d63896a888b1e0ada1a6eae8f647bb9327" metafile = true +[[files]] +file = "mods/the-accurate-backrooms.pw.toml" +hash = "31c83b9396527bc5cd11a0757d35db98ad32d1fc6912160b0f27183743c3fea7" +metafile = true + [[files]] file = "mods/thermal-cultivation.pw.toml" hash = "f66d3443df1b1d2619234a4e81851ff80c1821eb911307fcbaf52bbdbcfeafe3" @@ -1228,6 +1238,11 @@ file = "mods/visual-workbench.pw.toml" hash = "de92543e67785a10dba40d50fc9deebb1990d19965e0b73b9cd63be55260e62d" metafile = true +[[files]] +file = "mods/wallets.pw.toml" +hash = "0a820dd449f1959628b4e59d6ba087ee21d861cb5450e6296ac9c4e927f3c8df" +metafile = true + [[files]] file = "mods/wavey-capes.pw.toml" hash = "6b8677362d29aa238f5b74aca85267251d776f2fb764cf792109cdbea7a5aecc" diff --git a/kubejs/client_scripts/hide.js b/kubejs/client_scripts/hide.js index f8f71d0..56c20b2 100644 --- a/kubejs/client_scripts/hide.js +++ b/kubejs/client_scripts/hide.js @@ -25,4 +25,24 @@ JEIEvents.hideItems((event) => { event.hide("moguns:hellfire"); event.hide("moguns:taki"); event.hide("moguns:trashcan"); + + event.hide("thermal:press_coin_die"); + event.hide("thermal:dynamo_numismatic"); + event.hide("thermal:tin_coin"); + event.hide("thermal:copper_coin"); + event.hide("thermal:bronze_coin"); + event.hide("thermal:iron_coin"); + event.hide("thermal:gold_coin"); + event.hide("thermal:invar_coin"); + event.hide("thermal:enderium_coin"); + event.hide("thermal:signalum_coin"); + event.hide("thermal:lumium_coin"); + event.hide("thermal:netherite_coin"); + event.hide("thermal:steel_coin"); + event.hide("thermal:rose_gold_coin"); + event.hide("thermal:lead_coin"); + event.hide("thermal:silver_coin"); + event.hide("thermal:nickel_coin"); + event.hide("thermal:electrum_coin"); + event.hide("thermal:constantan_coin"); }); diff --git a/kubejs/server_scripts/currency.js b/kubejs/server_scripts/currency.js index 285bf5a..3b518c4 100644 --- a/kubejs/server_scripts/currency.js +++ b/kubejs/server_scripts/currency.js @@ -15,6 +15,13 @@ ServerEvents.recipes((event) => { event.remove({ id: "thermal:signalum_coin" }); event.remove({ id: "thermal:lumium_coin" }); event.remove({ id: "thermal:netherite_coin" }); + event.remove({ id: "thermal:steel_coin" }); + event.remove({ id: "thermal:rose_gold_coin" }); + event.remove({ id: "thermal:lead_coin" }); + event.remove({ id: "thermal:silver_coin" }); + event.remove({ id: "thermal:nickel_coin" }); + event.remove({ id: "thermal:electrum_coin" }); + event.remove({ id: "thermal:constantan_coin" }); // Remove Recipes from Create Deco coins to avoid confusion event.remove({ output: "createdeco:brass_coin" }); @@ -31,168 +38,4 @@ ServerEvents.recipes((event) => { event.remove({ output: "createdeco:netherite_coinstack" }); event.remove({ output: "createdeco:zinc_coin" }); event.remove({ output: "createdeco:zinc_coinstack" }); - - // Recipes for combining coins - event.recipes.create.mixing("thermal:copper_coin", [ - "thermal:tin_coin", - "thermal:tin_coin", - "thermal:tin_coin", - "thermal:tin_coin", - "thermal:tin_coin", - "thermal:tin_coin", - "thermal:tin_coin", - "thermal:tin_coin", - "thermal:tin_coin", - "thermal:tin_coin", - ]); - - event.recipes.create.mixing("thermal:bronze_coin", [ - "thermal:copper_coin", - "thermal:copper_coin", - "thermal:copper_coin", - "thermal:copper_coin", - "thermal:copper_coin", - "thermal:copper_coin", - "thermal:copper_coin", - "thermal:copper_coin", - "thermal:copper_coin", - "thermal:copper_coin", - ]); - - event.recipes.create.mixing("thermal:iron_coin", [ - "thermal:bronze_coin", - "thermal:bronze_coin", - "thermal:bronze_coin", - "thermal:bronze_coin", - "thermal:bronze_coin", - "thermal:bronze_coin", - "thermal:bronze_coin", - "thermal:bronze_coin", - "thermal:bronze_coin", - "thermal:bronze_coin", - ]); - - event.recipes.create.mixing("thermal:gold_coin", [ - "thermal:iron_coin", - "thermal:iron_coin", - "thermal:iron_coin", - "thermal:iron_coin", - "thermal:iron_coin", - "thermal:iron_coin", - "thermal:iron_coin", - "thermal:iron_coin", - "thermal:iron_coin", - "thermal:iron_coin", - ]); - - event.recipes.create.mixing("thermal:invar_coin", [ - "thermal:gold_coin", - "thermal:gold_coin", - "thermal:gold_coin", - "thermal:gold_coin", - "thermal:gold_coin", - "thermal:gold_coin", - "thermal:gold_coin", - "thermal:gold_coin", - "thermal:gold_coin", - "thermal:gold_coin", - ]); - - event.recipes.create.mixing("thermal:enderium_coin", [ - "thermal:invar_coin", - "thermal:invar_coin", - "thermal:invar_coin", - "thermal:invar_coin", - "thermal:invar_coin", - "thermal:invar_coin", - "thermal:invar_coin", - "thermal:invar_coin", - "thermal:invar_coin", - "thermal:invar_coin", - ]); - - event.recipes.create.mixing("thermal:signalum_coin", [ - "thermal:enderium_coin", - "thermal:enderium_coin", - "thermal:enderium_coin", - "thermal:enderium_coin", - "thermal:enderium_coin", - "thermal:enderium_coin", - "thermal:enderium_coin", - "thermal:enderium_coin", - "thermal:enderium_coin", - "thermal:enderium_coin", - ]); - - event.recipes.create.mixing("thermal:lumium_coin", [ - "thermal:signalum_coin", - "thermal:signalum_coin", - "thermal:signalum_coin", - "thermal:signalum_coin", - "thermal:signalum_coin", - "thermal:signalum_coin", - "thermal:signalum_coin", - "thermal:signalum_coin", - "thermal:signalum_coin", - "thermal:signalum_coin", - ]); - - event.recipes.create.mixing("thermal:netherite_coin", [ - "thermal:lumium_coin", - "thermal:lumium_coin", - "thermal:lumium_coin", - "thermal:lumium_coin", - "thermal:lumium_coin", - "thermal:lumium_coin", - "thermal:lumium_coin", - "thermal:lumium_coin", - "thermal:lumium_coin", - "thermal:lumium_coin", - ]); - - // Recipes for breaking down coins - event.recipes.create.crushing( - ["10x thermal:tin_coin"], - "thermal:copper_coin" - ); - - event.recipes.create.crushing( - ["10x thermal:copper_coin"], - "thermal:bronze_coin" - ); - - event.recipes.create.crushing( - ["10x thermal:bronze_coin"], - "thermal:iron_coin" - ); - - event.recipes.create.crushing( - ["10x thermal:iron_coin"], - "thermal:gold_coin" - ); - - event.recipes.create.crushing( - ["10x thermal:gold_coin"], - "thermal:invar_coin" - ); - - event.recipes.create.crushing( - ["10x thermal:invar_coin"], - "thermal:enderium_coin" - ); - - event.recipes.create.crushing( - ["10x thermal:enderium_coin"], - "thermal:signalum_coin" - ); - - event.recipes.create.crushing( - ["10x thermal:signalum_coin"], - "thermal:lumium_coin" - ); - - event.recipes.create.crushing( - ["10x thermal:lumium_coin"], - "thermal:netherite_coin" - ); }); diff --git a/mods/plenty-plates.pw.toml b/mods/plenty-plates.pw.toml new file mode 100644 index 0000000..7db777e --- /dev/null +++ b/mods/plenty-plates.pw.toml @@ -0,0 +1,13 @@ +name = "Plenty Plates" +filename = "PlentyPlates-v4.0.0-1.19.2-Forge.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/VmcdxJxh/versions/YDH4B7Nk/PlentyPlates-v4.0.0-1.19.2-Forge.jar" +hash-format = "sha1" +hash = "d4b4a0858eabaa36d46e25e144e9179b3727638c" + +[update] +[update.modrinth] +mod-id = "VmcdxJxh" +version = "YDH4B7Nk" diff --git a/mods/reblured.pw.toml b/mods/reblured.pw.toml index 000b302..6081dbb 100644 --- a/mods/reblured.pw.toml +++ b/mods/reblured.pw.toml @@ -9,6 +9,7 @@ hash = "5ed4f8be4419f891b8d57347a64dd3a7e3b3505e" [option] optional = true +description = "Blurs the background when you have an inventory open." [update] [update.modrinth] diff --git a/mods/the-accurate-backrooms.pw.toml b/mods/the-accurate-backrooms.pw.toml new file mode 100644 index 0000000..e810b14 --- /dev/null +++ b/mods/the-accurate-backrooms.pw.toml @@ -0,0 +1,9 @@ +name = "The Accurate Backrooms" +filename = "v2.0.1accuratebackrooms_forge43.2.8-mc1.19.2.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "2767b3ebe94bb7e26b5bb02b27f88f94a485ce89" +url = "https://github.com/razage/mctheactualbackrooms/raw/master/v2.0.1accuratebackrooms_forge43.2.8-mc1.19.2.jar" + diff --git a/mods/wallets.pw.toml b/mods/wallets.pw.toml new file mode 100644 index 0000000..660ad3a --- /dev/null +++ b/mods/wallets.pw.toml @@ -0,0 +1,13 @@ +name = "Wallets" +filename = "Wallets-1.19.2-1.0.0.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/DVGptEs0/versions/NutUETS4/Wallets-1.19.2-1.0.0.jar" +hash-format = "sha1" +hash = "0920923d4ce3beca25490c4a1dd8bde376662267" + +[update] +[update.modrinth] +mod-id = "DVGptEs0" +version = "NutUETS4" diff --git a/pack.toml b/pack.toml index e91d5db..9c79484 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 = "7f9963c34b29b1680858c8dbf44f9beac1e9633f10f86c95ebeb74b0c7833dd0" +hash = "0c651902b4da35a9ffb16db8e7b5b3bee73ee220572c99c862c19a0457bc0301" [versions] forge = "43.2.8"