dust drop compat

Author: PssbleTrngle

build.gradle

@@ -107,10 +107,12 @@ dependencies {
     implementation(fg.deobf("maven.modrinth:nethers-delight:${nethersdelight_version}"))
     implementation(fg.deobf("maven.modrinth:shield-expansion:${shieldexpansion_version}"))
     implementation(fg.deobf("maven.modrinth:create:${create_version}"))
+    implementation(fg.deobf("maven.modrinth:supplementaries:${supplementaries_version}"))
 
     // For dev testing
     runtimeOnly(fg.deobf("maven.modrinth:scannable:${scannable_version}"))
     runtimeOnly(fg.deobf("maven.modrinth:architectury-api:${architectury_version}"))
+    runtimeOnly(fg.deobf("maven.modrinth:moonlight:${moonlight_lib_version}"))
 
     /// Utilities for the development environment
     //runtimeOnly fg.deobf("curse.maven:jade-324717:${jade_version}")

gradle.properties

@@ -1,5 +1,5 @@
 # Project
-version=3.0.2
+version=3.2.0
 group=galena
 mod_name=Oreganized
 mod_author=Xaidee as part of Team Galena
@@ -31,4 +31,5 @@ shieldexpansion_version=8mpKmudC
 create_version=ZZW2y7nG
 supplementaries_version=eMF95dNK
 scannable_version=2FlwUOgm
-architectury_version=tBWqtdBO
+architectury_version=tBWqtdBO
+moonlight_lib_version=sfzdPwZX

src/generated/resources/assets/oreganized/lang/en_us.json

@@ -138,10 +138,7 @@
   "item.oreganized.electrum_shield": "Electrum Shield",
   "item.oreganized.electrum_shovel": "Electrum Shovel",
   "item.oreganized.electrum_sword": "Electrum Sword",
-<<<<<<< Updated upstream
-=======
   "item.oreganized.flint_and_pewter": "Flint and Pewter",
->>>>>>> Stashed changes
   "item.oreganized.lead_bolt": "Lead Bolt",
   "item.oreganized.lead_ingot": "Lead Ingot",
   "item.oreganized.lead_nugget": "Lead Nugget",
@@ -168,4 +165,4 @@
   "trim_material.oreganized.lead": "Lead material",
   "trim_material.oreganized.silver": "Silver material",
   "upgrade.oreganized.electrum_upgrade": "Electrum Upgrade"
-}
+}

src/main/java/galena/oreganized/Oreganized.java

@@ -6,6 +6,7 @@
 import com.teamabnormals.blueprint.core.util.DataUtil;
 import com.teamabnormals.blueprint.core.util.registry.RegistryHelper;
 import galena.oreganized.compat.create.CreateCompat;
+import galena.oreganized.content.block.LeadOreBlock;
 import galena.oreganized.content.block.MoltenLeadCauldronBlock;
 import galena.oreganized.content.entity.LeadBoltEntity;
 import galena.oreganized.data.OAdvancements;
@@ -49,6 +50,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
+import net.minecraft.tags.FluidTags;
 import net.minecraft.world.entity.npc.VillagerProfession;
 import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.entity.projectile.Projectile;
@@ -68,7 +70,6 @@
 import net.minecraft.world.level.levelgen.structure.pools.StructurePoolElement;
 import net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool;
 import net.minecraftforge.common.BasicItemListing;
-import net.minecraftforge.common.ForgeMod;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.data.DatapackBuiltinEntriesProvider;
 import net.minecraftforge.common.data.ExistingFileHelper;
@@ -172,10 +173,19 @@ private void injectVillagerTrades(VillagerTradesEvent event) {
 
     private void setup(FMLCommonSetupEvent event) {
         FluidInteractionRegistry.addInteraction(OFluids.MOLTEN_LEAD_TYPE.get(), new FluidInteractionRegistry.InteractionInformation(
-                ForgeMod.WATER_TYPE.get(),
+                (level, pos, relativePos, fluidState) -> level.getFluidState(relativePos).is(FluidTags.WATER) && fluidState.isSource(),
                 fluidState -> OBlocks.LEAD_BLOCK.get().defaultBlockState()
         ));
 
+        FluidInteractionRegistry.addInteraction(OFluids.MOLTEN_LEAD_TYPE.get(), new FluidInteractionRegistry.InteractionInformation(
+                (level, blockPos, relativePos, fluidState) -> level.getFluidState(relativePos).is(FluidTags.LAVA) && fluidState.isSource(),
+                (level, pos, relativePos, fluidState) -> {
+                    LeadOreBlock.spawnCloud(level, pos, 2F);
+                    level.setBlockAndUpdate(pos, Blocks.AIR.defaultBlockState());
+                    level.levelEvent(1501, pos, 0);
+                }
+        ));
+
         event.enqueueWork(() -> {
 
             Map<Item, CauldronInteraction> EMPTY = CauldronInteraction.EMPTY;
@@ -380,6 +390,7 @@ public void buildCreativeModeTabContents(BuildCreativeModeTabContentsEvent event
             putAfter(entries, Items.TNT_MINECART, OItems.SHRAPNEL_BOMB_MINECART);
             putBefore(entries, Items.MUSIC_DISC_5, OItems.MUSIC_DISC_STRUCTURE);
             putAfter(entries, Items.SHEARS, OItems.SCRIBE);
+            putAfter(entries, Items.FLINT_AND_STEEL, OItems.FLINT_AND_PEWTER);
         }
         if (tab == CreativeModeTabs.COMBAT) {
             putBefore(entries, Items.NETHERITE_SWORD, OItems.ELECTRUM_SWORD);

src/main/java/galena/oreganized/OreganizedConfig.java

@@ -19,6 +19,7 @@ public static class Common {
         public final ConfigValue<Boolean> leadDustCloud;
         public final ConfigValue<Boolean> pillagerSpawnWithBolts;
         public final ConfigValue<Boolean> scribeSilkTouchStone;
+        public final ConfigValue<Integer> moltenLeadDelay;
 
         private Common(ForgeConfigSpec.Builder builder) {
             builder.comment("Common");
@@ -28,6 +29,7 @@ private Common(ForgeConfigSpec.Builder builder) {
             leadDustCloud = builder.comment("Should lead ore spawn dust clouds when broken without adjacent water?").define("leadDustCloud", true);
             pillagerSpawnWithBolts = builder.comment("Pillagers have a chance to spawn with a lead bolt in their offhand").define("pillagerSpawnWithBolts", true);
             scribeSilkTouchStone = builder.comment("The scribe is able to silk-touch pickaxe-related blocks").define("scribeSilkTouchStone", true);
+            moltenLeadDelay = builder.comment("Time in ticks molten lead waits until flowing downwards").defineInRange("moltenLeadDelay", 20 * 10, 0, 20 * 100);
 
             builder.pop();
         }

src/main/java/galena/oreganized/content/block/LeadOreBlock.java

@@ -13,6 +13,7 @@
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.AreaEffectCloud;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
@@ -21,38 +22,40 @@
 import net.minecraft.world.level.block.DropExperienceBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 
+import java.util.stream.Stream;
+
 public class LeadOreBlock extends DropExperienceBlock {
 
     public LeadOreBlock(Properties properties) {
         super(properties);
     }
 
+    private static Stream<MobEffectInstance> getEffects(int durationMultiplier) {
+        if (OreganizedConfig.COMMON.poisonInsteadOfStunning.get()) {
+            return Stream.of(new MobEffectInstance(MobEffects.POISON, 150 * durationMultiplier));
+        }
+
+        return Stream.of(
+                new MobEffectInstance(OEffects.STUNNING.get(), 600 * durationMultiplier),
+                new MobEffectInstance(MobEffects.POISON, 40)
+        );
+    }
+
     @Override
     public void spawnAfterBreak(BlockState state, ServerLevel level, BlockPos pos, ItemStack stack, boolean dropXp) {
         super.spawnAfterBreak(state, level, pos, stack, dropXp);
 
         if (shouldSpawnCloud(state, level, pos, stack)) {
-            var vec = Vec3.atCenterOf(pos);
-            var cloud = new AreaEffectCloud(level, vec.x, vec.y, vec.z);
-
-            if (OreganizedConfig.COMMON.poisonInsteadOfStunning.get()) {
-                cloud.addEffect(new MobEffectInstance(MobEffects.POISON, 20 * 15));
-            } else {
-                cloud.addEffect(new MobEffectInstance(OEffects.STUNNING.get(), 20 * 60));
-                cloud.addEffect(new MobEffectInstance(MobEffects.POISON, 20 * 2));
-            }
-
-            cloud.setParticle(OParticleTypes.LEAD_CLOUD.get());
-            cloud.setDuration(60);
-
-            level.addFreshEntity(cloud);
+            spawnCloud(level, pos, 2F);
         }
     }
 
     @Override
-    public boolean onDestroyedByPlayer(BlockState state, Level level, BlockPos pos, Player player, boolean willHarvest, FluidState fluid) {
+    public boolean onDestroyedByPlayer(BlockState state, Level level, BlockPos pos, Player player,
+                                       boolean willHarvest, FluidState fluid) {
         var stack = player.getItemInHand(player.getUsedItemHand());
         if (shouldSpawnCloud(state, level, pos, stack) && player instanceof ServerPlayer serverPlayer) {
             OCriteriaTriggers.IN_LEAD_CLOUD.trigger(serverPlayer);

src/main/java/galena/oreganized/content/block/MoltenLeadBlock.java

@@ -1,27 +1,32 @@
 package galena.oreganized.content.block;
 
+import galena.oreganized.OreganizedConfig;
 import galena.oreganized.index.OBlocks;
+import galena.oreganized.index.OItems;
 import galena.oreganized.index.OTags;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.tags.FluidTags;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.LiquidBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.FlowingFluid;
+import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.pathfinder.BlockPathTypes;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.phys.Vec3;
@@ -39,19 +44,13 @@
 @MethodsReturnNonnullByDefault
 public class MoltenLeadBlock extends LiquidBlock {
 
-    public static final BooleanProperty MOVING = BooleanProperty.create("moving");
-
     public static final VoxelShape STABLE_SHAPE = Block.box(0.0D, 0.0D, 0.0D, 16.0D, 8.0D, 16.0D);
 
+    public static final BooleanProperty WAITING = BooleanProperty.create("waiting");
+
     public MoltenLeadBlock(Supplier<? extends FlowingFluid> fluid, Properties properties) {
         super(fluid, properties.noCollission().strength(-1.0F, 3600000.0F).noLootTable().lightLevel((state) -> 8));
-        this.registerDefaultState(this.stateDefinition.any().setValue(MOVING, false));
-    }
-
-    @Override
-    protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
-        super.createBlockStateDefinition(builder);
-        builder.add(MOVING);
+        registerDefaultState(defaultBlockState().setValue(WAITING, true));
     }
 
     @Nullable
@@ -61,23 +60,29 @@ public BlockPathTypes getBlockPathType(BlockState state, BlockGetter world, Bloc
     }
 
     @Override
-    public void onPlace(BlockState pState, Level pLevel, BlockPos pPos, BlockState pOldState, boolean pIsMoving) {
-        if (pIsMoving) {
-            if (!pOldState.getFluidState().is(FluidTags.WATER)) {
-                pLevel.setBlock(pPos, pState.setValue(MOVING, true), 3);
-            } else {
-                pLevel.levelEvent(1501, pPos, 0);
-                pLevel.setBlock(pPos, OBlocks.LEAD_BLOCK.get().defaultBlockState(), 3);
-            }
-        } else {
-            if (!pOldState.getFluidState().is(FluidTags.WATER)) {
-                pLevel.setBlock(pPos, pState.setValue(MOVING, false), 3);
-            } else {
-                pLevel.levelEvent(1501, pPos, 0);
-                pLevel.setBlock(pPos, OBlocks.LEAD_BLOCK.get().defaultBlockState(), 3);
+    protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
+        super.createBlockStateDefinition(builder);
+        builder.add(WAITING);
+    }
+
+    @Override
+    public void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldState, boolean isMoving) {
+        if (state.getFluidState().isSource()) {
+            var oldFluid = oldState.getFluidState();
+            if (oldFluid.is(FluidTags.WATER)) {
+                level.levelEvent(1501, pos, 0);
+                level.setBlock(pos, OBlocks.LEAD_BLOCK.get().defaultBlockState(), 3);
+            } else if (oldFluid.is(FluidTags.LAVA)) {
+                LeadOreBlock.spawnCloud(level, pos, 2F);
+                level.setBlockAndUpdate(pos, oldState);
             }
         }
-        super.onPlace(pState, pLevel, pPos, pOldState, pIsMoving);
+
+        if (state.getValue(WAITING)) {
+            level.scheduleTick(pos, state.getBlock(), OreganizedConfig.COMMON.moltenLeadDelay.get());
+        }
+
+        super.onPlace(state, level, pos, oldState, isMoving);
     }
 
     @Override
@@ -88,13 +93,28 @@ public VoxelShape getCollisionShape(BlockState blockState, BlockGetter world, Bl
         return super.getCollisionShape(blockState, world, blockPos, ctx);
     }
 
+    @Override
+    public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) {
+        if (context.isHoldingItem(OItems.MOLTEN_LEAD_BUCKET.get()))
+            return level.getBlockState(pos.above()).is(this) ? Shapes.block() : STABLE_SHAPE;
+
+        return Shapes.empty();
+    }
+
+    @Override
+    public boolean canBeReplaced(BlockState state, Fluid fluid) {
+        if (getFluid() == fluid) return false;
+        return super.canBeReplaced(state, fluid);
+    }
+
     @Override
     public void onRemove(BlockState state, Level level, BlockPos pos, BlockState replacedWith, boolean dropXp) {
         super.onRemove(state, level, pos, replacedWith, dropXp);
 
         if (replacedWith.isAir() || !replacedWith.getFluidState().isEmpty()) return;
+        if (replacedWith.is(OBlocks.LEAD_BLOCK.get())) return;
 
-        tryEscape(state, level, pos);
+        if (state.getFluidState().isSource()) tryEscape(state, level, pos);
     }
 
     private boolean tryEscape(BlockState state, Level level, BlockPos pos, Direction direction) {
@@ -121,7 +141,7 @@ private boolean tryEscape(BlockState state, Level level, BlockPos pos) {
             }
         }
 
-        return false;
+        return tryEscape(state, level, pos, Direction.UP);
     }
 
     @Override
@@ -138,9 +158,9 @@ public void entityInside(BlockState state, Level world, BlockPos pos, Entity ent
 
     @Override
     public void fallOn(Level world, BlockState state, BlockPos pos, Entity entity, float fallDistance) {
-        if (!((double) fallDistance < 4.0D) && entity instanceof LivingEntity living) {
+        if (fallDistance >= 4.0D && entity instanceof LivingEntity living) {
             LivingEntity.Fallsounds fallSound = living.getFallSounds();
-            SoundEvent sound = (double) fallDistance < 7.0D ? fallSound.small() : fallSound.big();
+            SoundEvent sound = fallDistance < 7.0D ? fallSound.small() : fallSound.big();
             entity.playSound(sound, 1.0F, 1.0F);
         }
     }
@@ -153,6 +173,37 @@ public static boolean isEntityLighterThanLead(Entity entity) {
         }
     }
 
+    public static boolean shouldWait(LevelAccessor level, BlockPos pos) {
+        var belowPos = pos.below();
+        var belowState = level.getBlockState(belowPos);
+        return belowState.isFaceSturdy(level, belowPos, Direction.UP);
+    }
+
+    @Override
+    public void neighborChanged(BlockState state, Level level, BlockPos pos, Block block, BlockPos neighborPos, boolean moving) {
+        super.neighborChanged(state, level, pos, block, neighborPos, moving);
+
+        var waiting = state.getValue(WAITING);
+        var shouldWait = shouldWait(level, pos);
+
+        if (waiting == shouldWait) return;
+
+        if (shouldWait) {
+            level.setBlockAndUpdate(pos, state.setValue(WAITING, true));
+        } else {
+            level.scheduleTick(pos, state.getBlock(), OreganizedConfig.COMMON.moltenLeadDelay.get());
+        }
+    }
+
+    @Override
+    public void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
+        super.tick(state, level, pos, random);
+
+        if (!shouldWait(level, pos)) {
+            level.setBlockAndUpdate(pos, state.setValue(WAITING, false));
+        }
+    }
+
     @Override
     public Optional<SoundEvent> getPickupSound() {
         return Optional.of(SoundEvents.BUCKET_FILL_LAVA);