[2.0.0-rc.2] More bugfixes

Patbox · Feb 5, 2022 · 60d871f · 60d871f
1 parent ef10557
commit 60d871f
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -61,7 +61,7 @@ dependencies {
 	modImplementation include("eu.pb4:sgui:1.0.0-rc6+1.18-pre5")
 	modImplementation include("eu.pb4:hologram-api:0.2.1+1.18-pre5")
 	modImplementation include("eu.pb4:placeholder-api:1.1.3+1.17.1")
-	modImplementation include("eu.pb4:polymer:0.2.0-beta.21+1.18.1")
+	modImplementation include("eu.pb4:polymer:0.2.0-beta.22+1.18.1")
 	modImplementation include("fr.catcore:server-translations-api:1.4.8+1.18-pre1")
 	modImplementation include("me.lucko:fabric-permissions-api:0.1-SNAPSHOT")
 

diff --git a/gradle.properties b/gradle.properties
@@ -8,10 +8,10 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.12.8
 
 	#Fabric api
-	fabric_version=0.44.0+1.18
+	fabric_version=0.46.1+1.18
 
 # Mod Properties
-	mod_version = 2.0.0-rc.1+1.18.1
+	mod_version = 2.0.0-rc.2+1.18.1
 	maven_group = eu.pb4
 	archives_base_name = graves
 

diff --git a/src/main/java/eu/pb4/graves/mixin/LivingEntityMixin.java b/src/main/java/eu/pb4/graves/mixin/LivingEntityMixin.java
@@ -133,7 +133,7 @@ private void replaceWithGrave(DamageSource source, CallbackInfo ci) {
                                         GraveUtils.spawnExp(world, Vec3d.ofCenter(gravePos), finalExperience);
                                     }
                                     text2 = config.creationFailedGraveMessage;
-                                    var droppedItems = DefaultedList.ofSize(0, ItemStack.EMPTY);
+                                    var droppedItems = DefaultedList.<ItemStack>ofSize(0);
                                     for (var item : items) {
                                         droppedItems.add(item.stack());
                                     }

diff --git a/src/main/java/eu/pb4/graves/other/VanillaInventoryMask.java b/src/main/java/eu/pb4/graves/other/VanillaInventoryMask.java
@@ -18,6 +18,12 @@ public void addToGrave(ServerPlayerEntity player, ItemConsumer consumer) {
                 consumer.addItem(player.getInventory().removeStack(i), i);
             }
         }
+
+        ItemStack itemStack = player.playerScreenHandler.getCursorStack();
+        if (GravesApi.canAddItem(player, itemStack)) {
+            consumer.addItem(itemStack.copy(), -1);
+            player.playerScreenHandler.setCursorStack(ItemStack.EMPTY);
+        }
     }
 
     @Override

diff --git a/src/main/java/eu/pb4/graves/registry/SafeXPEntity.java b/src/main/java/eu/pb4/graves/registry/SafeXPEntity.java
@@ -9,6 +9,7 @@
 import net.minecraft.entity.ExperienceOrbEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
@@ -33,10 +34,33 @@ public static void spawn(ServerWorld world, Vec3d pos, int amount) {
     @Override
     public void onPlayerCollision(PlayerEntity player) {
         if (!this.world.isClient) {
+            // Clones vanilla logic to make sure other mods don't modify it
             if (player.experiencePickUpDelay == 0) {
                 player.experiencePickUpDelay = 2;
                 player.sendPickup(this, 1);
-                player.addExperience(this.getExperienceAmount());
+                var experience = this.getExperienceAmount();
+
+                player.addScore(experience);
+                player.experienceProgress += (float)experience / (float)player.getNextLevelExperience();
+                player.totalExperience = MathHelper.clamp(player.totalExperience + experience, 0, 2147483647);
+
+                while(player.experienceProgress < 0.0F) {
+                    float f = player.experienceProgress * (float)player.getNextLevelExperience();
+                    if (player.experienceLevel > 0) {
+                        player.addExperienceLevels(-1);
+                        player.experienceProgress = 1.0F + f / (float)player.getNextLevelExperience();
+                    } else {
+                        player.addExperienceLevels(-1);
+                        player.experienceProgress = 0.0F;
+                    }
+                }
+
+                while(player.experienceProgress >= 1.0F) {
+                    player.experienceProgress = (player.experienceProgress - 1.0F) * (float)player.getNextLevelExperience();
+                    player.addExperienceLevels(1);
+                    player.experienceProgress /= (float)player.getNextLevelExperience();
+                }
+
                 this.discard();
             }
         }