diff --git a/gradle.properties b/gradle.properties index c28a4a43..6a6f35ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=20w48a - yarn_mappings=20w48a+build.1 + yarn_mappings=20w48a+build.7 loader_version=0.10.8 # Mod Properties diff --git a/src/main/java/carpet/mixins/ExperienceOrbEntityMixin.java b/src/main/java/carpet/mixins/ExperienceOrbEntityMixin.java index 3e3df2d8..e07d3d49 100644 --- a/src/main/java/carpet/mixins/ExperienceOrbEntityMixin.java +++ b/src/main/java/carpet/mixins/ExperienceOrbEntityMixin.java @@ -22,7 +22,7 @@ public abstract class ExperienceOrbEntityMixin implements ExperienceOrbInterface { @Shadow private int amount; - @Shadow private int field_27009; + @Shadow private int pickingCount; @Shadow protected abstract int getMendingRepairCost(int repairAmount); @@ -59,12 +59,12 @@ public abstract class ExperienceOrbEntityMixin implements ExperienceOrbInterface @Override public int getCount() { - return field_27009; + return pickingCount; } @Override public void setCount(int i) { - field_27009 = i; + pickingCount = i; } @Inject(method = "onPlayerCollision", at = @At("HEAD")) @@ -78,9 +78,9 @@ public abstract class ExperienceOrbEntityMixin implements ExperienceOrbInterface void addXP(PlayerEntity playerEntity, int experience) { playerEntity.addExperience(experience); - if (CarpetSettings.xpNoCooldown) while(field_27009 > 1) + if (CarpetSettings.xpNoCooldown) while(pickingCount > 1) { - field_27009 --; + pickingCount --; playerEntity.addExperience(experience); } } @@ -92,10 +92,10 @@ public abstract class ExperienceOrbEntityMixin implements ExperienceOrbInterface )) void cancelApplication(PlayerEntity player, CallbackInfo ci, Map.Entry entry, ItemStack itemStack) { - if (CarpetSettings.xpfix && field_27009 > 1) + if (CarpetSettings.xpfix && pickingCount > 1) { int i = Math.min(getMendingRepairAmount(this.amount), itemStack.getDamage()); - field_27009--; + pickingCount--; itemStack.setDamage(itemStack.getDamage() - i); // cancel effects of mending application ci.cancel();