2.4.0

CHANGELOG.md

@@ -5,6 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.0]
+
+### Added
+- Trimmable tool support for paxels
+
+### Changed
+- Removed biome info overlay when the player has a map
+- Removed compass requirement for the player locater bar when using the Player Locater Bar Plus mod
+- Added keybind (I) to toggle immersive overlays
+- Clocks are now crafted with copper instead of gold, and the texture has been changed to reflect this (thanks to veechair on discord for the textures!)
+- Players no longer make an explosion sound on death
+
+### Fixed
+- The paxel recipes are now correctly unlocked when finding (most of) their relevant resources
+- XP is no longer reset on death
+- Added missing tools to the keep on death list
+
 ## [2.3.0]
 
 ### Added
@@ -63,7 +80,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Initial 2.0.0 release
 
-[unreleased]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.3.0...HEAD
+[unreleased]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.4.0...HEAD
+[2.4.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.3.0...2.4.0
 [2.3.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.2.0...2.3.0
 [2.2.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.1.0...2.2.0
 [2.1.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.0.0...2.1.0

README.md

@@ -18,6 +18,6 @@ Packed in Modrinth format, because [Modrinth](https://modrinth.com) is the super
 Every time a commit is pushed to this repo, a version of the pack is automatically generated, which can be found [here](https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/actions/workflows/build-1.21.yaml/runs/latest) (`MC_Rebalance_2.mrpack` below Artifacts).
 
 ### Export script
-To create a release yourself, run [./export-pack.sh](export-pack.sh)
-
-* It will be generated in [release/Tinker's tinkering.mrpack](Tinker's%20tinkering.mrpack)
+* To create a release yourself, run [./export-pack.sh](export-pack.sh)
+* This is also generate a server pack
+* When it's done both can be found in `release/`

export-pack.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
 ## Dependencies (arch/debian package names, may differ elsewhere):
-## bash, coreutils (dirname, mkdir, rm, cp), git, zip, findutils (find)
-## jq is optional
+## bash, coreutils (dirname, mkdir, rm, cp), git, zip, findutils (find), curl, wget, jq
 check_dep() {
 	if ! [ -x "$(command -v $1)" ]; then
 		echo "You need to install ${2:-$1}"
@@ -14,6 +13,9 @@ check_dep dirname coreutils
 check_dep git
 check_dep zip
 check_dep find findutils
+check_dep curl
+check_dep wget
+check_dep jq
 
 # Navigate to main modpack project directory
 cd "$(dirname "$0")"
@@ -22,20 +24,24 @@ basedir="$PWD"
 # Location for downloading/updating the mc_rebalance mod
 if [ ! -d deps ]; then
 	mkdir deps
-fi;
+fi
 
 # Location for saving the mc_rebalance mod
 if [ ! -d overrides/mods ]; then
 	mkdir -p overrides/mods
-fi;
+fi
+
+# Location for saving all other mods
+rm -rf deps/mods
+mkdir -p deps/mods
 
 # Clone the mod repo, if it already exists then update it
-echo "# Cloning/updating mod"
+echo "# Cloning/updating MC Rebalance mod"
 git clone --single-branch --branch 1.21 "https://patience.nearmisses.xyz/patience/mc_rebalance.git" "${basedir}/deps/mc_rebalance" 2> /dev/null || \
 	(cd "${basedir}/deps/mc_rebalance"; git pull > /dev/null)
 
 # Compile the mod
-echo "# Compiling mod"
+echo "# Compiling MC Rebalance mod"
 rm -f "${basedir}/deps/mc_rebalance/build/libs/mc_rebalance-"*".jar"
 (cd "${basedir}/deps/mc_rebalance/" && ./gradlew build > /dev/null)
 
@@ -49,19 +55,39 @@ cp "$(find "${basedir}/deps/mc_rebalance/build/libs" -regex "${basedir}/deps\/mc
 # Final path for the modpack
 if [ ! -d release ]; then
 	mkdir release
-fi;
+fi
 
 # Get version from the mrpack file
 version="$(jq -r ".versionId" modrinth.index.json)"
 version="${version:-dev}"
 
-# Export release to file
-echo "# Zipping mod"
+# Download fabric server
+if [ ! -e "${basedir}/deps/fabric-server.jar" ]; then
+	echo "# Downloading fabric server"
+	(cd deps && curl --silent --output fabric-server.jar https://meta.fabricmc.net/v2/versions/loader/1.21.1/0.19.2/1.1.1/server/jar)
+fi
+
+# Download all mods
+echo "# Downloading mods from modrinth.index.json for modpack"
+(cd deps/mods && wget --quiet --input-file <(jq -r '.files[] | select(.env.server=="required") | .downloads[]' ../../modrinth.index.json))
+
+# Export client release to file
+echo "# Zipping client modpack"
 zip --filesync --recurse-paths --quiet "${basedir}/release/MC_Rebalance_${version}.mrpack" overrides modrinth.index.json -x "*.git*" -x "*.sh"
 
+# Export server release to file
+echo "# Zipping server modpack"
+if [ -e "${basedir}/release/MC_Rebalance_${version}_server.zip" ]; then
+	rm -rf "${basedir}/release/MC_Rebalance_${version}_server.zip"
+fi
+(cd deps && zip --recurse-paths --quiet "${basedir}/release/MC_Rebalance_${version}_server.zip" mods fabric-server.jar)
+(cd server-files && zip --recurse-paths --quiet "${basedir}/release/MC_Rebalance_${version}_server.zip" .)
+(cd overrides && zip --recurse-paths --quiet "${basedir}/release/MC_Rebalance_${version}_server.zip" . -x "*.git*" -x "*.sh")
+
 echo
 if [ $? -eq 0 ]; then
-	echo "Successfully exported the modpack to ${basedir}/release/MC_Rebalance_${version}.mrpack"
+	echo "Successfully exported the server modpack to ${basedir}/release/MC_Rebalance_${version}_server.zip"
+	echo "Successfully exported the client modpack to ${basedir}/release/MC_Rebalance_${version}.mrpack"
 else
 	echo "An unknown error occured while zipping the pack"
 fi

modrinth.index.json

@@ -6,7 +6,7 @@
   "formatVersion": 1,
   "game": "minecraft",
   "name": "MC Rebalanced",
-  "versionId": "2.3.0",
+  "versionId": "2.4.0",
   "files": [
     {
       "downloads": [
@@ -374,7 +374,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 9907,
       "hashes": {
@@ -389,7 +389,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 83422,
       "hashes": {
@@ -434,7 +434,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 12432,
       "hashes": {
@@ -509,7 +509,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 100151,
       "hashes": {
@@ -569,7 +569,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 31382,
       "hashes": {
@@ -614,7 +614,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 1297761,
       "hashes": {
@@ -629,7 +629,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 373661,
       "hashes": {
@@ -644,7 +644,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 81067,
       "hashes": {
@@ -674,7 +674,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 84035,
       "hashes": {
@@ -689,7 +689,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 102285,
       "hashes": {
@@ -704,7 +704,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 1560675,
       "hashes": {
@@ -764,7 +764,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 863192,
       "hashes": {
@@ -779,7 +779,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 83679,
       "hashes": {
@@ -794,7 +794,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 79531,
       "hashes": {
@@ -899,7 +899,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 62761,
       "hashes": {
@@ -914,7 +914,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 496342,
       "hashes": {
@@ -929,7 +929,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 728221,
       "hashes": {
@@ -944,7 +944,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 75984,
       "hashes": {
@@ -959,7 +959,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 217532,
       "hashes": {
@@ -989,7 +989,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 274019,
       "hashes": {
@@ -1079,7 +1079,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 98232,
       "hashes": {
@@ -1109,7 +1109,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 17456,
       "hashes": {
@@ -1214,7 +1214,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 9136,
       "hashes": {
@@ -1229,7 +1229,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 9862,
       "hashes": {
@@ -1259,7 +1259,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 75091,
       "hashes": {

overrides/config/defaultoptions/keybindings.txt

@@ -36,7 +36,7 @@ key_key.dynamic_fps.toggle_forced:key.keyboard.unknown:
 key_key.dynamic_fps.toggle_disabled:key.keyboard.unknown:
 key_key.antique_atlas.open:key.keyboard.m:
 key_key.entityculling.toggle:key.keyboard.unknown:
-key_key.immersiveoverlays.toggle:key.keyboard.unknown:
+key_key.immersiveoverlays.toggle:key.keyboard.i
 key_key.immersiveoverlays.settings:key.keyboard.unknown:
 key_keybind.invmove.toggleMove:key.keyboard.unknown:
 key_key.spyglass-improvements.use:key.keyboard.c:

overrides/config/immersiveoverlays.json

@@ -0,0 +1,122 @@
+{
+  "version": 4,
+  "enabled": true,
+  "avoid_overlapping": true,
+  "moved_by_effects": true,
+  "require_item": true,
+  "require_item_in_hand": false,
+  "search_containers": true,
+  "search_containers_for_containers": true,
+  "render_background": true,
+  "render_endcap": true,
+  "hide_from_debug": true,
+  "compass_enable": true,
+  "compass_vertical_position": 140,
+  "compass_horizontal_position_left": false,
+  "compass_direction": false,
+  "compass_direction_text_colour": 16755200,
+  "compass_text_colour": 14737632,
+  "compass_x_colour": 16733525,
+  "compass_y_colour": 5635925,
+  "compass_z_colour": 5592575,
+  "compass_x_items": [
+    "minecraft:compass",
+    "minecraft:recovery_compass",
+    "spelunkery:magnetic_compass",
+    "firmaciv:nav_clock",
+    "firmaciv:firmaciv_compass"
+  ],
+  "compass_y_items": [
+    "spelunkery:depth_gauge",
+    "caverns_and_chasms:depth_gauge",
+    "additionaladditions:depth_meter",
+    "supplementaries:altimeter",
+    "depthmeter:depthmeter"
+  ],
+  "compass_z_items": [
+    "firmaciv:sextant"
+  ],
+  "clock_enable": true,
+  "clock_current_time": true,
+  "clock_day_count": false,
+  "clock_24_hour": true,
+  "clock_seasons": true,
+  "clock_text_colour": 14737632,
+  "clock_vertical_position": 85,
+  "clock_horizontal_position_left": false,
+  "clock_items": [
+    "minecraft:clock"
+  ],
+  "clock_weather_items": [
+    "caverns_and_chasms:barometer",
+    "firmaciv:barometer"
+  ],
+  "temperature_enable": true,
+  "temperature_icons": true,
+  "temperature_hot_colour": 16759694,
+  "temperature_cold_colour": 9371647,
+  "temperature_temperate_colour": 16777215,
+  "temperature_vertical_position": 112,
+  "temperature_horizontal_position_left": true,
+  "temperature_items": [
+    "oreganized:thermometer",
+    "toughasnails:thermometer",
+    "legendarysurvivaloverhaul:thermometer",
+    "cold_sweat:thermometer"
+  ],
+  "compat_playerlocatorplus": false,
+  "compat_xaeros": true,
+  "compat_antique_atlas": true,
+  "compat_tough_as_nails_temperature": true,
+  "compat_thermoo_temperature": true,
+  "biome_enable": false,
+  "biome_icons": true,
+  "biome_reduced_info": false,
+  "biome_text_tinted": true,
+  "biome_text_colour": 14737632,
+  "biome_vertical_position": 112,
+  "biome_horizontal_position_left": false,
+  "biome_items": [
+    "minecraft:map",
+    "minecraft:filled_map",
+    "minecraft:empty_map",
+    "map_atlases:atlas",
+    "map_atlases:end_atlas",
+    "map_atlases:nether_atlas",
+    "naturescompass:naturescompass",
+    "antiqueatlas:antique_atlas"
+  ],
+  "season_items": [
+    "sereneseasons:calendar",
+    "seasonsextras:season_calendar",
+    "eclipticseasons:calendar"
+  ],
+  "speed_enable": true,
+  "speed_vertical_position": 137,
+  "speed_horizontal_position_left": true,
+  "speed_colour": 13090689,
+  "speed_items": [
+    "oreganized:speedometer",
+    "speedometer:speedometer"
+  ],
+  "compat_oreganized_speed": true,
+  "compat_jade": false,
+  "compat_waila_items": [
+    "minecraft:spyglass",
+    "create:goggles"
+  ],
+  "compat_map_atlases": false,
+  "compat_serene_seasons": true,
+  "compat_fabric_seasons": true,
+  "compat_simple_seasons": true,
+  "wind_enable": true,
+  "wind_icons": true,
+  "wind_vertical_position": 90,
+  "wind_horizontal_position_left": true,
+  "wind_colour": 10254644,
+  "compat_breezy": true,
+  "wind_items": [
+    "breezy:gust_gauge"
+  ],
+  "compat_dead_reckoning": true
+}

overrides/config/trimmable_tools.json

@@ -0,0 +1,46 @@
+{
+  "tool_types": {
+    "trimmable_tools:sword": "#minecraft:swords",
+    "trimmable_tools:axe": "#minecraft:axes",
+    "trimmable_tools:shovel": "#minecraft:shovels",
+    "trimmable_tools:hoe": "#minecraft:hoes",
+    "trimmable_tools:pickaxe": "#minecraft:pickaxes",
+    "trimmable_tools:paxel": "#mc_rebalance:paxels"
+  },
+  "darker_materials": {
+    "diamond": [
+      "minecraft:diamond_axe",
+      "minecraft:diamond_hoe",
+      "minecraft:diamond_pickaxe",
+      "minecraft:diamond_shovel",
+      "minecraft:diamond_sword",
+      "mc_rebalance:diamond_paxel"
+    ],
+    "netherite": [
+      "minecraft:netherite_axe",
+      "minecraft:netherite_hoe",
+      "minecraft:netherite_pickaxe",
+      "minecraft:netherite_shovel",
+      "minecraft:netherite_sword",
+      "mc_rebalance:netherite_paxel"
+    ],
+    "gold": [
+      "minecraft:golden_axe",
+      "minecraft:golden_hoe",
+      "minecraft:golden_pickaxe",
+      "minecraft:golden_shovel",
+      "minecraft:golden_sword",
+      "mc_rebalance:golden_paxel"
+    ],
+    "iron": [
+      "minecraft:iron_axe",
+      "minecraft:iron_hoe",
+      "minecraft:iron_pickaxe",
+      "minecraft:iron_shovel",
+      "minecraft:iron_sword",
+      "mc_rebalance:iron_paxel"
+    ]
+  },
+  "extra_patterns": [],
+  "extra_materials": []
+}

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/recipe/clock.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "equipment",
+  "key": {
+    "#": {
+      "item": "minecraft:copper_ingot"
+    },
+    "X": {
+      "item": "minecraft:redstone"
+    }
+  },
+  "pattern": [
+    " # ",
+    "#X#",
+    " # "
+  ],
+  "result": {
+    "count": 1,
+    "id": "minecraft:clock"
+  }
+}

overrides/resources/datapack/required/bki_override/data/bki/function/died.mcfunction

@@ -0,0 +1,50 @@
+# Main function
+
+# Reset for the future
+advancement revoke @s only bki:player_death
+
+# Remove everything that has a curse
+clear @s *[enchantments~[{enchantments: "vanishing_curse"}]]
+
+
+# Drop xp
+# All the XP is dropped and percentage that remains at the place of death depends on the adjustable value (see load or reset function)
+function bki:xp_calculations
+
+# Items before doing something with them to know what is missing after
+function bki:get_list_before
+
+# Clear items with: components:{"minecraft:custom_data":{always_drop:1b}}
+clear @s *[minecraft:custom_data~{always_drop:1b}]
+
+# Items left after previous operation
+function bki:get_list_after
+
+# Subtract the lists to know what items have to be summon
+# Before - after
+# Make copy of list after as it will be deleted during the recursion and is necessary later
+data modify storage bki:bki items.after_copy set from storage bki:bki items.after
+# Execute if list not empty
+execute if data storage bki:bki items.after_copy[0] run function bki:recursive/sl_b-a
+
+# Remove from future checking items with this tag
+data remove storage bki:bki items.after[{components:{"minecraft:custom_data":{never_drop:1b}}}]
+
+
+# Make copy of list after as it will be deleted during the recursion and is necessary later
+data modify storage bki:bki safe.list_copy set from storage bki:bki safe.list
+# Execute if list not empty
+execute if data storage bki:bki items.after[0] run function bki:recursive/sl_a-safe
+
+# Summon items that were already cleared
+execute if data storage bki:bki items.before[0] run function bki:recursive/summon_cleared
+
+# Now we are left with the list items.after which contains items which dropped amount is based on #items_dropped value (see load or reset function)
+# The last step is to clear them from the inventory and summon the items
+execute if data storage bki:bki items.after[0] run function bki:recursive/drop_rest
+
+# Clean up the data
+data remove storage bki:bki drop
+data remove storage bki:bki operation
+data remove storage bki:bki items
+data remove storage bki:bki safe.list_copy

overrides/resources/datapack/required/bki_override/data/bki/function/reset_safe.mcfunction

@@ -6,6 +6,10 @@
 data modify storage bki:bki safe.list set value [\
   "minecraft:elytra",\
   "minecraft:turtle_helmet",\
+  "minecraft:bow",\
+  "minecraft:crossbow",\
+  "minecraft:trident",\
+  "minecraft:mace",\
   "minecraft:wooden_shovel",\
   "minecraft:wooden_pickaxe",\
   "minecraft:wooden_axe",\

server-files/start.bat

@@ -0,0 +1 @@
+java -Xmx3G -jar fabric-server.jar --nogui

server-files/start.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+java -Xmx3G -jar fabric-server.jar --nogui