[fix] Fix Crushing Wheel killed entities do not drop exp & add config

Author: MarbleGateKeeper

Diff for: src/main/java/plus/dragons/createenchantmentindustry/common/kinetics/grindstone/GrindstoneDrainBlockEntity.java

@@ -30,8 +30,6 @@
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 import java.util.List;
 import java.util.Optional;
-
-import com.simibubi.create.foundation.item.ItemHelper;
 import net.createmod.catnip.math.VecHelper;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

Diff for: src/main/java/plus/dragons/createenchantmentindustry/config/CEIKineticsConfig.java

@@ -28,6 +28,9 @@ public class CEIKineticsConfig extends ConfigBase {
     public final ConfigBool deployerCollectXp = b(true, "deployerCollectXp", Comments.deployerCollectXp);
     public final ConfigBool deployerMendItem = b(true, "deployerMendItem", Comments.deployerMendItem);
     public final ConfigBool deployerSweepAttack = b(true, "deployerSweepAttack", Comments.deployerSweepAttack);
+    public final ConfigBool crushingWheelKillDropXp = b(true, "crushingWheelKillDropXp", Comments.crushingWheelKillDropXp);
+    public final ConfigFloat crushingWheelKillDropXpRate = f(0.3f,0,1, "crushingWheelKillDropXpRate", Comments.crushingWheelKillDropXpRate);
+    public final ConfigFloat crushingWheelKillDropXpScale = f(0.34f,0,1, "crushingWheelKillDropXpScale", Comments.crushingWheelKillDropXpScale);
     public final CEIStressConfig stressValues = nested(0, CEIStressConfig::new, Comments.stress);
 
     @Override
@@ -44,5 +47,8 @@ static class Comments {
         static final String deployerCollectXp = "Whether Deployer collect dropped experience as Experience Nugget.";
         static final String deployerMendItem = "Whether Mending enchantment applies to Deployer held item (Needs deployerCollectXp = true).";
         static final String deployerSweepAttack = "Whether Deployer can perform sweep attack.";
+        static final String crushingWheelKillDropXp = "Whether Crushing Wheel killed entities should drop experience.";
+        static final String crushingWheelKillDropXpRate = "Possibility for Crushing Wheel killed entities drop experience.";
+        static final String crushingWheelKillDropXpScale = "Scale for experience dropped from Crushing Wheel killed entities.";
     }
 }

Diff for: src/main/java/plus/dragons/createenchantmentindustry/mixin/CrushingWheelControllerBlockEntityMixin.java

@@ -0,0 +1,57 @@
+package plus.dragons.createenchantmentindustry.mixin;
+
+import com.simibubi.create.AllItems;
+import com.simibubi.create.content.kinetics.crusher.CrushingWheelControllerBlock;
+import com.simibubi.create.content.kinetics.crusher.CrushingWheelControllerBlockEntity;
+import net.createmod.catnip.math.VecHelper;
+import net.minecraft.core.Direction;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.phys.Vec3;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import plus.dragons.createenchantmentindustry.config.CEIConfig;
+
+@Mixin(CrushingWheelControllerBlockEntity.class)
+public class CrushingWheelControllerBlockEntityMixin {
+
+    @Shadow(remap = false)
+    public Entity processingEntity;
+
+    @Inject(method = "tick",
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;setPos(DDD)V", shift = At.Shift.AFTER))
+    private void injected(CallbackInfo ci) {
+        if(CEIConfig.kinetics().crushingWheelKillDropXp.get() && !processingEntity.isAlive() && processingEntity instanceof LivingEntity livingEntity){
+            if(!(processingEntity.level() instanceof ServerLevel serverLevel)) return;
+            int reward = Math.max((int) Math.floor(livingEntity.getExperienceReward(serverLevel,processingEntity) * CEIConfig.kinetics().crushingWheelKillDropXpScale.get()),1);
+            if(reward >= 1000 || Math.random( ) < CEIConfig.kinetics().crushingWheelKillDropXpRate.get()){
+                int count = reward/3 + ((Math.random()<(reward%3/3f))? 1: 0);
+                if(count!=0){
+                    var self = (CrushingWheelControllerBlockEntity)(Object)this;
+                    Vec3 centerPos = VecHelper.getCenterOf(self.getBlockPos());
+                    Direction facing = self.getBlockState().getValue(CrushingWheelControllerBlock.FACING);
+                    int offset = facing.getAxisDirection()
+                            .getStep();
+                    Vec3 outSpeed = new Vec3((facing.getAxis() == Direction.Axis.X ? 0.25D : 0.0D) * offset,
+                            offset == 1 ? (facing.getAxis() == Direction.Axis.Y ? 0.5D : 0.0D) : 0.0D,
+                            (facing.getAxis() == Direction.Axis.Z ? 0.25D : 0.0D) * offset);
+                    Vec3 outPos = centerPos.add((facing.getAxis() == Direction.Axis.X ? .55f * offset : 0f),
+                            (facing.getAxis() == Direction.Axis.Y ? .55f * offset : 0f), (facing.getAxis() == Direction.Axis.Z ? .55f * offset : 0f));
+                    var expItem = new ItemEntity(processingEntity.level(),outPos.x(),outPos.y(),outPos.z(), new ItemStack(AllItems.EXP_NUGGET.get(),count));
+                    expItem.setDeltaMovement(outSpeed);
+                    expItem.getPersistentData()
+                            .put("BypassCrushingWheel", NbtUtils.writeBlockPos(self.getBlockPos()));
+                    processingEntity.level().addFreshEntity(expItem);
+                }
+            }
+        }
+
+    }
+}

Diff for: src/main/resources/create_enchantment_industry.mixins.json

@@ -7,6 +7,7 @@
   "mixins": [
     "ConnectivityHandlerMixin",
     "CreateNBTProcessorsMixin",
+    "CrushingWheelControllerBlockEntityMixin",
     "DeployerFakePlayerMixin",
     "DeployerHandlerMixin",
     "EnchantmentHelperMixin",