CHANGELOG.md

@@ -5,18 +5,6 @@ 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.5.0]
-
-### Added
-- Zombies sprint when within 12 blocks of their target
-- Piglins deal less base damage (still higher than vanilla due to gold and axe changes)
-
-### Fixed
-- Copper bars and trapdoors had the same recipe
-- Magma Cube melee attacks no longer apply every tick with no cooldown
-- Fixed Blazes instantly killing players hanging around spawners.
-- Copper gear wasn't being added to the recipe book
-
 ## [2.4.0]
 
 ### Added
@@ -92,8 +80,7 @@ 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.5.0...HEAD
+[unreleased]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.4.0...HEAD
-[2.5.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.4.0...2.5.0
 [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

export-pack.sh

@@ -40,21 +40,11 @@ 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)
 
-if [ $? -ne 0 ]; then
-	echo "Error during mod clone/update, do you have internet?"
-	exit 1
-fi
-
 # Compile the 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)
 
-if [ $? -ne 0 ]; then
-	echo "Error during mod compilation"
-	exit 1
-fi
-
 # Clean up old mod files
 rm -f "${basedir}/overrides/mods/mc_rebalance-"*".jar"
 cp "$(find "${basedir}/deps/mc_rebalance/build/libs" -regex "${basedir}/deps\/mc_rebalance\/build\/libs\/mc_rebalance-[0-9\.]+\.jar")" "${basedir}/overrides/mods"
@@ -100,5 +90,4 @@ if [ $? -eq 0 ]; then
 	echo "Successfully exported the client modpack to ${basedir}/release/MC_Rebalance_${version}.mrpack"
 else
 	echo "An unknown error occured while zipping the pack"
-	exit 1
 fi

modrinth.index.json

@@ -6,7 +6,7 @@
   "formatVersion": 1,
   "game": "minecraft",
   "name": "MC Rebalanced",
-  "versionId": "2.5.0",
+  "versionId": "2.4.0",
   "files": [
     {
       "downloads": [

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/combat/copper_boots.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_copper_ingot": {
-      "conditions": {
-        "items": [
-          {
-            "items": "minecraft:copper_ingot"
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:copper_boots"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_the_recipe",
-      "has_copper_ingot"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:copper_boots"
-    ]
-  }
-}

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/combat/copper_chestplate.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_copper_ingot": {
-      "conditions": {
-        "items": [
-          {
-            "items": "minecraft:copper_ingot"
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:copper_chestplate"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_the_recipe",
-      "has_copper_ingot"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:copper_chestplate"
-    ]
-  }
-}

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/combat/copper_helmet.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_copper_ingot": {
-      "conditions": {
-        "items": [
-          {
-            "items": "minecraft:copper_ingot"
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:copper_helmet"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_the_recipe",
-      "has_copper_ingot"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:copper_helmet"
-    ]
-  }
-}

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/combat/copper_leggings.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_copper_ingot": {
-      "conditions": {
-        "items": [
-          {
-            "items": "minecraft:copper_ingot"
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:copper_leggings"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_the_recipe",
-      "has_copper_ingot"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:copper_leggings"
-    ]
-  }
-}

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/combat/copper_spear.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_copper_ingot": {
-      "conditions": {
-        "items": [
-          {
-            "items": "#minecraft:copper_tool_materials"
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:copper_spear"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_the_recipe",
-      "has_copper_ingot"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:copper_spear"
-    ]
-  }
-}

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/combat/copper_sword.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_copper_ingot": {
-      "conditions": {
-        "items": [
-          {
-            "items": "#minecraft:copper_tool_materials"
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:copper_sword"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_the_recipe",
-      "has_copper_ingot"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:copper_sword"
-    ]
-  }
-}

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/tools/copper_axe.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_copper_ingot": {
-      "conditions": {
-        "items": [
-          {
-            "items": "#minecraft:copper_tool_materials"
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:copper_axe"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_the_recipe",
-      "has_copper_ingot"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:copper_axe"
-    ]
-  }
-}

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/tools/copper_hoe.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_copper_ingot": {
-      "conditions": {
-        "items": [
-          {
-            "items": "#minecraft:copper_tool_materials"
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:copper_hoe"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_the_recipe",
-      "has_copper_ingot"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:copper_hoe"
-    ]
-  }
-}

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/tools/copper_pickaxe.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_copper_ingot": {
-      "conditions": {
-        "items": [
-          {
-            "items": "#minecraft:copper_tool_materials"
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:copper_pickaxe"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_the_recipe",
-      "has_copper_ingot"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:copper_pickaxe"
-    ]
-  }
-}

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/tools/copper_shovel.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_copper_ingot": {
-      "conditions": {
-        "items": [
-          {
-            "items": "#minecraft:copper_tool_materials"
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:copper_shovel"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_the_recipe",
-      "has_copper_ingot"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:copper_shovel"
-    ]
-  }
-}

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

@@ -1,18 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "category": "misc",
-  "key": {
-    "I": {
-      "item": "minecraft:copper_ingot"
-    }
-  },
-  "pattern": [
-    "III",
-    "III",
-    "III"
-  ],
-  "result": {
-    "count": 24,
-    "id": "minecraft:copper_bars"
-  }
-}

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

@@ -1,17 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "category": "equipment",
-    "pattern": [
-        "C C",
-        "C C"
-    ],
-    "key": {
-        "C": {
-            "item": "minecraft:copper_ingot"
-        }
-    },
-    "result": {
-        "id": "minecraft:copper_boots",
-        "count": 1
-    }
-}

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

@@ -1,18 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "category": "equipment",
-    "pattern": [
-        "CCC",
-        "C C",
-        "C C"
-    ],
-    "key": {
-        "C": {
-            "item": "minecraft:copper_ingot"
-        }
-    },
-    "result": {
-        "id": "minecraft:copper_leggings",
-        "count": 1
-    }
-}

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/tags/item/copper_tool_materials.json

@@ -1,5 +0,0 @@
-{
-  "values": [
-    "minecraft:copper_ingot"
-  ]
-}