- Made Pine Cone, Twig, Leaf Litter, Pine Litter burnable as fuel

DoomedArtemis · DoomedArtemis · commit 1abd0808a5cf · 2025-10-12T02:25:48.000+02:00
- Added own particle and particle type
- Added leaf fluff particle type
- Leaf Litter now spawns leaf fluff when stepped on
diff --git a/src/main/java/de/artemis/floraexpansion/FloraExpansion.java b/src/main/java/de/artemis/floraexpansion/FloraExpansion.java
@@ -3,6 +3,11 @@
 import de.artemis.floraexpansion.common.block.ModBlocks;
 import de.artemis.floraexpansion.common.item.ModItems;
 import de.artemis.floraexpansion.common.loot.ModLootModifiers;
+import de.artemis.floraexpansion.common.particle.LeafFluffParticles;
+import de.artemis.floraexpansion.common.particle.ModParticles;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.client.event.RegisterParticleProvidersEvent;
 import org.slf4j.Logger;
 
 import com.mojang.logging.LogUtils;
@@ -43,6 +48,7 @@ public FloraExpansion(IEventBus modEventBus, ModContainer modContainer) {
         ModBlocks.register(modEventBus);
         ModCreativeModeTabs.register(modEventBus);
         ModLootModifiers.register(modEventBus);
+        ModParticles.register(modEventBus);
     }
 
     private void commonSetup(FMLCommonSetupEvent event) {
diff --git a/src/main/java/de/artemis/floraexpansion/client/event/ClientEvents.java b/src/main/java/de/artemis/floraexpansion/client/event/ClientEvents.java
@@ -1,18 +1,22 @@
 package de.artemis.floraexpansion.client.event;
 
+import de.artemis.floraexpansion.FloraExpansion;
 import de.artemis.floraexpansion.common.block.ModBlocks;
+import de.artemis.floraexpansion.common.particle.LeafFluffParticles;
+import de.artemis.floraexpansion.common.particle.ModParticles;
 import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.renderer.BiomeColors;
 import net.minecraft.world.level.FoliageColor;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent;
+import net.neoforged.neoforge.client.event.RegisterParticleProvidersEvent;
 
-@EventBusSubscriber(value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD)
+@EventBusSubscriber(modid = FloraExpansion.MODID, value = Dist.CLIENT)
 public class ClientEvents {
 
-    @SuppressWarnings("deprecation")
+    /**@SuppressWarnings("deprecation")
     @SubscribeEvent
     public static void registerBlockColors(RegisterColorHandlersEvent.Block event) {
         BlockColors blockColors = event.getBlockColors();
@@ -24,5 +28,10 @@ public static void registerBlockColors(RegisterColorHandlersEvent.Block event) {
                                 : FoliageColor.getDefaultColor(),
                 ModBlocks.LEAF_LITTER.get()
         );
+    }**/
+
+    @SubscribeEvent
+    public static void registerParticleFactories(RegisterParticleProvidersEvent event) {
+        event.registerSpriteSet(ModParticles.LEAF_FLUFF_PARTICLES.get(), LeafFluffParticles.Provider::new);
     }
-}
+}
diff --git a/src/main/java/de/artemis/floraexpansion/common/block/LeafLitterBlock.java b/src/main/java/de/artemis/floraexpansion/common/block/LeafLitterBlock.java
@@ -1,13 +1,17 @@
 package de.artemis.floraexpansion.common.block;
 
 import de.artemis.floraexpansion.common.item.ModItems;
+import de.artemis.floraexpansion.common.particle.ModParticles;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.stats.Stats;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.ItemInteractionResult;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
@@ -16,7 +20,12 @@
 import net.minecraft.world.phys.BlockHitResult;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
 public class LeafLitterBlock extends PineLitterBlock {
+    private static final Map<UUID, Long> LAST_LEAF_PUFF = new HashMap<>();
 
     public LeafLitterBlock(Properties properties) {
         super(properties);
@@ -35,11 +44,66 @@ public LeafLitterBlock(Properties properties) {
             level.destroyBlock(blockPos, false);
             level.playSound(null, blockPos, SoundEvents.MOSS_BREAK, SoundSource.BLOCKS, 1.0F, 1.0F);
 
+            if (level.isClientSide) {
+                System.out.println("2");
+
+                System.out.println("3");
+
+                level.addParticle(
+                        ParticleTypes.ANGRY_VILLAGER,
+                        player.getX(),
+                        blockPos.getY() - 0.95,
+                        player.getZ(),
+                        1,
+                        1, 1
+                );
+            }
+
             if (player instanceof ServerPlayer serverPlayer) {
                 serverPlayer.awardStat(Stats.BLOCK_MINED.get(this));
             }
         }
 
         return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
     }
+
+    @Override
+    public void animateTick(@NotNull BlockState state, @NotNull Level level, @NotNull BlockPos pos, @NotNull RandomSource random) {
+        super.animateTick(state, level, pos, random);
+
+        for (Player player : level.players()) {
+            if (player.onGround() && player.blockPosition().equals(pos)) {
+                double dx = player.getX() - player.xOld;
+                double dz = player.getZ() - player.zOld;
+                double speedSq = dx * dx + dz * dz;
+
+                if (speedSq > 0.0003 && random.nextFloat() < 0.65F) {
+                    int count = 2 + random.nextInt(4);
+
+                    for (int i = 0; i < count; i++) {
+                        double x = pos.getX() + 0.1 + random.nextDouble() * 0.8;
+                        double z = pos.getZ() + 0.1 + random.nextDouble() * 0.8;
+                        double y = pos.getY() + 0.05 + random.nextDouble() * 0.1;
+
+                        double angle = random.nextDouble() * Math.PI * 2;
+                        double speed = 0.025 + random.nextDouble() * 0.015;
+                        double vx = Math.cos(angle) * speed;
+                        double vz = Math.sin(angle) * speed;
+                        double vy = 0.005 + random.nextDouble() * 0.01;
+
+                        level.addParticle(ModParticles.LEAF_FLUFF_PARTICLES.get(), x, y, z, vx, vy, vz);
+                    }
+
+                    level.playLocalSound(
+                            pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5,
+                            SoundEvents.CHERRY_LEAVES_STEP,
+                            SoundSource.BLOCKS,
+                            0.8F + random.nextFloat() * 0.2F,
+                            0.9F + random.nextFloat() * 0.3F,
+                            false
+                    );
+                }
+            }
+        }
+    }
 }
diff --git a/src/main/java/de/artemis/floraexpansion/common/event/ModEvents.java b/src/main/java/de/artemis/floraexpansion/common/event/ModEvents.java
@@ -0,0 +1,36 @@
+package de.artemis.floraexpansion.common.event;
+
+
+import de.artemis.floraexpansion.common.block.ModBlocks;
+import de.artemis.floraexpansion.common.item.ModItems;
+import net.minecraft.world.item.ItemStack;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.event.furnace.FurnaceFuelBurnTimeEvent;
+
+@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD)
+public class ModEvents {
+
+    @SubscribeEvent
+    public static void onFuelBurnTime(FurnaceFuelBurnTimeEvent event) {
+        ItemStack itemStack = event.getItemStack();
+
+        //Blocks
+        if (itemStack.is(ModBlocks.LEAF_LITTER.get().asItem())) {
+            event.setBurnTime(100);
+        }
+
+        if (itemStack.is(ModBlocks.PINE_LITTER.get().asItem())) {
+            event.setBurnTime(100);
+        }
+        
+        //Items
+        if (itemStack.is(ModItems.PINE_CONE.get())) {
+            event.setBurnTime(100);
+        }
+
+        if (itemStack.is(ModItems.TWIG.get())) {
+            event.setBurnTime(200);
+        }
+    }
+}
diff --git a/src/main/java/de/artemis/floraexpansion/common/item/projectile/PineConeProjectile.java b/src/main/java/de/artemis/floraexpansion/common/item/projectile/PineConeProjectile.java
@@ -9,8 +9,6 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.monster.Blaze;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.projectile.Snowball;
 import net.minecraft.world.entity.projectile.ThrowableItemProjectile;
 import net.minecraft.world.item.Item;
diff --git a/src/main/java/de/artemis/floraexpansion/common/particle/LeafFluffParticles.java b/src/main/java/de/artemis/floraexpansion/common/particle/LeafFluffParticles.java
@@ -0,0 +1,65 @@
+package de.artemis.floraexpansion.common.particle;
+
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.particle.*;
+import net.minecraft.core.particles.SimpleParticleType;
+import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nullable;
+
+public class LeafFluffParticles extends TextureSheetParticle {
+
+    protected LeafFluffParticles(ClientLevel level, double x, double y, double z, SpriteSet spriteSet, double xSpeed, double ySpeed, double zSpeed) {
+        super(level, x, y, z, xSpeed, ySpeed, zSpeed);
+
+        double angle = random.nextDouble() * Math.PI * 2;
+        double strength = 0.03 + random.nextDouble() * 0.015;
+        this.xd = Math.cos(angle) * strength;
+        this.yd = 0.04 + random.nextDouble() * 0.02;
+        this.zd = Math.sin(angle) * strength;
+
+        this.friction = 0.94F;
+        this.gravity = 0.025F;
+        this.quadSize = 0.35F + random.nextFloat() * 0.1F;
+        this.lifetime = 200 + random.nextInt(40);
+
+        this.setSpriteFromAge(spriteSet);
+    }
+
+    @Override
+    public void tick() {
+        super.tick();
+
+        if (this.age % 10 == 0) {
+            this.xd += (random.nextDouble() - 0.5) * 0.005;
+            this.zd += (random.nextDouble() - 0.5) * 0.005;
+        }
+
+        this.xd *= 0.97;
+        this.zd *= 0.97;
+
+        float ageRatio = (float) this.age / this.lifetime;
+        if (ageRatio > 0.75F) {
+            this.alpha = 1.0F - (ageRatio - 0.75F) / 0.25F;
+        }
+    }
+
+    @Override
+    public @NotNull ParticleRenderType getRenderType() {
+        return ParticleRenderType.PARTICLE_SHEET_TRANSLUCENT;
+    }
+
+    public static class Provider implements ParticleProvider<SimpleParticleType> {
+        private final SpriteSet spriteSet;
+
+        public Provider(SpriteSet spriteSet) {
+            this.spriteSet = spriteSet;
+        }
+
+        @Nullable
+        @Override
+        public Particle createParticle(@NotNull SimpleParticleType simpleParticleType, @NotNull ClientLevel clientLevel, double pX, double pY, double pZ, double pXSpeed, double pYSpeed, double pZSpeed) {
+            return new LeafFluffParticles(clientLevel, pX, pY, pZ, this.spriteSet, pXSpeed, pYSpeed, pZSpeed);
+        }
+    }
+}
diff --git a/src/main/java/de/artemis/floraexpansion/common/particle/ModParticles.java b/src/main/java/de/artemis/floraexpansion/common/particle/ModParticles.java
@@ -0,0 +1,23 @@
+package de.artemis.floraexpansion.common.particle;
+
+import de.artemis.floraexpansion.FloraExpansion;
+import net.minecraft.core.particles.ParticleType;
+import net.minecraft.core.particles.SimpleParticleType;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.neoforge.registries.DeferredRegister;
+
+import java.util.function.Supplier;
+
+public class ModParticles {
+
+    public static final DeferredRegister<ParticleType<?>> PARTICLE_TYPES =
+            DeferredRegister.create(BuiltInRegistries.PARTICLE_TYPE, FloraExpansion.MODID);
+
+    public static final Supplier<SimpleParticleType> LEAF_FLUFF_PARTICLES =
+            PARTICLE_TYPES.register("leaf_fluff_particles", () -> new SimpleParticleType(true));
+
+    public static void register(IEventBus eventBus) {
+        PARTICLE_TYPES.register(eventBus);
+    }
+}
diff --git a/src/main/resources/assets/floraexpansion/particles/leaf_fluff_particles.json b/src/main/resources/assets/floraexpansion/particles/leaf_fluff_particles.json
@@ -0,0 +1,5 @@
+{
+  "textures": [
+    "floraexpansion:leaf_fluff"
+  ]
+}
diff --git a/src/main/resources/assets/floraexpansion/textures/block/leaf_litter.png b/src/main/resources/assets/floraexpansion/textures/block/leaf_litter.png
diff --git a/src/main/resources/assets/floraexpansion/textures/particle/leaf_fluff.png b/src/main/resources/assets/floraexpansion/textures/particle/leaf_fluff.png

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "textures": [
 +    "floraexpansion:leaf_fluff"
 +  ]
 +}