Amber Rendering Changes + Amber Fluid Freezing

MosaicModding · Aug 26, 2024 · eb64ff6 · eb64ff6
1 parent d93415c
commit eb64ff6
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 29 deletions.
diff --git a/src/main/java/com/uraneptus/sullysmod/common/blocks/AmberBlock.java b/src/main/java/com/uraneptus/sullysmod/common/blocks/AmberBlock.java
@@ -7,6 +7,7 @@
 import com.uraneptus.sullysmod.core.other.tags.SMBlockTags;
 import com.uraneptus.sullysmod.core.registry.SMBlocks;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 import net.minecraft.core.particles.BlockParticleOption;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.nbt.CompoundTag;
@@ -48,6 +49,21 @@ public RenderShape getRenderShape(BlockState pState) {
         return RenderShape.MODEL;
     }
 
+    @Override
+    public boolean skipRendering(BlockState pState, BlockState pAdjacentBlockState, Direction pSide) {
+        return pAdjacentBlockState.is(this) || super.skipRendering(pState, pAdjacentBlockState, pSide);
+    }
+
+    @Override
+    public float getShadeBrightness(BlockState pState, BlockGetter pLevel, BlockPos pPos) {
+        return 1.0F;
+    }
+
+    @Override
+    public boolean propagatesSkylightDown(BlockState pState, BlockGetter pReader, BlockPos pPos) {
+        return true;
+    }
+
     public VoxelShape getCollisionShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, CollisionContext pContext) {
         BlockEntity blockEntity = pLevel.getBlockEntity(pPos);
 

diff --git a/src/main/java/com/uraneptus/sullysmod/common/fluids/MoltenAmberFluid.java b/src/main/java/com/uraneptus/sullysmod/common/fluids/MoltenAmberFluid.java
@@ -55,33 +55,6 @@ 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();
-        int k = 5;
-        if (pState.isSource()) {
-            k = 15;
-        }
-        if (random.nextInt(k) == 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();
@@ -135,7 +108,28 @@ public void randomTick(Level pLevel, BlockPos pPos, FluidState pState, RandomSou
                 }
             }
         }
-
+        int k = 2;
+        if (pState.isSource()) {
+            k = 15;
+        }
+        if (pRandom.nextInt(k) == 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) && !pLevel.getBlockState(pos).is(SMBlocks.MOLTEN_AMBER_BLOCK.get())) {
+                        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);
+                }
+            }
+        }
     }
 
     private boolean hasFlammableNeighbours(LevelReader pLevel, BlockPos pPos) {

diff --git a/src/main/java/com/uraneptus/sullysmod/data/server/tags/SMBlockTagsProvider.java b/src/main/java/com/uraneptus/sullysmod/data/server/tags/SMBlockTagsProvider.java
@@ -149,7 +149,7 @@ public void addTags(HolderLookup.Provider pProvider) {
                 Blocks.CAMPFIRE,
                 Blocks.SOUL_CAMPFIRE,
                 Blocks.LAVA,
-                SMBlocks.AMBER_LANTERN.get()
+                SMBlocks.MOLTEN_AMBER_BLOCK.get()
         );
 
         //Forge Tags