Merge branch 'jss2a98aj:1.7.10' into 1.7.10

README.md

@@ -1,11 +1,36 @@
-Baubles
-=======
+# Baubles Expanded
 
-A mod api that adds up to twenty bauble slots to the players inventory.
+A fork of the 1.7.10 version of Azanor's Baubles mod with extra features. Backwards compatible with mods made using the original. Baubles Expanded adds the same four slots as the original out of the box, but can have up to twenty in total. Other mods can add entirely new slot types and allow a bauble to be placed in more than one type of slot.
 
-The mod has no real content - the idea is that other mods will use this one and its API to add their own baubles.
+Downloads are available from tags and on [Modrinth](https://modrinth.com/mod/baubles-expanded).
 
-The slots added by default are an amulet, belt, and two ring slots.
+# New Features
+
+## For Users
+
+- Override the slots assigned by default through the config.
+- Set Soulbound enchantment IDs in the config so moded Soulbound enchantments function as expected. Works great with [Ars Magica](https://github.com/TCLProject/ArsMagica2-5)!
+- Backwards compatibility with mods made for the original.
+
+##  For Modders
+
+- Register brand new slot types.
+- Add slots to the inventory.
+- Create baubles that can go in more than one slot type.
+
+# Mods Using New Features
+
+- [Et Futurum Requiem](https://github.com/Roadhog360/Et-Futurum-Requiem) (optional wing slot for the Elytra)
+
+# Known Issues
+
+- Due to a vanilla bug enchanted items can cause inventory slots and items to render incorrectly. This is fixed by [BugTorch](https://github.com/jss2a98aj/BugTorch).
+- Replacing the original four slots or adding more slots of the those types may reduce backwards compatibility.
+- The Bauble Case item from Botania cannot access more than the first four slots. This will be fixed in an upcoming fork of Botania.
+
+## Special Thanks
+
+- Azanor and contributors for creating and maintaining the original mod for as long as they did.
+- TechnoParadox for creating the icon.
 
 Baubles is distributed under the Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0) license.
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/baubles/api/expanded/BaubleExpandedSlots.java

@@ -110,7 +110,7 @@ public class BaubleExpandedSlots {
 			if(total > maximumOfType) {
 				total -= maximumOfType;
 				for(int i = 0; i < total; i++) {
-					for(int slotToCheck = slotsCurrentlyUsed(); slotToCheck > 0; slotToCheck--) {
+					for(int slotToCheck = slotsCurrentlyUsed(); slotToCheck >= 0; slotToCheck--) {
 						if(assignedSlots[slotToCheck].equals(type)) {
 							for(int slotToMove = slotToCheck + 1; slotToMove < slotLimit; slotToMove++) {
 								assignedSlots[slotToMove - 1] = assignedSlots[slotToMove];
@@ -156,7 +156,7 @@ public class BaubleExpandedSlots {
 	*/
 	public static boolean tryUnassignSlotOfType(String type) {
 		if(newSlotsRemaining < slotLimit && type != null && !type.equals(unknownType) && Loader.instance().getLoaderState() == LoaderState.PREINITIALIZATION) {
-			for(int slotToCheck = slotsCurrentlyUsed(); slotToCheck > 0; slotToCheck--) {
+			for(int slotToCheck = slotsCurrentlyUsed(); slotToCheck >= 0; slotToCheck--) {
 				if(assignedSlots[slotToCheck].equals(type)) {
 					for(int slotToMove = slotToCheck + 1; slotToMove < slotLimit; slotToMove++) {
 						assignedSlots[slotToMove - 1] = assignedSlots[slotToMove];

src/main/resources/assets/baubles/lang/en_US.lang

@@ -29,5 +29,6 @@ slot.leggings=§aLeggings§7
 slot.quiver=§aQuiver§7
 slot.ring=§aRing§7
 slot.shield=§aShield§7
+slot.universal=§aUniversal§7
 slot.unknown=§aUnknown§7
 slot.wings=§aWings§7