1

2024-09-01 07:10:05 +08:00
parent 250d561733
commit e675c0d3ed
36 changed files with 267 additions and 210 deletions
--- a/package/overrides/config/create_jetpack-client.toml
+++ b/package/overrides/config/create_jetpack-client.toml
@@ -0,0 +1,16 @@
+
+[overlay]
+	enabled = true
+	#Range: 0.0 ~ 1.7976931348623157E308
+	scale = 1.0
+
+	[overlay.position]
+		#Use negative values to position relative to the right/bottom of the screen
+		#Range: > -2147483648
+		x = 6
+		#Range: > -2147483648
+		y = 6
+
+[effects]
+	seasonal = true
+
--- a/package/overrides/config/create_jetpack-common.toml
+++ b/package/overrides/config/create_jetpack-common.toml
@@ -0,0 +1,23 @@
+
+[air]
+	#Range: > 1
+	uses_per_tank = 2048
+	#Range: > 1
+	uses_per_tank_hover = 20480
+
+[speed]
+	#Range: 0.01 ~ 100.0
+	horizontal = 0.02
+	#Range: 0.01 ~ 100.0
+	acceleration = 0.6
+	#Range: 0.0 ~ 100.0
+	swim_modifier = 1.8
+	#Range: 0.01 ~ 100.0
+	vertical = 0.4
+	#Range: -100.0 ~ 0.0
+	hover_descend = -0.03
+
+[features]
+	#Range: 1.0 ~ 100.0
+	elytra_boost = 1.25
+
--- a/package/overrides/config/createbigcannons-server.toml
+++ b/package/overrides/config/createbigcannons-server.toml
@@ -7,99 +7,57 @@
 	#If true, cannons cannot fail whatsoever. Equivalent to setting all the chances below to zero.
 	disableAllCannonFailure = false
 	#.
-	#Chance that a fired projectile will get stuck in a barrel after exceeding the squib ratio. 0 is 0%, 1 is 100%.
-	#Range: 0.0 ~ 1.0
-	squibChance = 0.25
-	#.
 	#Chance that a cannon will fail if a Powder Charge is ignited in a "barrel"-type cannon block. 0 is 0%, 1 is 100%.
 	#This chance can be affected by stronger and weaker charge blocks.
 	#Range: 0.0 ~ 1.0
 	barrelChargeBurstChance = 0.20000000298023224
 	#.
-	#How strong the explosion of a catastrophic failure is. Scaled by the amount of charges used in the shot.
-	#Range: 0.0 ~ 3.4028234663852886E38
-	failureExplosionPower = 2.0
-	#.
 	#Chance that a cannon loaded with more Powder Charges that it can handle will fail. 0 is 0%, 1 is 100%.
 	#Range: 0.0 ~ 1.0
 	overloadBurstChance = 0.5
 	#.
+	#Chance that a fired projectile will get stuck in a barrel after exceeding the squib ratio. 0 is 0%, 1 is 100%.
+	#Range: 0.0 ~ 1.0
+	squibChance = 0.25
+	#.
 	#Chance that a load with gaps between the loaded Powder Charges will not completely combust. 0 is 0%, 1 is 100%.
 	#Range: 0.0 ~ 1.0
 	interruptedIgnitionChance = 0.33000001311302185
+	#.
+	#How strong the explosion of a catastrophic failure is. Scaled by the amount of charges used in the shot.
+	#Range: 0.0 ~ 3.4028234663852886E38
+	failureExplosionPower = 2.0

 #.
 #These values affect the characteristics of cannon munitions.
 [munitions]
+	#.
+	#Range: 0.0 ~ 1.0
+	baseProjectileFluidBounceChance = 0.8999999761581421
 	#.
 	#.
 	#If projectiles can bounce, ricochet, and be deflected.
 	projectilesCanBounce = true
 	#.
-	#Range: 0.0 ~ 1.0
-	baseProjectileBounceChance = 0.33000001311302185
+	#Range: 0.0 ~ 3.4028234663852886E38
+	penetrationBonusScale = 0.10000000149011612
+	#.
+	projectilesChangeSurroundings = true
 	#.
 	#Range: 0.0 ~ 1.0
-	baseProjectileFluidBounceChance = 0.8999999761581421
+	baseProjectileBounceChance = 0.33000001311302185
 	#.
 	#[in Meters per Tick]
 	#The minimum velocity necessary to activate the penetration bonus.
 	#Range: 0.0 ~ 3.4028234663852886E38
 	minimumVelocityForPenetrationBonus = 1.0
 	#.
-	#Range: 0.0 ~ 3.4028234663852886E38
-	penetrationBonusScale = 0.10000000149011612
-	#.
 	#The extent to which cannon projectiles can damage surrounding blocks.
 	#All Damage - projectiles will destroy anything they hit, if applicable. Explosive projectiles will destroy blocks on detonation.
 	#No Explosive Damage - projectiles will destroy anything they hit, if applicable. Explosive projectiles will only harm entities on detonation.
 	#No Damage - projectiles will not destroy anything they hit, and will only deal entity damage. Explosive projectiles will only harm entities on detonation.
 	#Allowed Values: ALL_DAMAGE, NO_EXPLOSIVE_DAMAGE, NO_DAMAGE
 	damageRestriction = "ALL_DAMAGE"
-	#.
-	projectilesChangeSurroundings = true
-
-	#.
-	#Chunkloading
-	[munitions.chunkloading]
-		#.
-		projectilesCanChunkload = true
-		#.
-		smokeCloudsCanChunkload = true
-
-	#.
-	#Big Cannon Munitions
-	[munitions.bigCannonMunitions]
-		#.
-		#Allowed Values: NONE, LONG, SHORT
-		trailType = "SHORT"
-		#.
-		#Makes all shot big cannon projectiles tracers regardless if the item had a tracer tip applied.
-		allBigCannonProjectilesAreTracers = false
-		#.
-		#[in Ticks]
-		#Range: 0 ~ 100
-		quickFiringBreechItemPickupDelay = 20
-		#.
-		quickFiringBreechItemGoesToInventory = false
-
-	#.
-	#Projectile Fuzes
-	[munitions.fuzes]
-		#.
-		#Chance that the Impact Fuze/Delayed Impact Fuze will detonate on hitting something. 0 is 0% (never), 1 is 100% (always).
-		#Range: 0.0 ~ 1.0
-		impactFuzeDetonationChance = 0.6700000166893005
-		#.
-		#How many blocks the Impact Fuze/Delayed Impact Fuze can hit before breaking. Set to -1 to never break.
-		#Range: > -1
-		impactFuzeDurability = 3
-		#.
-		#[in Ticks]
-		#Time it takes for a proximity fuze to arm itself.
-		#After the fuze has been in the air for the specified arming time, it will detonate when it gets close enough to a block or entity.
-		#Range: > 0
-		proximityFuzeArmingTime = 20

 	#.
 	#Grouped Munitions
@@ -110,14 +68,50 @@
 		fluidBlobBlockEffectChance = 0.5

 	#.
-	#Autocannon Munitions
-	[munitions.autocannonMunitions]
+	#Chunkloading
+	[munitions.chunkloading]
+		#.
+		smokeCloudsCanChunkload = true
+		#.
+		projectilesCanChunkload = true
+
+	#.
+	#Big Cannon Munitions
+	[munitions.bigCannonMunitions]
+		#.
+		#Makes all shot big cannon projectiles tracers regardless if the item had a tracer tip applied.
+		allBigCannonProjectilesAreTracers = false
+		#.
+		#[in Ticks]
+		#Range: 0 ~ 100
+		quickFiringBreechItemPickupDelay = 20
 		#.
 		#Allowed Values: NONE, LONG, SHORT
 		trailType = "SHORT"
 		#.
-		#Makes all shot autocannon projectiles tracers regardless if the item had a tracer tip applied. Emulates legacy behavior.
-		allAutocannonProjectilesAreTracers = false
+		quickFiringBreechItemGoesToInventory = false
+
+	#.
+	#Projectile Fuzes
+	[munitions.fuzes]
+		#.
+		#[in Ticks]
+		#Time it takes for a proximity fuze to arm itself.
+		#After the fuze has been in the air for the specified arming time, it will detonate when it gets close enough to a block or entity.
+		#Range: > 0
+		proximityFuzeArmingTime = 20
+		#.
+		#How many blocks the Impact Fuze/Delayed Impact Fuze can hit before breaking. Set to -1 to never break.
+		#Range: > -1
+		impactFuzeDurability = 3
+		#.
+		#Chance that the Impact Fuze/Delayed Impact Fuze will detonate on hitting something. 0 is 0% (never), 1 is 100% (always).
+		#Range: 0.0 ~ 1.0
+		impactFuzeDetonationChance = 0.6700000166893005
+
+	#.
+	#Autocannon Munitions
+	[munitions.autocannonMunitions]
 		#.
 		#How many autocannon rounds the Autocannon Ammo Container can store.
 		#Range: 1 ~ 128
@@ -126,10 +120,26 @@
 		#How many machine gun rounds the Autocannon Ammo Container can store.
 		#Range: 1 ~ 128
 		autocannonAmmoContainerMachineGunRoundCapacity = 64
+		#.
+		#Makes all shot autocannon projectiles tracers regardless if the item had a tracer tip applied. Emulates legacy behavior.
+		allAutocannonProjectilesAreTracers = false
+		#.
+		#Allowed Values: NONE, LONG, SHORT
+		trailType = "SHORT"

 #.
 #These values affect the characteristics of cannon materials and cannon structures
 [cannons]
+	#.
+	#Range: 0.0 ~ 3.4028234663852886E38
+	bigCannonRecoilScale = 4.0
+	#.
+	#Range: 0.0 ~ 3.4028234663852886E38
+	autocannonRecoilScale = 0.5
+	#.
+	#Time it takes for the Quickfiring Breech to fully open/close, during which it cannot be loaded.
+	#Range: > 0
+	quickfiringBreechOpeningCooldown = 5
 	#.
 	#.
 	#Maximum length of cannons that can be built.
@@ -139,16 +149,55 @@
 	#Time when the Quickfiring Breech cannot be loaded by Mechanical Arms.
 	#Range: > 0
 	quickfiringBreechLoadingCooldown = 40
+
 	#.
-	#Time it takes for the Quickfiring Breech to fully open/close, during which it cannot be loaded.
-	#Range: > 0
-	quickfiringBreechOpeningCooldown = 5
+	#Cannon Carriages
+	[cannons.carriage]
+		#.
+		#How fast the carriage turns, in degrees per tick.
+		#Range: 0.10000000149011612 ~ 10.0
+		carriageTurnRate = 1.0
+		#.
+		cannonWeightAffectsCarriageSpeed = true
+		#.
+		#How fast the carriage is, in blocks per tick.
+		#Range: 0.03999999910593033 ~ 1.0
+		carriageSpeed = 0.03999999910593033
+
 	#.
-	#Range: 0.0 ~ 3.4028234663852886E38
-	bigCannonRecoilScale = 4.0
+	#Loading Tools
+	[cannons.loadingTools]
+		#.
+		#How many blocks inside a cannon a Ram Rod can reach.
+		#Range: > 1
+		ramRodReach = 5
+		#.
+		#How many hunger/saturation points it takes to move one munition block a distance of one block using loading tools.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		loadingToolHungerConsumption = 2.5
+		#.
+		#Maximum amount of munition blocks a Ram Rod can push.
+		#Range: > 1
+		ramRodStrength = 3
+		#.
+		#How many blocks inside a cannon a Worm can reach.
+		#Range: > 1
+		wormReach = 5
+		#.
+		#How many ticks before a player can use a manual loading tool again. There are 20 ticks in 1 second.
+		#Range: > 0
+		loadingToolCooldown = 20
+		#.
+		#If deployers can use loading tools.
+		deployersCanUseLoadingTools = false
+
 	#.
-	#Range: 0.0 ~ 3.4028234663852886E38
-	autocannonRecoilScale = 0.5
+	#Display Link Info
+	[cannons.displayLink]
+		#.
+		shouldDisplayContainedMunitions = true
+		#.
+		shouldDisplayCannonRotation = true

 	#.
 	#Drop Mortar
@@ -162,55 +211,6 @@
 		#Range: > 0
 		dropMortarItemCooldown = 40

-	#.
-	#Loading Tools
-	[cannons.loadingTools]
-		#.
-		#If deployers can use loading tools.
-		deployersCanUseLoadingTools = false
-		#.
-		#How many blocks inside a cannon a Ram Rod can reach.
-		#Range: > 1
-		ramRodReach = 5
-		#.
-		#Maximum amount of munition blocks a Ram Rod can push.
-		#Range: > 1
-		ramRodStrength = 3
-		#.
-		#How many blocks inside a cannon a Worm can reach.
-		#Range: > 1
-		wormReach = 5
-		#.
-		#How many hunger/saturation points it takes to move one munition block a distance of one block using loading tools.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		loadingToolHungerConsumption = 2.5
-		#.
-		#How many ticks before a player can use a manual loading tool again. There are 20 ticks in 1 second.
-		#Range: > 0
-		loadingToolCooldown = 20
-
-	#.
-	#Cannon Carriages
-	[cannons.carriage]
-		#.
-		#How fast the carriage is, in blocks per tick.
-		#Range: 0.03999999910593033 ~ 1.0
-		carriageSpeed = 0.03999999910593033
-		#.
-		#How fast the carriage turns, in degrees per tick.
-		#Range: 0.10000000149011612 ~ 10.0
-		carriageTurnRate = 1.0
-		#.
-		cannonWeightAffectsCarriageSpeed = true
-
-	#.
-	#Display Link Info
-	[cannons.displayLink]
-		#.
-		shouldDisplayCannonRotation = true
-		#.
-		shouldDisplayContainedMunitions = true
-
 	#.
 	#Big Cannon Screen Shake
 	[cannons.bigCannonScreenShake]
@@ -221,14 +221,14 @@
 #.
 #These values affect various miscellaneous contraptions.
 [kinetics]
+	#.
+	#When enabled, Cannon Loaders will not break if another contraption is placed on them. Enables legacy behavior.
+	enableIntersectionLoading = false
 	#.
 	#.
 	#Maximum length of cannon loaders that can be built.
 	#Range: > 3
 	maxLoaderLength = 64
-	#.
-	#When enabled, Cannon Loaders will not break if another contraption is placed on them. Enables legacy behavior.
-	enableIntersectionLoading = false

 	[kinetics.stressValues]

@@ -241,12 +241,12 @@
 			#[in Stress Units]
 			#Configure the individual stress impact of mechanical blocks. Note that this cost is doubled for every speed increase it receives.
 			[kinetics.stressValues.v2.impact]
-				bronze_sliding_breech = 12.0
 				cannon_loader = 4.0
-				steel_screw_breech = 16.0
-				cannon_drill = 8.0
 				cast_iron_sliding_breech = 16.0
 				steel_sliding_breech = 32.0
+				steel_screw_breech = 16.0
+				cannon_drill = 8.0
+				bronze_sliding_breech = 12.0
 				nethersteel_screw_breech = 40.0
 				cannon_builder = 8.0

@@ -259,6 +259,11 @@
 	#Range: > 1
 	maxCannonCastHeight = 32
 	#.
+	#[in Ticks]
+	#Time a built-up cannon block needs to be heated for until it transforms into its finished form.
+	#Range: > 0
+	builtUpCannonHeatingTime = 6000
+	#.
 	#Maximum length of a Cannon Drill that can be built.
 	#Range: > 1
 	maxCannonDrillLength = 32
@@ -270,9 +275,4 @@
 	#Maximum reach of a Cannon Builder.
 	#Range: > 2
 	maxCannonBuilderRange = 32
-	#.
-	#[in Ticks]
-	#Time a built-up cannon block needs to be heated for until it transforms into its finished form.
-	#Range: > 0
-	builtUpCannonHeatingTime = 6000

--- a/package/overrides/config/fabric/indigo-renderer.properties
+++ b/package/overrides/config/fabric/indigo-renderer.properties
@@ -1,5 +1,5 @@
 #Indigo properties file
-#Sat Aug 31 08:04:44 CST 2024
+#Sun Sep 01 07:04:35 CST 2024
 always-tesselate-blocks=auto
 ambient-occlusion-mode=hybrid
 debug-compare-lighting=auto
--- a/package/overrides/config/indium-renderer.properties
+++ b/package/overrides/config/indium-renderer.properties
@@ -1,4 +1,4 @@
 #Indium properties file
-#Sat Aug 31 08:04:43 CST 2024
+#Sun Sep 01 07:04:36 CST 2024
 always-tesselate-blocks=auto
 ambient-occlusion-mode=auto
--- a/package/overrides/config/iris.properties
+++ b/package/overrides/config/iris.properties
@@ -1,5 +1,5 @@
 #This file stores configuration options for Iris, such as the currently active shaderpack
-#Sat Aug 31 08:04:46 CST 2024
+#Sun Sep 01 07:04:37 CST 2024
 colorSpace=SRGB
 disableUpdateMessage=false
 enableDebugOptions=false
--- a/package/overrides/config/jade/usernamecache.json
+++ b/package/overrides/config/jade/usernamecache.json
@@ -8,5 +8,6 @@
  "cbd93537-21e9-4852-99fc-ff459cc4ce41": "minatoaqua",
  "723515d9-1eb1-4fe8-889c-36c7a495a6ea": "qin_taoemmmm",
  "c2b68107-bb38-48d0-abde-a9a0b58cc44d": "steve3",
-  "2da365b3-2c73-3743-8af9-f24d61a6fcbc": "SX"
+  "2da365b3-2c73-3743-8af9-f24d61a6fcbc": "SX",
+  "717f2e14-db71-3435-8e58-11b7a52a4611": "azwphy"
 }
--- a/package/overrides/config/packetfixer.properties
+++ b/package/overrides/config/packetfixer.properties
@@ -1,7 +1,7 @@
 #Packet Fixer config file.
 #Default values (minecraft default): nbtMaxSize 2097152, packetSize 1048576, decoderSize 2097152 and varInt21Size 3.
 #Max values are 2147483647 for packetSize/decoderSize/varInt21 and 9223372036854775807 for nbtMaxSize.
-#Sat Aug 31 08:04:30 CST 2024
+#Sun Sep 01 07:04:23 CST 2024
 decoderSize=838860800
 nbtMaxSize=209715200
 packetSize=104857600
--- a/package/overrides/config/ritchiesprojectilelib-server.toml
+++ b/package/overrides/config/ritchiesprojectilelib-server.toml
@@ -4,9 +4,6 @@
 	#The maximum amount of chunks forced to load during a single tick. Set to 0 to force load unlimited chunks.
 	#Range: > 0
 	maxChunksForceLoaded = 64
-	#The maximum amount of chunks that can be processed for loading each tick.
-	#Range: 1 ~ 256
-	maxChunksLoadedEachTick = 32
 	#[in Ticks]
 	#How long chunks loaded by this mod last for before being unloaded.
 	#Range: 1 ~ 20
@@ -15,4 +12,7 @@
 	#How long chunks loaded by this mod last for before being unloaded if they have not yet loaded entities.
 	#Range: 1 ~ 200
 	entityLoadTimeout = 10
+	#The maximum amount of chunks that can be processed for loading each tick.
+	#Range: 1 ~ 256
+	maxChunksLoadedEachTick = 32

--- a/package/overrides/config/roughlyenoughitems/config.json5
+++ b/package/overrides/config/roughlyenoughitems/config.json5
@@ -168,7 +168,8 @@
 			"shouldFilterDisplays": true,
 			"filteringRules": [
 				"{id:\"roughlyenoughitems:manual\",rule:{}}",
-				"{id:\"roughlyenoughitems:basic\",rule:{}}"
+				"{id:\"roughlyenoughitems:basic\",rule:{}}",
+				"{id:\"roughlyenoughitems:hidden_from_recipe_viewers\",rule:{}}"
 			]
 		}
 	}
--- a/package/overrides/config/roughlyenoughitems/hints.json
+++ b/package/overrides/config/roughlyenoughitems/hints.json
@@ -1 +1 @@
-{"UUID":"a68c7e36e2ee3be7be26e21bb8ac4654","shownHints":[]}
+{"UUID":"717f2e14db7134358e5811b7a52a4611","shownHints":[]}
--- a/package/overrides/config/roughlyenoughitems/pinyin.properties
+++ b/package/overrides/config/roughlyenoughitems/pinyin.properties
@@ -1,2 +1,2 @@
 #Pinyin Options
-#Sat Aug 31 07:40:21 CST 2024
+#Sun Sep 01 07:05:02 CST 2024
--- a/package/overrides/config/roughlyenoughitems/pinyin_double.properties
+++ b/package/overrides/config/roughlyenoughitems/pinyin_double.properties
@@ -1,3 +1,3 @@
 #Double Pinyin Options
-#Sat Aug 31 07:40:21 CST 2024
+#Sun Sep 01 07:05:02 CST 2024
 Converter=sougou
--- a/package/overrides/config/xaerominimap-common.txt
+++ b/package/overrides/config/xaerominimap-common.txt
@@ -2,3 +2,4 @@ allowCaveModeOnServer:true
 allowNetherCaveModeOnServer:true
 allowRadarOnServer:true
 registerStatusEffects:true
+everyoneTracksEveryone:false
--- a/package/overrides/config/xaerominimap_entities.json
+++ b/package/overrides/config/xaerominimap_entities.json
@@ -22,8 +22,8 @@
    "dotSize": 2.0,
    "renderOverMinimapFrame": 1.0,
    "icons": 1.0,
-    "heightLimit": 20.0,
    "names": 0.0,
+    "heightLimit": 20.0,
    "iconScale": 1.0
  },
  "subCategories": [