[pull] master from Vazkii:master

.gitignore

@@ -6,7 +6,9 @@
 !/openloader/
 !/patchouli_books/
 !/scripts/
+!/packmenu/
 !/ship/
 !/.gitignore
+!SERVER_README.txt
 /ship/output
 *.pyc

config/YungsExtras-forge-1_16.toml

@@ -0,0 +1,88 @@
+
+["YUNG's Better Strongholds"]
+
+	###########################################################################################################
+	## Desert Decorations
+	###########################################################################################################
+	["YUNG's Better Strongholds"."Desert Decorations"]
+		# List of biomes that will NOT have Desert Decorations.
+		# By default, all Desert biomes will automatically have Desert Decorations, 
+		# so you only need to blacklist biomes with the Desert category that you don't want to spawn 
+		# Desert Decorations in.
+		# List must be comma-separated values enclosed in square brackets.
+		# Entries must have the mod namespace included.
+		# For example: "[minecraft:desert, byg:dunes]"
+		# Default: "[]"
+		"Blacklisted Biomes" = "[]"
+		# List of additional biomes that will have Desert Decorations.
+		# By default, all biomes (including modded biomes) with the Desert category are automatically included, 
+		# and do not need to be added here.
+		# List must be comma-separated values enclosed in square brackets. 
+		# Entries must have the mod namespace included.
+		# For example: "[minecraft:plains, byg:alps]"
+		# Default: "[]"
+		"Additional Whitelisted Biomes" = "[]"
+
+		###########################################################################################################
+		## Settings for the different Desert Obelisk variations.
+		###########################################################################################################
+		["YUNG's Better Strongholds"."Desert Decorations"."Desert Obelisks"]
+			# The spawn rate (chance per chunk) of a ruined obelisk spawning.
+			# Default: 700
+			"Ruined Obelisk Spawn Rate" = 700
+			# The spawn rate (chance per chunk) of a blackstone obelisk spawning.
+			# Default: 3000
+			"Blackstone Obelisk Spawn Rate" = 3000
+			# The spawn rate (chance per chunk) of a normal obelisk spawning.
+			# Default: 700
+			"Normal Obelisk Spawn Rate" = 700
+			# The spawn rate (chance per chunk) of a chiseled obelisk spawning.
+			# Default: 700
+			"Chiseled Obelisk Spawn Rate" = 700
+
+		###########################################################################################################
+		## Settings for miscellaneous desert structures.
+		###########################################################################################################
+		["YUNG's Better Strongholds"."Desert Decorations"."Desert Miscellaneous"]
+			# The spawn rate (chance per chunk) of an abandoned vacation spot spawning.
+			# Default: 1000
+			"Abandoned Vacation Spot Spawn Rate" = 1000
+			# The spawn rate (chance per chunk) of a small ruins spawning.
+			# Default: 1000
+			"Ruins Spawn Rate (Small)" = 1000
+			# The spawn rate (chance per chunk) of a flame outpost spawning.
+			# Default: 700
+			"Flame Outpost Spawn Rate" = 700
+
+		###########################################################################################################
+		## Settings for the different Desert Well variations.
+		###########################################################################################################
+		["YUNG's Better Strongholds"."Desert Decorations"."Desert Wells"]
+			# The spawn rate (chance per chunk) of a medium-sized normal well spawning.
+			# Default: 1200
+			"Normal Well Spawn Rate (Medium)" = 1200
+			# The spawn rate (chance per chunk) of a medium-sized Wishing Well spawning.
+			# Default: 1200
+			"Wishing Well Spawn Rate (Medium)" = 1200
+			# The spawn rate (chance per chunk) of a medium-sized dry well spawning.
+			# Default: 1200
+			"Dry Well Spawn Rate (Medium)" = 1200
+			# The spawn rate (chance per chunk) of a large dry well spawning.
+			# Default: 1200
+			"Dry Well Spawn Rate (Large)" = 1200
+			# The spawn rate (chance per chunk) of a small Wishing Well spawning.
+			# Default: 1200
+			"Wishing Well Spawn Rate (Small)" = 1200
+			# The spawn rate (chance per chunk) of a small normal well spawning.
+			# Default: 1200
+			"Normal Well Spawn Rate (Small)" = 1200
+			# The spawn rate (chance per chunk) of a large normal well spawning.
+			# Default: 1200
+			"Normal Well Spawn Rate (Large)" = 1200
+			# The spawn rate (chance per chunk) of a small dry well spawning.
+			# Default: 1200
+			"Dry Well Spawn Rate (Small)" = 1200
+			# The spawn rate (chance per chunk) of a large Wishing Well spawning.
+			# Default: 1200
+			"Wishing Well Spawn Rate (Large)" = 1200
+

config/YungsExtras/README.txt

@@ -0,0 +1,8 @@
+This directory is for a few additional options for YUNG's Extras.
+Options provided may vary by version.
+This directory contains subdirectories for supported versions. The first time you run YUNG's Extras, a version subdirectory will be created if that version supports advanced options.
+For example, the first time you use YUNG's Extras for MC 1.16 on Forge, the 'forge-1_16' subdirectory will be created in this folder.
+If no subdirectory for your version is created, then that version probably does not support the additional options.
+
+NOTE -- MOST OPTIONS CAN BE FOUND IN A CONFIG FILE OUTSIDE THIS FOLDER!
+For example, on Forge 1.16 the file is 'YungsExtras-forge-1_16.toml'.

config/YungsExtras/forge-1_16/README.txt

@@ -0,0 +1,29 @@
+######################################
+#        wishing_wells.json          #
+######################################
+
+This file contains a BlockSetSelector (see below) describing the probability of a given block being chosen.
+These probabilities are used for Wishing Wells, which have 
+loot deposits at the bottom of them.
+
+######################################
+#         BlockSetSelectors          #
+######################################
+
+Describes a set of blockstates and the probability of each blockstate being chosen.
+ - entries: An object where each entry's key is a blockstate, and each value is that blockstate's probability of being chosen.
+      The total sum of all probabilities SHOULD NOT exceed 1.0!
+ - defaultBlock: The blockstate used for any leftover probability ranges.
+      For example, if the total sum of all the probabilities of the entries is 0.6, then
+      there is a 0.4 chance of the defaultBlock being selected.
+
+Here's an example block selector:
+"entries": {
+  "minecraft:cobblestone": 0.25,
+  "minecraft:air": 0.2,
+  "minecraft:stone_bricks": 0.1
+},
+"defaultBlock": "minecraft:oak_planks"
+
+For each block, this selector has a 25% chance of returning cobblestone, 20% chance of choosing air,
+10% chance of choosing stone bricks, and a 100 - (25 + 20 + 10) = 45% chance of choosing oak planks (since it's the default block).

config/YungsExtras/forge-1_16/wishing_wells.json

@@ -0,0 +1,10 @@
+{
+  "lootBlockChances": {
+    "entries": {
+      "minecraft:emerald_ore": 0.05,
+      "minecraft:gold_ore": 0.5,
+      "minecraft:gold_block": 0.01
+    },
+    "defaultBlock": "minecraft:sandstone"
+  }
+}

config/abnormals_core-client.toml

@@ -1,8 +1,14 @@
 
 #Client only settings for Abnormals Core.
 [client]
+	#Scale for screen shake effects; Default: 1.0
+	#Range: 0.0 ~ 1.0
+	screenShakeScale = 1.0
 	#If sky color transition should be smooth; Default: True
 	smoothSkyColor = true
+	#Max amount of sources that can contribute to screen shaking, adjustable for performance and preference reasons. 0 will disable the addition of shake sources; Default: 256
+	#Range: > 0
+	maxScreenShakers = 256
 
 	#Slabfish patron hat settings.
 	[client.slabfishSettings]

config/advancementplaques-common.toml

@@ -0,0 +1,64 @@
+
+#Client Configuration
+[client]
+
+	[client.visual_options]
+		# If plaques should show on the top of the screen.
+		on_top = true
+		# The distance from the top or bottom of the screen, in pixels.
+		#Range: 8 ~ 256
+		distance = 16
+		# Hide waila/hwyla/jade popups while plaques are showing.
+		hide_waila = false
+		# If plaques should show for task advancements (normal advancements).
+		tasks = true
+		# If plaques should show for goal advancements (medium-difficulty advancements).
+		goals = true
+		# If plaques should show for challenge advancements (high-difficulty advancements).
+		challenges = true
+		# Text color to use for plaque titles (like "Advancement made!"). Can be entered as an 8-digit hex color code 0xAARRGGBB for convenience.
+		#Range: 0 ~ 4294967295
+		title_color = 4281541120
+		# Text color to use for advancement names on plaques. Can be entered as an 8-digit hex color code 0xAARRGGBB for convenience.
+		#Range: 0 ~ 4294967295
+		name_color = 4294967295
+
+	[client.duration_options]
+		# Duration of the shiny effect fade in for tasks.
+		#Range: 0.1 ~ 3.0
+		task_effect_fadein = 0.5
+		# Duration of the shiny effect fade out for tasks.
+		#Range: 0.1 ~ 3.0
+		task_effect_fadeout = 1.5
+		# Duration of the plaques for tasks (minus the effect fade in/out durations).
+		#Range: 2.0 ~ 10.0
+		task_duration = 7.0
+		# Duration of the shiny effect fade in for goals.
+		#Range: 0.1 ~ 3.0
+		goal_effect_fadein = 0.5
+		# Duration of the shiny effect fade out for goals.
+		#Range: 0.1 ~ 3.0
+		goal_effect_fadeout = 1.5
+		# Duration of the plaques for goals (minus the effect fade in/out durations).
+		#Range: 2.0 ~ 10.0
+		goal_duration = 7.0
+		# Duration of the shiny effect fade in for challenges.
+		#Range: 0.1 ~ 3.0
+		challenge_effect_fadein = 1.25
+		# Duration of the shiny effect fade out for challenges.
+		#Range: 0.1 ~ 3.0
+		challenge_effect_fadeout = 1.5
+		# Duration of the plaques for challenges (minus the effect fade in/out durations).
+		#Range: 2.0 ~ 10.0
+		challenge_duration = 7.0
+
+	[client.functionality_options]
+		# Whitelist of advancements to show plaques for.  Leave empty to display for all.
+		whitelist = []
+		# If task sounds should be muted.
+		mute_tasks = false
+		# If goal sounds should be muted.
+		mute_goals = false
+		# If challenge sounds should be muted.
+		mute_challenges = false
+

config/alexsmobs.toml

@@ -16,6 +16,8 @@
 	raccoonStealFromChests = false
 	#Whether mimicream can be used to duplicate items.
 	mimicreamRepair = true
+	#List of items that seagulls cannot take from players.
+	seagullStealingBlacklist = []
 	#Whether acacia blossoms should drop from blocks tagged with #alexsmobs:drops_acacia_blossoms
 	acaciaBlossomsDropFromLeaves = true
 	#Whether lava can be bottled with a right click of a glass bottle.
@@ -25,6 +27,8 @@
 	blobfishSpawnHeight = 38
 	#Whether guster spawns are limited to when it is raining/thundering.
 	limitGusterSpawnsToWeather = true
+	#Whether seagulls should steal food out of players' hotbar slots.
+	seagullStealing = true
 	#Whether all players should get an Animal Dictionary when joining the world for the first time.
 	giveBookOnStartup = false
 	#Maximum world y-level that cave centipedes can spawn at
@@ -74,6 +78,8 @@
 	#Relative volume of cachalot whales compared to other animals. Note that irl they are the loudest animal. Turn this down if you find their clicks annoying.
 	#Range: 0.0 ~ 10.0
 	cachalotVolume = 3.0
+	#Whether the Clinging Potion effect should flip the screen. Warning: may cause nausea.
+	clingingFlipEffect = false
 	#Whether emu should target skeletons.
 	emuTargetSkeletons = true
 	#Lava Opacity for the Lava Vision Potion.
@@ -212,6 +218,9 @@
 		warpedMoscoSpawnWeight = 1
 		#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn
 		#Range: 0 ~ 1000
+		seagullSpawnWeight = 21
+		#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn
+		#Range: 0 ~ 1000
 		cockroachSpawnWeight = 0
 		#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn
 		#Range: 0 ~ 1000
@@ -242,6 +251,9 @@
 		mimicOctopusSpawnWeight = 0
 		#Random roll chance to enable mob spawning. Higher number = lower chance of spawning
 		#Range: > 0
+		seagullSpawnRolls = 0
+		#Random roll chance to enable mob spawning. Higher number = lower chance of spawning
+		#Range: > 0
 		tigerSpawnRolls = 0
 		#Random roll chance to enable mob spawning. Higher number = lower chance of spawning
 		#Range: > 0
@@ -251,7 +263,7 @@
 		crimsonMosquitoSpawnWeight = 8
 		#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn
 		#Range: 0 ~ 1000
-		straddlerSpawnWeight = 85
+		straddlerSpawnWeight = 5
 		#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn
 		#Range: 0 ~ 1000
 		hummingbirdSpawnWeight = 39
@@ -266,7 +278,7 @@
 		endergradeSpawnRolls = 0
 		#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn
 		#Range: 0 ~ 1000
-		elephantSpawnWeight = 30
+		elephantSpawnWeight = 10
 		#Random roll chance to enable mob spawning. Higher number = lower chance of spawning
 		#Range: > 0
 		tasmanianDevilSpawnRolls = 0

config/alexsmobs/seagull_spawns.json

@@ -0,0 +1,16 @@
+{
+  "biomes": [
+    [
+      {
+        "type": "BIOME_DICT",
+        "negate": false,
+        "value": "overworld"
+      },
+      {
+        "type": "BIOME_DICT",
+        "negate": false,
+        "value": "beach"
+      }
+    ]
+  ]
+}