Molten Amber Cooling & Other Tweaks

MosaicModding · Jul 16, 2024 · c3d1088 · c3d1088
1 parent 9efafb2
commit c3d1088
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 9 deletions.
diff --git a/src/main/java/com/uraneptus/sullysmod/common/fluids/MoltenAmberFluid.java b/src/main/java/com/uraneptus/sullysmod/common/fluids/MoltenAmberFluid.java
@@ -1,5 +1,6 @@
 package com.uraneptus.sullysmod.common.fluids;
 
+import com.uraneptus.sullysmod.core.other.tags.SMBlockTags;
 import com.uraneptus.sullysmod.core.registry.SMBlocks;
 import com.uraneptus.sullysmod.core.registry.SMFluidTypes;
 import com.uraneptus.sullysmod.core.registry.SMFluids;
@@ -21,6 +22,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.levelgen.WorldDimensions;
 import net.minecraft.world.level.material.*;
 import net.minecraftforge.event.ForgeEventFactory;
 import net.minecraftforge.fluids.FluidType;
@@ -53,22 +55,45 @@ public Item getBucket() {
         return SMItems.MOLTEN_AMBER_BUCKET.get();
     }
 
+    @Override
+    public void tick(Level pLevel, BlockPos pPos, FluidState pState) {
+        super.tick(pLevel, pPos, pState);
+        RandomSource random = pLevel.getRandom();
+        if (random.nextInt(5) == 0) {
+            boolean cooldown = true;
+            if (pLevel.dimension() == Level.NETHER) {
+                cooldown = false;
+            } else {
+                for (BlockPos pos : BlockPos.betweenClosed(pPos.offset(-1, -1, -1), pPos.offset(1, 1, 1))) {
+                    if (pLevel.getBlockState(pos).is(SMBlockTags.MELTS_AMBER)) {
+                        cooldown = false;
+                        break;
+                    }
+                }
+            }
+            if (cooldown) {
+                if (pLevel.getBlockState(pPos).getBlock() instanceof LiquidBlock) {
+                    pLevel.setBlock(pPos, ForgeEventFactory.fireFluidPlaceBlockEvent(pLevel, pPos, pPos, SMBlocks.AMBER.get().defaultBlockState()), 3);
+                }
+            }
+        }
+    }
+
     public void animateTick(Level pLevel, BlockPos pPos, FluidState pState, RandomSource pRandom) {
         BlockPos blockpos = pPos.above();
         if (pLevel.getBlockState(blockpos).isAir() && !pLevel.getBlockState(blockpos).isSolidRender(pLevel, blockpos)) {
             if (pRandom.nextInt(100) == 0) {
-                double d0 = (double)pPos.getX() + pRandom.nextDouble();
-                double d1 = (double)pPos.getY() + 1.0;
-                double d2 = (double)pPos.getZ() + pRandom.nextDouble();
+                double d0 = (double) pPos.getX() + pRandom.nextDouble();
+                double d1 = (double) pPos.getY() + 1.0;
+                double d2 = (double) pPos.getZ() + pRandom.nextDouble();
                 pLevel.addParticle(ParticleTypes.LAVA, d0, d1, d2, 0.0, 0.0, 0.0);
                 pLevel.playLocalSound(d0, d1, d2, SoundEvents.LAVA_POP, SoundSource.BLOCKS, 0.2F + pRandom.nextFloat() * 0.2F, 0.9F + pRandom.nextFloat() * 0.15F, false);
             }
 
             if (pRandom.nextInt(200) == 0) {
-                pLevel.playLocalSound((double)pPos.getX(), (double)pPos.getY(), (double)pPos.getZ(), SoundEvents.LAVA_AMBIENT, SoundSource.BLOCKS, 0.2F + pRandom.nextFloat() * 0.2F, 0.9F + pRandom.nextFloat() * 0.15F, false);
+                pLevel.playLocalSound((double) pPos.getX(), (double) pPos.getY(), (double) pPos.getZ(), SoundEvents.LAVA_AMBIENT, SoundSource.BLOCKS, 0.2F + pRandom.nextFloat() * 0.2F, 0.9F + pRandom.nextFloat() * 0.15F, false);
             }
         }
-
     }
 
     public void randomTick(Level pLevel, BlockPos pPos, FluidState pState, RandomSource pRandom) {
@@ -193,12 +218,13 @@ protected boolean canConvertToSource(Level pLevel) {
         return pLevel.getGameRules().getBoolean(GameRules.RULE_LAVA_SOURCE_CONVERSION);
     }
 
+    @Override
     protected void spreadTo(LevelAccessor pLevel, BlockPos pPos, BlockState pBlockState, Direction pDirection, FluidState pFluidState) {
         if (pDirection == Direction.DOWN) {
             FluidState fluidstate = pLevel.getFluidState(pPos);
-            if (this.is(FluidTags.LAVA) && fluidstate.is(FluidTags.WATER)) {
+            if (fluidstate.is(FluidTags.WATER)) {
                 if (pBlockState.getBlock() instanceof LiquidBlock) {
-                    pLevel.setBlock(pPos, ForgeEventFactory.fireFluidPlaceBlockEvent(pLevel, pPos, pPos, Blocks.STONE.defaultBlockState()), 3);
+                    pLevel.setBlock(pPos, ForgeEventFactory.fireFluidPlaceBlockEvent(pLevel, pPos, pPos, SMBlocks.AMBER.get().defaultBlockState()), 3);
                 }
 
                 this.fizz(pLevel, pPos);

diff --git a/src/main/java/com/uraneptus/sullysmod/core/registry/SMFluidTypes.java b/src/main/java/com/uraneptus/sullysmod/core/registry/SMFluidTypes.java
@@ -18,7 +18,7 @@ public class SMFluidTypes {
     public static final DeferredRegister<FluidType> FLUID_TYPES = DeferredRegister.create(ForgeRegistries.Keys.FLUID_TYPES, SullysMod.MOD_ID);
 
     public static final RegistryObject<FluidType> MOLTEN_AMBER_FLUID_TYPE = register("molten_amber_fluid",
-            FluidType.Properties.create().lightLevel(10).density(15).viscosity(10));
+            FluidType.Properties.create().lightLevel(10).density(10).viscosity(5).supportsBoating(false).canSwim(false).canPushEntity(true).temperature(1));
 
 
 

diff --git a/src/main/java/com/uraneptus/sullysmod/core/registry/SMFluids.java b/src/main/java/com/uraneptus/sullysmod/core/registry/SMFluids.java
@@ -22,7 +22,7 @@ public class SMFluids {
 
     public static final ForgeFlowingFluid.Properties MOLTEN_AMBER_PROPERTIES = new ForgeFlowingFluid.Properties(
              SMFluidTypes.MOLTEN_AMBER_FLUID_TYPE, SOURCE_MOLTEN_AMBER, FLOWING_MOLTEN_AMBER)
-            .slopeFindDistance(2).levelDecreasePerBlock(2).block(SMBlocks.MOLTEN_AMBER_BLOCK)
+            .slopeFindDistance(2).levelDecreasePerBlock(1).block(SMBlocks.MOLTEN_AMBER_BLOCK)
             .bucket(SMItems.MOLTEN_AMBER_BUCKET);
 
 }