% Allowed Modular upgrades to stack up to 64.

$ Fixed upgrade stacks being consumed in one go.
$ Fixed Icon not correctly aligning to bauble type.
+ Added a matching ring bauble texture.

3 files changed, 15 insertions, 21 deletions

diff --git a/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java b/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java
index a77735eda9..00eea9eaeb 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java
@@ -360,7 +360,7 @@ public class ModularBauble extends BaseBauble{
 		}
 		else {
 			mTextureAmulet = register.registerIcon("miscutils" + ":" + "itemAmulet");
-			mTextureRing = register.registerIcon("baubles" + ":" + "ring");
+			mTextureRing = register.registerIcon("miscutils" + ":" + "itemRingWearable");
 			mTextureBelt = register.registerIcon("miscutils" + ":" + "itemBelt");
 		}
 		iconArray[0] = mTextureAmulet;
@@ -370,23 +370,7 @@ public class ModularBauble extends BaseBauble{
 	}
 
 	@Override
-	public void onWornTick(ItemStack stack, EntityLivingBase player) {
-		int mTemp = ModularArmourUtils.getBaubleTypeID(stack);		
-		SetBaubleType(ModularArmourUtils.getBaubleByID(mTemp));
-		
-		if (stack.getItemDamage() != 0 && ModularArmourUtils.getBaubleType(stack) == BaubleType.AMULET){
-			this.setDamage(stack, 0);
-		}
-		else if (stack.getItemDamage() != 1 && ModularArmourUtils.getBaubleType(stack) == BaubleType.RING){
-			this.setDamage(stack, 1);
-		}
-		else if (stack.getItemDamage() != 2 && ModularArmourUtils.getBaubleType(stack) == BaubleType.BELT){
-			this.setDamage(stack, 2);
-		}
-		else {
-			this.setDamage(stack, 0);
-		}
-		
+	public void onWornTick(ItemStack stack, EntityLivingBase player) {	
 		super.onWornTick(stack, player);
 	}
 
diff --git a/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java b/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java
index 042700d352..5b36bc48ff 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java
@@ -51,6 +51,6 @@ public class SlotModularBaubleUpgrades extends Slot{
 
 	@Override
 	public int getSlotStackLimit() {
-		return 1;
+		return 64;
 	}
 }
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
index 39bef9b11a..15116e8fc1 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
@@ -90,8 +90,16 @@ public class TileEntityModularityTable extends TileEntity {
 
 						if (removeInputA && removeInputB){
 							Utils.LOG_INFO("set new Modular bauble");
+							if (this.inventoryOutputs.getStackInSlot(1).stackSize > 1){
+								ItemStack mTempStack = this.inventoryOutputs.getStackInSlot(1);
+								mTempStack.stackSize--;
+								this.inventoryOutputs.setInventorySlotContents(1, mTempStack);
+							}
+							else {
+								this.inventoryOutputs.setInventorySlotContents(1, null);
+								
+							}
 							this.inventoryOutputs.setInventorySlotContents(0, null);
-							this.inventoryOutputs.setInventorySlotContents(1, null);
 							this.inventoryOutputs.setInventorySlotContents(2, tBauble);
 						}	
 						else {
@@ -166,7 +174,9 @@ public class TileEntityModularityTable extends TileEntity {
 				Entry<ItemStack, BT> pair = it.next();
 				if (pair.getKey().getItem() == tStack.getItem()
 						&& pair.getKey().getItemDamage() == tStack.getItemDamage()){
-					ModularArmourUtils.setBaubleType(tBauble, mValidUpgradeListFormChange.get(tStack).getThis());
+					ModularArmourUtils.setBaubleType(tBauble, pair.getValue());
+					tBauble.setItemDamage(ModularArmourUtils.getBaubleTypeID(tBauble));
+					//ModularArmourUtils.setBaubleType(tBauble, mValidUpgradeListFormChange.get(tStack).getThis());
 					return true;
 				}
 			}