Merge remote-tracking branch 'origin/main' into server

This reverts commit 83150eb6daa1e3cbfadc6353a6b2e8bb3eb13e0d, reversing
changes made to ed642273af0bd2128728929e350d224ba7d02b29.

.gitignore

@@ -13,3 +13,7 @@
 
 !*/
 /config/quickskin-client.toml
+/config/simple-discord-link/simple-discord-compat.toml
+/config/simple-discord-link/simple-discord-link.toml
+/config/simple-discord-link/simple-discord-compat.old
+/config/simple-discord-link/simple-discord-link.old

config/creategoggles-client.toml

@@ -4,5 +4,5 @@
 	#Display the goggles before the eyes and not on the forehead
 	moveGoggleToEyes = false
 	#Enables the goggles in creative mode without goggles
-	enableCreativeModeGoggles = true
+	enableCreativeModeGoggles = false
 

config/creategoggles-common.toml

@@ -2,9 +2,9 @@
 #General configuration settings
 [general]
 	#Uses custom curio slot for goggles instead of the head slot
-	customCurioGoggleSlot = false
+	customCurioGoggleSlot = true
 	#Uses custom curio slot for backtank instead of the back slot
-	customCurioBacktankSlot = false
+	customCurioBacktankSlot = true
 	#Enables experimental features (Smithing the goggles onto normal helmets)
 	enableExperimentalFeatures = true
 

config/jade/server-plugin-overrides.json

@@ -0,0 +1 @@
+{}

config/lightmanscurrency-common.txt

@@ -39,11 +39,11 @@ debugLevel=0
 		#Whether the Coin Mint machine can be crafted.
 		#Disabling will not remove and exist Coin Mints from the world, nor prevent their use.
 		#Default: true
-		canCraftCoinMint=true
+		canCraftCoinMint=false
 		
 		#Whether or not built-in coin mint recipes that turn resources into coins will be loaded.
 		#Default: true
-		canMint=true
+		canMint=false
 		
 		#Whether or not built-in coin mint recipes that turn coins back into resources will be loaded.
 		#Default: false
@@ -144,26 +144,26 @@ debugLevel=0
 	
 	#Whether custom events can replace a portion (or all) of the default loot with custom event loot.
 	#Default: true
-	lootReplacements=true
+	lootReplacements=false
 	
 #Villager Related Settings
 #Note: Any changes to villagers requires a full reboot to be applied due to how Minecraft/Forge registers trades.
 [villagers]
 	#Whether Piglins will accept gold coins as a valid bartering item
 	#Default: true
-	piglinsBarterCoins=true
+	piglinsBarterCoins=false
 	
 	#Whether the wandering trader will have additional trades that allow you to buy misc items with money.
 	#Default: true
-	addCustomWanderingTrades=true
+	addCustomWanderingTrades=false
 	
 	#Whether the banker villager profession will have any registered trades. The banker sells Lightman's Currency items for coins.
 	#Default: true
-	addBanker=true
+	addBanker=false
 	
 	#Whether the cashier villager profession will have any registered trades.. The cashier sells an amalgamation of vanilla traders products for coins.
 	#Default: true
-	addCashier=true
+	addCashier=false
 	
 	#Villager Trade Modification
 	#Note: Changes made only apply to newly generated trades. Villagers with trades already defined will not be changed.
@@ -307,7 +307,7 @@ debugLevel=0
 	[loot.chests]
 		#Whether coins can spawn in chests.
 		#Default: true
-		enabled=true
+		enabled=false
 		
 		#Chest Spawn Lists
 		[loot.chests.lists]

config/quark-common.toml

@@ -334,9 +334,6 @@
 	[management.quick_armor_swapping]
 		"Swap Off Hand" = true
 
-	[management.hotbar_changer]
-		"Animation Time" = 7.0
-
 [tools]
 	Abacus = true
 	"Ambient Discs" = true

config/simple-discord-link/embeds/default.json

@@ -0,0 +1,16 @@
+{
+  "color": "#000000",
+  "title": null,
+  "url": null,
+  "author": {
+    "name": "%author%",
+    "icon_url": "%avatar%",
+    "url": null
+  },
+  "description": "%message_contents%",
+  "thumbnail": null,
+  "fields": null,
+  "image": null,
+  "timestamp": 0,
+  "footer": null
+}

config/simple-discord-link/language/en_us.json

@@ -0,0 +1,91 @@
+{
+  "account.unlinked": "Unlinked",
+  "account.notfound": "We couldn't find your Minecraft account. Please ask the staff for assistance",
+  "account.verify_success": "Your account has been verified",
+  "account.unverify_success": "Your account has been un-verified",
+  "account.load_failed": "Failed to load your account",
+  "account.not_in_database": "Account not found in server database",
+
+  "error.no_discord_server": "Sorry, I cannot find a discord server attached to this bot. Please report this to the server operator",
+  "error.empty_cache": "The discord member cache of this server is empty. Please ask the server owner to run the reloadcache discord command",
+  "error.no_roles": "Server has required roles configured, but no discord roles were loaded. Please notify the server owner",
+  "error.command_failed": "Failed to execute command. Please see your server log",
+  "error.no_message_perms": "I do not have permission to send messages in %s",
+  "error.no_db_accounts": "Sorry, but this server does not contain any stored players in its database",
+  "error.not_a_member": "%s is not a member of this discord server",
+  "error.not_a_member_of": "Sorry, you do not seem to be a member of %s. Please try again",
+  "error.no_match_found": "No account found that matches %s",
+  "error.code_length": "Sorry, I can only handle 4 digit verification code messages. Please try again",
+  "error.mc_command_failed": "Failed to execute command: %s",
+  "error.verify.only_by_players": "This command can only be used by players",
+  "error.verify.not_enabled": "Verification is not enabled for this server",
+  "error.hiding.no_account_provided": "You need to supply a player to hide",
+  "error.hiding.unhide_no_account_provided": "You need to supply a player to unhide",
+  "error.unknown": "Unknown",
+
+  "feedback.bot_reloaded": "Bot has been reloaded",
+
+  "command.help.help": "Bot commands and Help",
+  "command.help.title": "Bot Commands",
+
+  "command.playerlist.help": "List currently online players on the server",
+  "command.playerlist.title": "Online Players",
+  "command.playerlist.no_online": "There are currently no players online",
+  "command.playerlist.title_page": "Online Players - Page %s/%s",
+  "command.playerlist.footer": "%s/%s players online",
+
+  "command.hiddenplayers.help": "List all hidden players on your server",
+  "command.hiddenplayers.title": "Hidden Players",
+  "command.hiddenplayers.no_players": "There are currently no hidden players",
+  "command.hiddenplayers.title_page": "Hidden Players - Page %s/%s",
+
+  "command.hideplayer.help": "Make a discord user invisible",
+  "command.hideplayer.access_control": "The minecraft option cannot be used when both access control and optionalVerification is disabled",
+  "command.hideplayer.account_not_found": "Cannot find linked minecraft account for user %s",
+
+  "command.unhideplayer.help": "Make a discord user visible",
+
+  "command.reloadcache.help": "Force reload the bot cache",
+  "command.reloadcache.reloaded": "Cache has been reloaded",
+  "command.reloadcache.not_reloaded": "Failed to reload cache. Please check your server log",
+
+  "command.setchannel.help": "Configure a channel for the mod to use",
+  "command.setchannel.saved": "Saved Channel to Config. Restart your server for the channel to become active",
+  "command.setchannel.webhook_saved": "Saved Webhook to Config. Restart your server for the webhook to become active",
+  "command.setchannel.failed": "Failed to save config: %s",
+
+  "command.staffunverify.help": "Unverify another player's Minecraft account",
+  "command.staffverify.help": "Allow staff members verify minecraft players, without verification",
+
+  "command.unverify.help": "Unverify your previously verified Minecraft account",
+  "command.unverify.failed": "Sorry, we could not un-verify your Minecraft account. Please try again",
+
+  "command.verify.help": "Verify your Minecraft account to access the server",
+  "command.verify.missing_code": "You need to provide a verification code",
+  "command.verify.already_verified": "Sorry, you already have a verified account and this server does not allow multiple accounts",
+  "command.verify.failed": "Sorry, we could not verify your Minecraft account. Please try again",
+
+  "command.verifiedaccounts.help": "View a list of verified Minecraft Accounts",
+  "command.verifiedaccounts.title": "Verified Accounts",
+  "command.verifiedaccounts.no_accounts": "There are no verified accounts for this discord",
+  "command.verifiedaccounts.title_page": "Verified Accounts - Page %s/%s",
+
+  "message.attachments": "(%s attachments)",
+  "message.replied_to": "Replied to %s: %s",
+
+  "commands.not_allowed": "Sorry, minecraft commands are not allowed in this channel",
+  "commands.permission_denied": "Sorry, you do not have permission to execute that command",
+  "commands.command_not_allowed": "Sorry, but you are not allowed to execute that command",
+
+  "hiding.now_hidden": "%s is now hidden",
+  "hiding.failed": "Failed to hide player. Error: %s",
+  "hiding.not_hidden": "Player is not hidden",
+  "hiding.unhidden": "Player %s is no longer hidden",
+  "hiding.unhide_failed": "Failed to unhide player. Error: %s",
+
+  "mc.sdconfigeditor.opening": "Config Editor Connection initializing. Check your log for the link",
+
+  "tooltip.display_name": "Display Name",
+  "tooltip.username": "Username",
+  "tooltip.roles": "Roles"
+}

config/simpleradio-server.toml

@@ -6,11 +6,11 @@
 	#This is how much transmission power diminishes per block. Defaults to 0.01.
 	transmissionDiminishment = 0.01
 	#This is the amount of time (in ticks) per block a wire takes to relay data. Defaults to 4.
-	transmissionTime = 4
+	transmissionTime = 2
 	#This is the amount of time (in ticks) between each header sent. Defaults to 5.
 	headerInterval = 5
 	#This is the range a wire can reach before breaking. Defaults to 12.
-	range = 12.0
+	range = 36.0
 	#This is the amount of time (in ticks) a wire can survive while being invalid (no connections or out of range) before breaking. Defaults to 5.
 	invalidDeathTime = 5
 	#This is the amount of time (in ticks) between each effect for a wire. Can be disabled by setting to -1. Defaults to 5.

config/spark/tmp/about.txt

@@ -0,0 +1,10 @@
+# What is this directory?
+
+* In order to perform certain functions, spark sometimes needs to write temporary data to the disk. 
+* Previously, a temporary directory provided by the operating system was used for this purpose. 
+* However, this proved to be unreliable in some circumstances, so spark now stores temporary data here instead!
+
+spark will automatically cleanup the contents of this directory. 
+(but if for some reason it doesn't, if the server is stopped, you can freely delete any files ending in .tmp)
+
+tl;dr: spark uses this folder to store some temporary data.

kubejs/server_scripts/my_create_recipes.js

@@ -3,18 +3,8 @@ ServerEvents.recipes(event => {
   // =========================
   // REMOVE OLD RECIPES
   // =========================
-  event.remove({ id: 'create:crushing/tuff' });
-  event.remove({ id: 'create:crushing/tuff_recycling' });
-  event.remove({ id: 'create:milling/dripstone_block' });
-  event.remove({ id: 'create:crushing/crimsite' });
-  event.remove({ id: 'create:crushing/crimsite_recycling' });
-  event.remove({ id: 'create:crushing/veridium' });
-  event.remove({ id: 'create:crushing/veridium_recycling' });
-  event.remove({ id: 'create:crushing/asurine' });
-  event.remove({ id: 'create:crushing/asurine_recycling' });
-  event.remove({ id: 'create:crushing/ochrum' });
-  event.remove({ id: 'create:crushing/ochrum_recycling' });
-
+  event.remove({ id: 'jei:/create/crushing/tuff' });
+  event.remove({ id: 'jei:/create/crushing/tuff_recycling' });
 
   // =========================
   // COMPACTING
@@ -45,7 +35,7 @@ ServerEvents.recipes(event => {
   event.recipes.create.crushing([
     Item.of('minecraft:clay_ball').withChance(0.4),
     Item.of('3x create:copper_nugget').withChance(0.2)
-  ], 'minecraft:dripstone_block');
+  ], 'minecraft:pointed_dripstone');
 
   event.recipes.create.crushing([
     Item.of('3x create:zinc_nugget').withChance(0.2)
@@ -57,8 +47,7 @@ ServerEvents.recipes(event => {
   // Gravel + Nether Wart (Heated) -> Netherrack
   event.recipes.create.mixing('minecraft:netherrack', [
     'minecraft:gravel',
-    'minecraft:nether_wart',
-    Fluid.of('minecraft:lava', 250)
+    'minecraft:nether_wart'
   ]).heated();
 
   // Quartz + Blue Dye -> Lapis Lazuli
@@ -70,29 +59,25 @@ ServerEvents.recipes(event => {
   // NEW: Crimsite + Blackstone (Heated) -> 2x Crimsite
   event.recipes.create.mixing('2x create:crimsite', [
     'create:crimsite',
-    'minecraft:blackstone',
-    Fluid.of('minecraft:lava', 250)
+    'minecraft:blackstone'
   ]).heated();
 
   // NEW: Asurine + Basalt (Heated) -> 2x Asurine
   event.recipes.create.mixing('2x create:asurine', [
     'create:asurine',
-    'minecraft:basalt',
-    Fluid.of('minecraft:lava', 250)
+    'minecraft:basalt'
   ]).heated();
 
   // NEW: Ochrum + Sandstone (Heated) -> 2x Ochrum
   event.recipes.create.mixing('2x create:ochrum', [
     'create:ochrum',
-    'minecraft:sandstone',
-    Fluid.of('minecraft:lava', 250)
+    'minecraft:sandstone'
   ]).heated();
 
   // NEW: Veridium + Mossy Cobblestone -> 2x Veridium
   event.recipes.create.mixing('2x create:veridium', [
     'create:veridium',
-    'minecraft:mossy_cobblestone',
-    Fluid.of('minecraft:lava', 250)
+    'minecraft:mossy_cobblestone'
   ]);
 
   // =========================

run.bat

@@ -0,0 +1,7 @@
+@echo off
+REM Forge requires a configured set of both JVM and program arguments.
+REM Add custom JVM arguments to the user_jvm_args.txt
+REM Add custom program arguments {such as nogui} to this file in the next line before the %* or
+REM  pass them to this script directly
+java @user_jvm_args.txt @libraries/net/minecraftforge/forge/1.20.1-47.4.2/win_args.txt %*
+pause