Wa

Author: SammySemicolon

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

@@ -75,6 +75,7 @@ public ItemStack takeItemFromPlayer(Player playerEntity, ItemStack stack) {
         return result;
     }
 
+
     public void playSound(Player player, SoundEvent soundEvent, ItemStack stack) {
         SoundHelper.playSound(player, soundEvent, SoundSource.BLOCKS, 0.7f, RandomHelper.randomBetween(player.getRandom(), 1f, 1.2f));
         if (stack.getItem() instanceof BlockItem blockItem) {

src/main/java/com/sammy/malum/common/geas/pact/aerial/SkyBreakerGeas.java

@@ -13,10 +13,13 @@
 import net.minecraft.world.item.*;
 import net.neoforged.neoforge.event.entity.living.*;
 
+import java.util.ArrayList;
 import java.util.function.*;
 
 public class SkyBreakerGeas extends GeasEffect {
 
+    private final ArrayList<LivingEntity> cachedTargets = new ArrayList<>();
+
     public SkyBreakerGeas() {
         super(MalumGeasEffectTypeRegistry.PACT_OF_THE_SKYBREAKER.get());
     }
@@ -51,16 +54,30 @@ public void incomingDamageEvent(LivingDamageEvent.Pre event, LivingEntity attack
         if (target instanceof ServerPlayer player) {
             if (event.getSource().is(DamageTypes.FALL)) {
                 var aabb = player.getBoundingBox().inflate(4, 1f, 4);
+                cachedTargets.clear();
                 for (Entity nearbyTarget : player.serverLevel().getEntities(player, aabb, t -> skyBreakerCanHitEntity(player, t))) {
-                    attack(player, nearbyTarget);
-                    if (nearbyTarget instanceof LivingEntity) {
+                    if (nearbyTarget instanceof LivingEntity living) {
+                        cachedTargets.add(living);
                         event.setNewDamage(event.getNewDamage() * 0.8f);
                     }
                 }
             }
         }
     }
 
+    @Override
+    public void finalizedIncomingDamageEvent(LivingDamageEvent.Post event, LivingEntity attacker, LivingEntity target, ItemStack stack) {
+        if (target instanceof ServerPlayer player) {
+            if (event.getSource().is(DamageTypes.FALL)) {
+                for (LivingEntity cachedTarget : cachedTargets) {
+                    if (cachedTarget.isAlive()) {
+                        attack(player, cachedTarget);
+                    }
+                }
+            }
+        }
+    }
+
     public void attack(Player player, Entity target) {
         if (target.isAlive()) {
             player.attackStrengthTicker = 1000;

src/main/java/com/sammy/malum/core/handlers/WeepingWellRejectionHandler.java

@@ -4,6 +4,8 @@
 import com.sammy.malum.client.VoidRevelationHandler;
 import com.sammy.malum.common.block.curiosities.weeping_well.VoidConduitBlockEntity;
 import com.sammy.malum.common.data.attachment.*;
+import com.sammy.malum.common.entity.FloatingItemEntity;
+import com.sammy.malum.common.entity.spirit.SpiritItemEntity;
 import com.sammy.malum.common.packets.VoidRejectionPayload;
 import com.sammy.malum.registry.common.*;
 import com.sammy.malum.registry.common.item.ItemRegistry;
@@ -17,6 +19,7 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.attributes.*;
+import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
@@ -41,7 +44,10 @@ public static void handlePrimordialSoupContact(Entity entity) {
             }
             data.setGoopStatus();
         }
-        entity.setDeltaMovement(entity.getDeltaMovement().scale(0.4f));
+        if (entity instanceof FloatingItemEntity || entity instanceof ItemEntity) {
+            return;
+        }
+        entity.setDeltaMovement(entity.getDeltaMovement().scale(0.6f));
     }
 
     public static void entityTick(EntityTickEvent.Pre event) {

src/main/java/com/sammy/malum/datagen/block/MalumBlockStates.java

@@ -301,7 +301,7 @@ public ModelFile cutWoodBlockModel(Block block) {
     }
 
     public ModelFile rockItemPedestalModel(Block block) {
-        return itemPedestalModel(block, "template_rock_item_pedestal");
+        return itemPedestalModel(block, "template_item_pedestal_rock");
     }
 
     public ModelFile woodenItemPedestalModel(Block block) {

src/main/java/com/sammy/malum/datagen/recipe/MalumVoidFavorRecipes.java

@@ -3,6 +3,7 @@
 import com.sammy.malum.*;
 import com.sammy.malum.datagen.recipe.builder.*;
 import com.sammy.malum.registry.common.item.*;
+import com.sammy.malum.registry.common.tag.ItemTagRegistry;
 import net.minecraft.data.recipes.*;
 import net.minecraft.world.item.*;
 import net.minecraft.world.item.crafting.*;
@@ -15,7 +16,7 @@ protected static void buildRecipes(RecipeOutput recipeOutput) {
         new VoidFavorRecipeBuilder(Ingredient.of(ItemRegistry.ENCYCLOPEDIA_ARCANA.get()), ItemRegistry.ENCYCLOPEDIA_ESOTERICA.get(), 1)
                 .save(recipeOutput);
 
-        new VoidFavorRecipeBuilder(Ingredient.of(Tags.Items.RAW_MATERIALS), ItemRegistry.RAW_SOULSTONE.get(), 1)
+        new VoidFavorRecipeBuilder(Ingredient.of(ItemTagRegistry.VOID_SOULSTONE_CONVERSION), ItemRegistry.RAW_SOULSTONE.get(), 1)
                 .save(recipeOutput);
 
         new VoidFavorRecipeBuilder(Ingredient.of(Tags.Items.STORAGE_BLOCKS_IRON), ItemRegistry.ANOMALOUS_DESIGN.get(), 1)

src/main/java/com/sammy/malum/datagen/tag/MalumItemTagDatagen.java

@@ -7,6 +7,7 @@
 import com.sammy.malum.common.item.impetus.*;
 import com.sammy.malum.datagen.recipe.crafting.*;
 import com.sammy.malum.registry.common.block.*;
+import com.sammy.malum.registry.common.item.ItemRegistry;
 import com.sammy.malum.registry.common.tag.*;
 import net.minecraft.core.*;
 import net.minecraft.core.registries.*;
@@ -74,6 +75,7 @@ protected void addTags(HolderLookup.Provider pProvider) {
         tag(Tags.Items.SLIME_BALLS).add(RUNIC_SAPBALL.get(), CURSED_SAPBALL.get());
         tag(Tags.Items.GEMS_QUARTZ).add(NATURAL_QUARTZ.get());
         tag(Tags.Items.ORES_QUARTZ).add(NATURAL_QUARTZ_ORE.get(), DEEPSLATE_QUARTZ_ORE.get());
+
         tag(ItemTags.DYEABLE).add(
                 ETHER.get(), ETHER_TORCH.get(), TAINTED_ETHER_BRAZIER.get(), TWISTED_ETHER_BRAZIER.get(),
                 IRIDESCENT_ETHER.get(), IRIDESCENT_ETHER_TORCH.get(), TAINTED_IRIDESCENT_ETHER_BRAZIER.get(), TWISTED_IRIDESCENT_ETHER_BRAZIER.get());
@@ -186,6 +188,10 @@ protected void addTags(HolderLookup.Provider pProvider) {
         tag(ItemTagRegistry.SOULWOVEN_POUCH_AUTOCOLLECT)
                 .addTags(ItemTagRegistry.SPIRITS, ItemTagRegistry.MOB_DROPS, ItemTagRegistry.MINERALS);
 
+        tag(ItemTagRegistry.VOID_SOULSTONE_CONVERSION)
+                .addTags(Tags.Items.RAW_MATERIALS)
+                .remove(CTHONIC_GOLD.get(), CTHONIC_GOLD_FRAGMENT.get());
+
         tag(Tags.Items.RAW_MATERIALS).add(RAW_SOULSTONE.get(), RAW_BRILLIANCE.get(), CTHONIC_GOLD.get(), CTHONIC_GOLD_FRAGMENT.get());
         tag(Tags.Items.NUGGETS).add(HALLOWED_GOLD_NUGGET.get(), SOUL_STAINED_STEEL_NUGGET.get(), MALIGNANT_PEWTER_INGOT.get());
         tag(Tags.Items.INGOTS).add(HALLOWED_GOLD_NUGGET.get(), SOUL_STAINED_STEEL_INGOT.get(), MALIGNANT_PEWTER_NUGGET.get());

src/main/java/com/sammy/malum/registry/common/tag/ItemTagRegistry.java

@@ -48,6 +48,8 @@ public class ItemTagRegistry {
     public static final TagKey<Item> SOULHUNTERS_TREASURE = malumTag("soulhunters_treasure");
     public static final TagKey<Item> SOULWOVEN_POUCH_AUTOCOLLECT = malumTag("soulwoven_pouch_autocollect");
 
+    public static final TagKey<Item> VOID_SOULSTONE_CONVERSION = malumTag("void_soulstone_material");
+
     public static final TagKey<Item> HIDDEN_ALWAYS = malumTag("hidden_items/always");
     public static final TagKey<Item> HIDDEN_UNTIL_VOID = malumTag("hidden_items/void");
     public static final TagKey<Item> HIDDEN_UNTIL_BLACK_CRYSTAL = malumTag("hidden_items/black_crystal");

…mplates/template_rock_item_pedestal.json …mplates/template_item_pedestal_rock.jsonsrc/main/resources/assets/malum/models/block/templates/template_rock_item_pedestal.json renamed to src/main/resources/assets/malum/models/block/templates/template_item_pedestal_rock.json src/main/resources/assets/malum/models/block/templates/template_rock_item_pedestal.json renamed to src/main/resources/assets/malum/models/block/templates/template_item_pedestal_rock.json

@@ -2,7 +2,8 @@
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
 	"textures": {
-		"pedestal": "blank"
+		"pedestal": "blank",
+		"particle": "#pedestal"
 	},
 	"elements": [
 		{