Fix merged orbs being counted only once

Author: Rakambda

common/src/main/java/fr/rakambda/overpoweredmending/common/OverpoweredMendingCommon.java

@@ -51,14 +51,17 @@ public boolean onXpPickedUp(@NonNull IPlayer player, @NonNull IXpOrb xpOrb){
 		while(!item.isEmpty() && xpAmount > 0){
 			var realRepair = Math.min(xpAmount * DURABILITY_PER_XP, item.getDamageValue());
 			xpAmount -= realRepair / DURABILITY_PER_XP;
-			xpOrb.setExperienceAmount(xpAmount);
 			item.setDamageValue(item.getDamageValue() - realRepair);
 			item = getDamagedEnchantedItem(player);
 		}
 		if(xpAmount > 0){
 			player.addExperience(xpAmount);
 		}
-		xpOrb.discard();
+		
+		xpOrb.setCount(xpOrb.getCount() - 1);
+		if(xpOrb.getCount() <= 0){
+			xpOrb.discard();
+		}
 		return true;
 	}
 

common/src/main/java/fr/rakambda/overpoweredmending/common/wrapper/IFriendlyByteBuf.java

@@ -1,14 +1,10 @@
 package fr.rakambda.overpoweredmending.common.wrapper;
 
 public interface IFriendlyByteBuf extends IWrapper{
-	void writeDouble(double value);
-	
 	void writeInteger(int value);
 
 	void writeBoolean(boolean value);
 
-	double readDouble();
-	
 	int readInteger();
 
 	boolean readBoolean();

common/src/main/java/fr/rakambda/overpoweredmending/common/wrapper/ILevel.java

@@ -1,14 +1,11 @@
 package fr.rakambda.overpoweredmending.common.wrapper;
 
-import org.jspecify.annotations.NonNull;
-
 public interface IXpOrb extends IWrapper{
 	int getExperienceAmount();
 
-	void setExperienceAmount(int amount);
+	int getCount();
 
-	void discard();
+	void setCount(int count);
 
-	@NonNull
-	ILevel getLevel();
+	void discard();
 }

common/src/main/java/fr/rakambda/overpoweredmending/common/wrapper/IXpOrb.java

@@ -30,6 +30,8 @@ loom {
     val modId: String by project
 
     splitEnvironmentSourceSets()
+    
+    accessWidenerPath.set(file("src/main/resources/fabric.accesstransformer.cfg"))
 
     mods {
         create(modId) {

fabric/build.gradle.kts

@@ -14,11 +14,6 @@ public class FriendlyByteBufWrapper implements IFriendlyByteBuf{
 	@Getter
 	private final FriendlyByteBuf raw;
 
-	@Override
-	public void writeDouble(double value){
-		raw.writeDouble(value);
-	}
-	
 	@Override
 	public void writeInteger(int value){
 		raw.writeInt(value);
@@ -29,11 +24,6 @@ public void writeBoolean(boolean value){
 		raw.writeBoolean(value);
 	}
 
-	@Override
-	public double readDouble(){
-		return raw.readDouble();
-	}
-	
 	@Override
 	public int readInteger(){
 		return raw.readInt();

fabric/src/main/java/fr/rakambda/overpoweredmending/fabric/common/FriendlyByteBufWrapper.java

@@ -1,6 +1,5 @@
 package fr.rakambda.overpoweredmending.fabric.wrapper;
 
-import fr.rakambda.overpoweredmending.common.wrapper.ILevel;
 import fr.rakambda.overpoweredmending.common.wrapper.IXpOrb;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -21,17 +20,17 @@ public int getExperienceAmount(){
 	}
 
 	@Override
-	public void setExperienceAmount(int amount){
+	public int getCount(){
+		return raw.count;
 	}
 
 	@Override
-	public void discard(){
-		raw.discard();
+	public void setCount(int count){
+		raw.count = count;
 	}
 
 	@Override
-	@NonNull
-	public ILevel getLevel(){
-		return new LevelWrapper(raw.level());
+	public void discard(){
+		raw.discard();
 	}
 }

fabric/src/main/java/fr/rakambda/overpoweredmending/fabric/wrapper/LevelWrapper.java

@@ -0,0 +1,2 @@
+classTweaker v1 official
+accessible field net/minecraft/world/entity/ExperienceOrb count I

fabric/src/main/java/fr/rakambda/overpoweredmending/fabric/wrapper/XpOrbWrapper.java

@@ -14,11 +14,6 @@ public class FriendlyByteBufWrapper implements IFriendlyByteBuf{
 	@Getter
 	private final FriendlyByteBuf raw;
 
-	@Override
-	public void writeDouble(double value){
-		raw.writeDouble(value);
-	}
-	
 	@Override
 	public void writeInteger(int value){
 		raw.writeInt(value);
@@ -29,11 +24,6 @@ public void writeBoolean(boolean value){
 		raw.writeBoolean(value);
 	}
 
-	@Override
-	public double readDouble(){
-		return raw.readDouble();
-	}
-	
 	@Override
 	public int readInteger(){
 		return raw.readInt();