Merge branch 'main' into no-more-mending

config/item_obliterator.json5

@@ -0,0 +1,60 @@
+{
+  // -----------------------------------------------------------
+  //              Item Obliterator by ElocinDev
+  // -----------------------------------------------------------
+  //  
+  // How to add items?
+  //   - They are json strings, so you need to separate each
+  //     entry with a comma, except the last
+  //   - If you start an entry with !, it will be treated as a regular expression
+  //     Example: "!minecraft:.*_sword" to disable all swords
+  //  
+  // -----------------------------------------------------------
+  // Do not touch this
+  "configVersion": 2,
+  // -----------------------------------------------------------
+  // Items here will be unusable completely
+  //    Example: minecraft:diamond
+  "blacklisted_items": [
+    "beansbackpacks:backpack",
+	"beansbackpacks:metal_backpack",
+	"beansbackpacks:winged_backpack",
+	"beansbackpacks:ender_backpack",
+	"beansbackpacks:lock"
+  ],
+  // -----------------------------------------------------------
+  // Removes an item if it contains certain nbt tag. If the whole entry (or expression) is present, the item gets removed.
+  // Use with caution! This is a very expensive operation and can cause lag if you have a lot of items blacklisted.
+  // 	
+  // 	 Example to disable a regeneration potion: Potion:"minecraft:regeneration"
+  // 	
+  // 	 You can also use regular expressions by starting the value with !
+  "blacklisted_nbt": [
+  ],
+  // -----------------------------------------------------------
+  // Items here will not be able to be right-clicked (Interact)
+  //    Example: minecraft:apple
+  "only_disable_interactions": [
+    "examplemod:example_item"
+  ],
+  // -----------------------------------------------------------
+  // Items here will not be able to be used to attack
+  //    Example: minecraft:diamond_sword
+  "only_disable_attacks": [
+    "examplemod:example_item"
+  ],
+  // -----------------------------------------------------------
+  // Items here will get their recipes disabled
+  // Keep in mind this already is applied to blacklisted items
+  "only_disable_recipes": [
+    "examplemod:example_item"
+  ],
+  // -----------------------------------------------------------
+  // If true, the mod will use a hashset to handle the blacklisted items
+  // This is a more optimized approach only if you have a lot of items blacklisted (20 or more is recommended)
+  // If you just have a small amount of items blacklisted, keep this false
+  //  
+  // [!] Enabling this will disable all regular expressions
+  // [!] Does not apply to NBT, only item blacklist / interaction / attack
+  "use_hashmap_optimizations": false
+}

config/particular.json5

@@ -0,0 +1,54 @@
+{
+	"waterSplash": true,
+	"cascades": true,
+	"waterfallSpray": true,
+	"fireflies": true,
+	"fallingLeaves": true,
+	"caveDust": true,
+	"chestBubbles": true,
+	"soulSandBubbles": true,
+	"barrelBubbles": true,
+	"poppingBubbles": true,
+	"rainRipples": true,
+	"waterDripRipples": true,
+	"cakeEatingParticles": true,
+	"emissiveLavaDrips": true,
+	"fireflySettings": {
+		"startTime": 12000,
+		"endTime": 23000,
+		"minTemp": 0.5,
+		"maxTemp": 0.9900000095367432,
+		"canSpawnInRain": false,
+		"dailyRandom": [
+			0.0,
+			0.0,
+			0.0,
+			0.33000001311302185,
+			0.6600000262260437,
+			1.0
+		],
+		"grass": 0.1666666716337204,
+		"tallGrass": 0.0833333358168602,
+		"flowers": 1.0,
+		"tallFlowers": 0.5
+	},
+	"fallingLeavesSettings": {
+		"spawnChance": 60,
+		"spawnRipples": true,
+		"layFlatOnGround": true,
+		"layFlatRightAngles": false
+	},
+	"caveDustSettings": {
+		"spawnChance": 700,
+		"baseMaxAge": 200,
+		"color": "#FF808080",
+		"fadeDuration": 20,
+		"maxAcceleration": 0.029999999329447746,
+		"accelChangeChance": 180,
+		"excludeBiomes": [
+			"minecraft:lush_caves",
+			"minecraft:dripstone_caves",
+			"minecraft:deep_dark"
+		]
+	}
+}

index.toml

@@ -4,6 +4,14 @@ hash-format = "sha256"
 file = "README.md"
 hash = "5ce6e50fd29658a5e612978c86a555ec7f1260089ec221d0594b37714612901c"
 
+[[files]]
+file = "config/item_obliterator.json5"
+hash = "4b7686fc8b5d365b204be4bca9b516b599863bd1df90673338aa17875f817806"
+
+[[files]]
+file = "config/particular.json5"
+hash = "2ef28c4cf7a2e6d8316f665219b7c8e307931734e02ba1dc05a9ff6f35bb07a0"
+
 [[files]]
 file = "configureddefaults/config/DistantHorizons.toml"
 hash = "da2034687d2a8a2ecfb0c1ca07f756e02b3b2266b1f11a5566d9dcaa5af3118a"
@@ -325,11 +333,6 @@ file = "mods/chalk.pw.toml"
 hash = "e0fe3a15675b2f6ad147699a546a09bccd45492df57f721ffa524a2f5b380595"
 metafile = true
 
-[[files]]
-file = "mods/charm-of-undying.pw.toml"
-hash = "687e83844c7fec1b390fa6d5228068d3e4e84906f0743165fa48ff42cd713ed6"
-metafile = true
-
 [[files]]
 file = "mods/chat-heads.pw.toml"
 hash = "732bc85d460b6399677e5b768318a0d6cc02822b9d005015ec4e16d9730e260a"
@@ -1402,7 +1405,7 @@ metafile = true
 
 [[files]]
 file = "mods/tinkerers-smithing.pw.toml"
-hash = "a67428b929aff24f6ae728600ee7d5f1ab814d7e3e362e16b59660c48151d50b"
+hash = "5e654c6b2b2530ee3c74a2e6638ebb4cf1a170ca9ae9b9e391c34de3915e3f2f"
 metafile = true
 
 [[files]]

mods/charm-of-undying.pw.toml

@@ -1,13 +0,0 @@
-name = "Charm of Undying"
-filename = "charmofundying-quilt-6.5.0+1.20.1.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/b5GyyYkp/versions/75dDrCqo/charmofundying-quilt-6.5.0%2B1.20.1.jar"
-hash-format = "sha512"
-hash = "0760e837c228eb26966e1ec2d676c6d0ba55c9c091322a177d9e7f84120d07e9101116ea96353b21a6d595852af8f7c399273761594cc86d2986b3a3799b974e"
-
-[update]
-[update.modrinth]
-mod-id = "b5GyyYkp"
-version = "75dDrCqo"

mods/tinkerers-smithing.pw.toml

@@ -1,6 +1,6 @@
 name = "Tinkerer's Smithing"
 filename = "tinkerers-smithing-2.7.0+1.20.jar"
-side = "server"
+side = "both"
 
 [download]
 url = "https://cdn.modrinth.com/data/RhVpNN5O/versions/gzDgfk8I/tinkerers-smithing-2.7.0%2B1.20.jar"

pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "f3a7d57b22ac77490e5771bef71eeb0d93afbdedd95b56ac282dbb325ddad6d1"
+hash = "20d6951090598712fb1b6dc6646f2237cd7f1b7e94e773aef4bad195a85a298d"
 
 [versions]
 minecraft = "1.20.1"