Graaaaah

Author: SammySemicolon

gradle.properties

@@ -22,7 +22,7 @@ mod_authors=Sammy Semicolon
 mod_description=A dark magic mod focused on soul and spirit magic.
 
 # Mandatory
-lodestone_version=1.8.3.669
+lodestone_version=1.8.3.677
 lodestone_version_range=[1.8.3,)
 curios_version=9.3.1+1.21.1
 

src/main/java/com/sammy/malum/client/renderer/block/SpiritAltarRenderer.java

@@ -16,6 +16,7 @@
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import org.joml.Vector3f;
+import team.lodestar.lodestone.modules.toolkit.client.ItemStackDisplayDataRenderer;
 import team.lodestar.lodestone.modules.toolkit.inventory.LodestoneItemStackHandler;
 
 import static net.minecraft.client.renderer.texture.OverlayTexture.NO_OVERLAY;
@@ -26,35 +27,10 @@ public SpiritAltarRenderer(BlockEntityRendererProvider.Context context) {
 
     @Override
     public void render(SpiritAltarBlockEntity blockEntityIn, float partialTicks, PoseStack poseStack, MultiBufferSource bufferIn, int combinedLightIn, int combinedOverlayIn) {
-        Level level = Minecraft.getInstance().level;
-        ItemRenderer itemRenderer = Minecraft.getInstance().getItemRenderer();
-        LodestoneItemStackHandler inventory = blockEntityIn.spiritInventory;
-        int spiritsRendered = 0;
-        if (!inventory.isEmpty()) {
-            for (int i = 0; i < inventory.getSlotCount(); i++) {
-                ItemStack item = inventory.getStackInSlot(i);
-                if (item.getItem() instanceof SpiritShardItem shardItem) {
-                    poseStack.pushPose();
-                    Vector3f offset = blockEntityIn.getSpiritItemOffset(spiritsRendered++, partialTicks).toVector3f();
-                    poseStack.translate(offset.x(), offset.y(), offset.z());
-                    FloatingItemRenderer.renderSpiritGlimmer(poseStack, shardItem.getSpiritHolder(), partialTicks);
-                    poseStack.mulPose(Axis.YP.rotationDegrees(((level.getGameTime() % 360) + partialTicks) * 3));
-                    poseStack.scale(0.5f, 0.5f, 0.5f);
-                    itemRenderer.renderStatic(item, ItemDisplayContext.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, level, 0);
-                    poseStack.popPose();
-                }
-            }
-        }
-        ItemStack stack = blockEntityIn.inventory.getStackInSlot(0);
-        if (!stack.isEmpty()) {
-            poseStack.pushPose();
-            Vec3 offset = SpiritAltarBlockEntity.ALTAR_ITEM_OFFSET;
-            poseStack.translate(offset.x, offset.y, offset.z);
-            poseStack.mulPose(Axis.YP.rotationDegrees((((level.getGameTime() + partialTicks) * 3) % 360)));
-            poseStack.scale(0.45f, 0.45f, 0.45f);
-            itemRenderer.renderStatic(stack, ItemDisplayContext.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, level, 0);
-            poseStack.popPose();
-        }
+        var renderer = new ItemStackDisplayDataRenderer();
+        renderer.setItemScale(0.45f).render(blockEntityIn.inventory, poseStack, bufferIn, combinedLightIn, partialTicks);
+        renderer.setItemScale(0.5f).render(blockEntityIn.spiritInventory, poseStack, bufferIn, combinedLightIn, partialTicks);
+//      FloatingItemRenderer.renderSpiritGlimmer(poseStack, shardItem.getSpiritHolder(), partialTicks);
     }
 
     @Override

src/main/java/com/sammy/malum/common/block/MalumBlockItemStackHandler.java

@@ -15,6 +15,7 @@
 import team.lodestar.lodestone.helpers.*;
 import team.lodestar.lodestone.modules.toolkit.blockentity.LodestoneBlockEntity;
 import team.lodestar.lodestone.modules.toolkit.inventory.InventoryInteractionResult;
+import team.lodestar.lodestone.modules.toolkit.inventory.ItemStackHandlerItemDisplayData;
 import team.lodestar.lodestone.modules.toolkit.inventory.LodestoneItemStackBlockHandler;
 import team.lodestar.lodestone.modules.toolkit.inventory.LodestoneItemStackHandler;
 

src/main/java/com/sammy/malum/common/block/MalumBlockItemStackHandlerBuilder.java

@@ -4,10 +4,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import team.lodestar.lodestone.modules.toolkit.blockentity.LodestoneBlockEntity;
-import team.lodestar.lodestone.modules.toolkit.inventory.LodestoneItemStackBlockHandler;
-import team.lodestar.lodestone.modules.toolkit.inventory.LodestoneItemStackBlockHandlerBuilder;
-import team.lodestar.lodestone.modules.toolkit.inventory.LodestoneItemStackHandler;
-import team.lodestar.lodestone.modules.toolkit.inventory.LodestoneItemStackHandlerBuilder;
+import team.lodestar.lodestone.modules.toolkit.inventory.*;
 
 import java.util.function.Consumer;
 import java.util.function.Predicate;

src/main/java/com/sammy/malum/common/block/curiosities/spirit_altar/SpiritAltarBlockEntity.java

@@ -2,6 +2,7 @@
 
 import com.sammy.malum.common.block.MalumBlockItemStackHandler;
 import com.sammy.malum.common.block.storage.IMalumSpecialItemAccessPoint;
+import com.sammy.malum.common.block.storage.ItemHolderItemDisplayData;
 import com.sammy.malum.common.recipe.SpiritInfusionRecipe;
 import com.sammy.malum.core.systems.recipe.SpiritBasedRecipeInput;
 import com.sammy.malum.registry.common.MalumParticleEffectTypes;
@@ -17,15 +18,13 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundSource;
-import net.minecraft.util.Mth;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.ItemInteractionResult;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.*;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.*;
 import net.neoforged.neoforge.common.crafting.SizedIngredient;
@@ -34,30 +33,22 @@
 import team.lodestar.lodestone.helpers.*;
 import team.lodestar.lodestone.helpers.block.*;
 import team.lodestar.lodestone.modules.toolkit.blockentity.*;
-import team.lodestar.lodestone.modules.core.easing.Easing;
 import team.lodestar.lodestone.modules.toolkit.inventory.ItemStackMultiHandler;
-import team.lodestar.lodestone.modules.toolkit.inventory.LodestoneItemStackHandler;
 import team.lodestar.lodestone.modules.toolkit.recipe.LodestoneRecipeSearch;
-import team.lodestar.lodestone.modules.toolkit.recipe.LodestoneRecipeType;
 
 import javax.annotation.Nullable;
 import java.util.*;
 
+@SuppressWarnings("NullableProblems")
 public class SpiritAltarBlockEntity extends LodestoneBlockEntity implements IInventoryCapabilityProvider {
 
-    public static final Vec3 ALTAR_ITEM_OFFSET = new Vec3(0.5f, 1.25f, 0.5f);
     public static final int HORIZONTAL_RANGE = 4;
     public static final int VERTICAL_RANGE = 3;
-    private static final int WARMUP_DURATION = 30;
 
     public float speed = 1f;
     public int progress;
     public int idleProgress;
     public boolean isCrafting;
-    public float warmupTimer;
-
-    public float spiritAmount;
-    public float spiritSpin;
 
     public List<BlockPos> acceleratorPositions = new ArrayList<>();
     public List<IAltarAccelerator> accelerators = new ArrayList<>();
@@ -75,6 +66,9 @@ public SpiritAltarBlockEntity(LodestoneBlockEntityType<? extends SpiritAltarBloc
         inventory = MalumBlockItemStackHandler.create(this, 1).noSpirits().onContentsChanged(this::recalculateRecipes).build();
         extrasInventory = MalumBlockItemStackHandler.create(this, 32).noSpirits().build();
         spiritInventory = MalumBlockItemStackHandler.create(this, 9).onlySpirits().onContentsChanged(this::recalculateRecipes).build();
+
+        inventory.attachDisplayData(ItemHolderItemDisplayData::new);
+        spiritInventory.attachDisplayData(SpiritAltarSpiritDisplayData::new);
         inventoryHandler = new ItemStackMultiHandler(inventory, spiritInventory);
     }
 
@@ -88,24 +82,23 @@ public IItemHandler getInventory(Direction direction) {
     }
 
     @Override
-    protected void saveAdditional(CompoundTag compound, HolderLookup.Provider pRegistries) {
-        super.saveAdditional(compound, pRegistries);
-        compound.putFloat("speed", speed);
-        compound.putInt("progress", progress);
-        compound.putInt("idleProgress", idleProgress);
-        compound.putBoolean("isCrafting", isCrafting);
-        compound.putFloat("warmupTimer", warmupTimer);
+    protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
+        super.saveAdditional(tag, registries);
+        tag.putFloat("speed", speed);
+        tag.putInt("progress", progress);
+        tag.putInt("idleProgress", idleProgress);
+        tag.putBoolean("isCrafting", isCrafting);
 
         var acceleratorData = new CompoundTag();
         acceleratorData.putInt("acceleratorAmount", acceleratorPositions.size());
         for (int i = 0; i < acceleratorPositions.size(); i++) {
             acceleratorData.put("acceleratorPosition_" + i, NBTHelper.saveBlockPos(acceleratorPositions.get(i)));
         }
-        compound.put("acceleratorData", acceleratorData);
+        tag.put("acceleratorData", acceleratorData);
 
-        inventory.save(pRegistries, compound);
-        spiritInventory.save(pRegistries, compound, "spiritInventory");
-        extrasInventory.save(pRegistries, compound, "extrasInventory");
+        inventory.save(registries, tag);
+        spiritInventory.save(registries, tag, "spiritInventory");
+        extrasInventory.save(registries, tag, "extrasInventory");
     }
 
     @Override
@@ -114,7 +107,6 @@ public void loadAdditional(CompoundTag compound, HolderLookup.Provider pRegistri
         progress = compound.getInt("progress");
         idleProgress = compound.getInt("idleProgress");
         isCrafting = compound.getBoolean("isCrafting");
-        warmupTimer = compound.getFloat("warmupTimer");
 
         acceleratorPositions.clear();
         accelerators.clear();
@@ -196,19 +188,14 @@ public void serverTick(ServerLevel level) {
 
     @Override
     public void clientTick(Level level) {
-        spiritAmount = Math.max(1, Mth.lerp(0.1f, spiritAmount, spiritInventory.getFilledSlotCount()));
-        spiritSpin += 1 + getSpinUp(Easing.SINE_IN_OUT) * 0.05f + speed * 0.5f;
         SpiritAltarParticleEffects.passiveSpiritAltarParticles(this);
     }
 
     @Override
     public void commonTick(Level level) {
-        if (!possibleRecipes.isEmpty()) {
-            warmupTimer++;
-        } else {
+        if (possibleRecipes.isEmpty()) {
             isCrafting = false;
             progress = 0;
-            warmupTimer = Mth.clamp(warmupTimer - 1, 0, WARMUP_DURATION);
         }
     }
 
@@ -280,9 +267,9 @@ public boolean consume(ServerLevel level) {
     }
 
     public void craft(ServerLevel level) {
-        ItemStack stack = inventory.getStackInSlot(0);
-        ItemStack outputStack = recipe.getOutput(level, stack);
-        Vec3 itemPos = getItemPos();
+        var stack = inventory.getStackInSlot(0);
+        var outputStack = recipe.getOutput(level, stack);
+        var itemPos = inventory.getDisplayData().getDisplayCenter(0);
         progress -= (int) (progress * 0.2f);
         stack.shrink(recipe.input.count());
         level.addFreshEntity(new ItemEntity(level, itemPos.x, itemPos.y, itemPos.z, outputStack));
@@ -321,30 +308,4 @@ public void recalibrateAccelerators() {
             }
         }
     }
-
-    public Vec3 getCentralItemOffset() {
-        return ALTAR_ITEM_OFFSET;
-    }
-
-    public Vec3 getItemPos() {
-        final BlockPos blockPos = getBlockPos();
-        final Vec3 offset = getCentralItemOffset();
-        return new Vec3(blockPos.getX() + offset.x, blockPos.getY() + offset.y, blockPos.getZ() + offset.z);
-    }
-
-    public Vec3 getSpiritItemOffset(int slot, float partialTicks) {
-        float projectedSpiritSpin = spiritSpin + getSpinUp(Easing.SINE_IN_OUT) * 0.05f + speed * 0.5f;
-        float lerpSpiritSpin = spiritSpin + partialTicks * (projectedSpiritSpin - spiritSpin);
-        float distanceOscillation = Mth.sin((lerpSpiritSpin / 20f) % 6.28f) * 0.025f;
-        float distance = 1 - getSpinUp(Easing.SINE_OUT) * 0.25f + distanceOscillation;
-        float height = 0.75f + getSpinUp(Easing.QUARTIC_OUT) * getSpinUp(Easing.BACK_OUT) * 0.5f;
-        return VecHelper.rotatingRadialOffset(new Vec3(0.5f, height, 0.5f), distance, slot, spiritAmount, lerpSpiritSpin, 360);
-    }
-
-    public float getSpinUp(Easing easing) {
-        if (warmupTimer > WARMUP_DURATION) {
-            return 1;
-        }
-        return easing.ease(warmupTimer / WARMUP_DURATION, 0, 1, 1);
-    }
 }

src/main/java/com/sammy/malum/common/block/curiosities/spirit_altar/SpiritAltarSpiritDisplayData.java

@@ -0,0 +1,56 @@
+package com.sammy.malum.common.block.curiosities.spirit_altar;
+
+import dev.kosmx.playerAnim.core.util.MathHelper;
+import net.minecraft.core.BlockPos;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.Vec3;
+import team.lodestar.lodestone.helpers.DataHelper;
+import team.lodestar.lodestone.helpers.VecHelper;
+import team.lodestar.lodestone.modules.core.easing.Easing;
+import team.lodestar.lodestone.modules.toolkit.blockentity.LodestoneBlockEntity;
+import team.lodestar.lodestone.modules.toolkit.inventory.ItemStackHandlerItemDisplayData;
+import team.lodestar.lodestone.modules.toolkit.inventory.LodestoneItemStackBlockHandler;
+
+public class SpiritAltarSpiritDisplayData extends ItemStackHandlerItemDisplayData {
+
+    protected static final int WARMUP_DURATION = 30;
+
+    protected final SpiritAltarBlockEntity altar;
+    public int warmupTicks;
+
+    public SpiritAltarSpiritDisplayData(LodestoneItemStackBlockHandler parent) {
+        super(parent, 2f, 0.2f, 0.01f, 0.025f);
+        altar = (SpiritAltarBlockEntity) parent.getParent();
+    }
+
+    @Override
+    public void tick(LodestoneBlockEntity parent, Level level, BlockPos pos, BlockState state) {
+        int target = altar.possibleRecipes.isEmpty() ? 0 : WARMUP_DURATION;
+        warmupTicks = DataHelper.approach(warmupTicks, target, 1);
+        super.tick(parent, level, pos, state);
+        turn += getSpinUp(Easing.SINE_IN_OUT) * 0.05f + altar.speed * 0.5f;
+    }
+
+    @Override
+    public float getDistanceForItem(ItemDisplayDataEntry item, int index, float total) {
+        float angle = item.getAngle(0);
+        float distanceOscillation = Mth.sin(angle) * 0.025f;
+        return 1 - getSpinUp(Easing.SINE_OUT) * 0.25f + distanceOscillation;
+    }
+
+    @Override
+    public float getLiftForItem(ItemDisplayDataEntry item, int index, float total) {
+        return 0.75f + getSpinUp(Easing.QUARTIC_OUT) * getSpinUp(Easing.BACK_OUT) * 0.5f;
+    }
+
+    @Override
+    public Vec3 getDisplayCenter(LodestoneBlockEntity parent, float partialTicks) {
+        return super.getDisplayCenter(parent, partialTicks);
+    }
+
+    public float getSpinUp(Easing easing) {
+        return easing.ease(warmupTicks / (float)WARMUP_DURATION, 0, 1, 1);
+    }
+}

src/main/java/com/sammy/malum/common/block/storage/ItemHolderItemDisplayData.java

@@ -0,0 +1,31 @@
+package com.sammy.malum.common.block.storage;
+
+import com.sammy.malum.common.block.curiosities.spirit_altar.SpiritAltarBlockEntity;
+import net.minecraft.core.BlockPos;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.Vec3;
+import team.lodestar.lodestone.helpers.DataHelper;
+import team.lodestar.lodestone.modules.core.easing.Easing;
+import team.lodestar.lodestone.modules.toolkit.blockentity.LodestoneBlockEntity;
+import team.lodestar.lodestone.modules.toolkit.inventory.ItemStackHandlerItemDisplayData;
+import team.lodestar.lodestone.modules.toolkit.inventory.LodestoneItemStackBlockHandler;
+
+public class ItemHolderItemDisplayData extends ItemStackHandlerItemDisplayData {
+
+    public ItemHolderItemDisplayData(LodestoneItemStackBlockHandler parent) {
+        super(parent, 16f, 0.2f, 0.01f, 0.025f);
+    }
+
+    @Override
+    public float getDistanceForItem(ItemDisplayDataEntry item, int index, float total) {
+        return (1 - (item.getAge() / 40f)) * 0.25f;
+    }
+
+    @Override
+    public Vec3 getDisplayCenter(LodestoneBlockEntity parent, float partialTicks) {
+        BlockPos pos = parent.getBlockPos();
+        return new Vec3(pos.getX() + 0.5f, pos.getY() + 1.25f, pos.getZ() + 0.5f);
+    }
+}