untested new beta

Author: GL33P-0R4NG3

src/main/java/me/gleep/oreganized/Oreganized.java

@@ -7,7 +7,11 @@
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.ItemBlockRenderTypes;
 import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.block.BlockRenderDispatcher;
+import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
 import net.minecraft.client.renderer.item.ItemProperties;
+import net.minecraft.client.renderer.item.ItemPropertyFunction;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
@@ -84,9 +88,13 @@ private void doClientStuff(final FMLClientSetupEvent event) {
         ItemBlockRenderTypes.setRenderLayer(RegistryHandler.WHITE_CRYSTAL_GLASS_PANE.get(), RenderType.translucent());
         ItemBlockRenderTypes.setRenderLayer(RegistryHandler.YELLOW_CRYSTAL_GLASS_PANE.get(), RenderType.translucent());
 
-        ItemBlockRenderTypes.setRenderLayer(RegistryHandler.LEAD_FLUID.get(), RenderType.waterMask());
-        //ItemBlockRenderTypes.setRenderLayer(RegistryHandler.LEAD_FLUID_BLOCK.get(), RenderType.getSolid());
+        ItemBlockRenderTypes.setRenderLayer(RegistryHandler.MOLTEN_LEAD_BLOCK.get(), RenderType.translucent());
 
+        event.enqueueWork(() -> ItemProperties.register(RegistryHandler.SILVER_INGOT.get(),
+                new ResourceLocation(Oreganized.MOD_ID + ":shine"),
+                (ItemStack p_174676_, @Nullable ClientLevel p_174677_, @Nullable LivingEntity p_174678_, int p_174679_) ->
+                        p_174676_.getTag() != null ? (p_174676_.getTag().getBoolean("Shine") ? 1 : 0) : 0)
+        );
         event.enqueueWork(() -> ItemProperties.register(RegistryHandler.SILVER_MIRROR.get(),
                 new ResourceLocation(Oreganized.MOD_ID + ":dist"),
                 (ItemStack p_174676_, @Nullable ClientLevel p_174677_, @Nullable LivingEntity p_174678_, int p_174679_) ->

src/main/java/me/gleep/oreganized/blocks/ExposerBlock.java

@@ -14,7 +14,6 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.entity.HopperBlockEntity;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -28,6 +27,7 @@
 import java.util.Random;
 
 public class ExposerBlock extends DirectionalBlock implements EntityBlock {
+    public static final float RANGE = 16.0f;
     public static final IntegerProperty LEVEL = BlockStateProperties.AGE_3;
     public static final int[] POWER_STATES = new int[] {0, 1, 2, 3};
     boolean isUndeadNearby = false;
@@ -64,19 +64,14 @@ public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level p_153212_, B
         return ExposerBlockEntity::tick;
     }
 
-    /*@Nullable
-    public BlockEntityTicker<ExposerBlockEntity> getTicker(Level level, BlockState blockState, BlockEntityType<T> blockEntityType) {
-        return level.isClientSide ? null : ExposerBlockEntity::tick;
-    }*/
-
     @Override
     public boolean isSignalSource(BlockState p_60571_) {
         return true;
     }
 
     @Override
     public int getSignal(BlockState p_60483_, BlockGetter p_60484_, BlockPos p_60485_, Direction p_60486_) {
-        return p_60483_.getSignal(p_60484_, p_60485_, p_60486_);
+        return p_60483_.getDirectSignal(p_60484_, p_60485_, p_60486_);
     }
 
     @Override
@@ -104,8 +99,8 @@ public void tick(BlockState p_60462_, ServerLevel p_60463_, BlockPos p_60464_, R
         int dist = 4;
 
         List<Entity> list = p_60463_.getEntities((Entity) null,
-                new AABB(p_60464_.getX() + SilverBlock.RANGE, p_60464_.getY() + SilverBlock.RANGE, p_60464_.getZ() + SilverBlock.RANGE,
-                        p_60464_.getX() - SilverBlock.RANGE, p_60464_.getY() - SilverBlock.RANGE, p_60464_.getZ() - SilverBlock.RANGE),
+                new AABB(p_60464_.getX() + RANGE, p_60464_.getY() + RANGE, p_60464_.getZ() + RANGE,
+                        p_60464_.getX() - RANGE, p_60464_.getY() - RANGE, p_60464_.getZ() - RANGE),
                 (Entity entity) -> entity instanceof LivingEntity
         );
 
@@ -114,10 +109,10 @@ public void tick(BlockState p_60462_, ServerLevel p_60463_, BlockPos p_60464_, R
             if (living.isInvertedHealAndHarm()) {
                 isUndeadNearby = true;
                 double distance = Mth.sqrt((float) living.distanceToSqr(p_60464_.getX(), p_60464_.getY(), p_60464_.getZ()));
-                if (distance < SilverBlock.RANGE && ((int) Math.ceil(distance / (SilverBlock.RANGE / 4))) < dist) {
+                if (distance < RANGE && ((int) Math.ceil(distance / (RANGE / 4))) < dist) {
                     if (distance <= 6) {
                         dist = 1;
-                    } else dist = Math.max((int) Math.ceil(distance / (SilverBlock.RANGE / 4)), 2);
+                    } else dist = Math.max((int) Math.ceil(distance / (RANGE / 4)), 2);
 
                     if (dist > 3) {
                         dist = 3;

src/main/java/me/gleep/oreganized/blocks/LeadOre.java

@@ -6,6 +6,7 @@
 import net.minecraft.core.Direction;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
+import net.minecraft.tags.FluidTags;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.Entity;
@@ -14,6 +15,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
@@ -23,28 +25,63 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.gameevent.GameEvent;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Material;
+import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.level.pathfinder.BlockPathTypes;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.EntityCollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraftforge.client.IBlockRenderProperties;
 
 import javax.annotation.Nullable;
 import java.util.Optional;
+import java.util.function.Consumer;
 
 public class MoltenLeadBlock extends Block implements BucketPickup {
     public MoltenLeadBlock() {
-        super(BlockBehaviour.Properties.of(Material.LAVA)
+        super(BlockBehaviour.Properties.of((new Material.Builder(MaterialColor.COLOR_PURPLE)).noCollider().nonSolid().liquid().build())
                 .strength(-1.0F, 3600000.0F)
                 .noDrops()
                 .requiresCorrectToolForDrops());
     }
 
 
+
+    @Override
+    public boolean skipRendering(BlockState p_60532_, BlockState p_60533_, Direction p_60534_) {
+        return super.skipRendering(p_60532_, p_60533_, p_60534_);
+    }
+
+    @Override
+    public BlockState updateShape(BlockState state, Direction p_60542_, BlockState neighbour, LevelAccessor level, BlockPos pos, BlockPos neighbourPos) {
+        if (level.isWaterAt(neighbourPos)) {
+            level.levelEvent(1501, pos, 0);
+
+            return RegistryHandler.LEAD_BLOCK.get().defaultBlockState();
+        }
+
+        return super.updateShape(state, p_60542_, neighbour, level, pos, neighbourPos);
+    }
+
+    @Override
+    public void neighborChanged(BlockState p_60509_, Level level, BlockPos pos, Block p_60512_, BlockPos neighbourPos, boolean p_60514_) {
+        if (level.getFluidState(neighbourPos).is(FluidTags.WATER)) {
+            level.setBlockAndUpdate(pos, RegistryHandler.LEAD_BLOCK.get().defaultBlockState());
+
+            level.levelEvent(1501, pos, 0);
+        } else if (level.getFluidState(neighbourPos).is(FluidTags.LAVA)) {
+
+        }
+
+
+        super.neighborChanged(p_60509_, level, pos, p_60512_, neighbourPos, p_60514_);
+    }
+
     /**
      * Get the {@code PathNodeType} for this block. Return {@code null} for vanilla behavior.
      *
@@ -74,33 +111,6 @@ public boolean canEntityDestroy(BlockState state, BlockGetter world, BlockPos po
         return false;
     }
 
-    @Override
-    public void playerWillDestroy(Level p_49852_, BlockPos p_49853_, BlockState p_49854_, Player p_49855_) { }
-
-    /**
-     * Called when a player removes a block.  This is responsible for
-     * actually destroying the block, and the block is intact at time of call.
-     * This is called regardless of whether the player can harvest the block or
-     * not.
-     * <p>
-     * Return true if the block is actually destroyed.
-     * <p>
-     * Note: When used in multiplayer, this is called on both client and
-     * server sides!
-     *
-     * @param state       The current state.
-     * @param world       The current world
-     * @param pos         Block position in world
-     * @param player      The player damaging the block, may be null
-     * @param willHarvest True if Block.harvestBlock will be called after this, if the return in true.
-     *                    Can be useful to delay the destruction of tile entities till after harvestBlock
-     * @param fluid       The current fluid state at current position
-     * @return True if the block is actually destroyed.
-     */
-    @Override
-    public boolean removedByPlayer(BlockState state, Level world, BlockPos pos, Player player, boolean willHarvest, FluidState fluid) {
-        return false;
-    }
 
     @Override
     public int getLightBlock(BlockState p_60585_, BlockGetter p_60586_, BlockPos p_60587_) {
@@ -118,25 +128,16 @@ public VoxelShape getCollisionShape(BlockState p_60572_, BlockGetter p_60573_, B
         }
         return Shapes.empty();
     }
-    
-    @Override
-    public FluidState getFluidState(BlockState p_60577_) {
-        return RegistryHandler.LEAD_FLUID.get().defaultFluidState();
-    }
-    
+
     @Override
     public VoxelShape getShape(BlockState p_60555_, BlockGetter p_60556_, BlockPos p_60557_, CollisionContext p_60558_) {
-        //return p_60558_.isHoldingItem(Items.BUCKET) || p_60558_.isHoldingItem(RegistryHandler.MOLTEN_LEAD_BUCKET.get()) ? Shapes.block() : Shapes.empty();
-        return Shapes.empty();
-    }
-
-    /*@Override
-    public InteractionResult use(BlockState p_60503_, Level p_60504_, BlockPos p_60505_, Player p_60506_, InteractionHand p_60507_, BlockHitResult p_60508_) {
-        if (p_60506_.getItemInHand(p_60507_).getItem().equals(Items.BUCKET) || p_60506_.getItemInHand(p_60507_).getItem().equals(RegistryHandler.MOLTEN_LEAD_BUCKET.get())){
-            return InteractionResult.SUCCESS;
+        if (((EntityCollisionContext)p_60558_).getEntity().isPresent()) {
+            return p_60558_.isHoldingItem(Items.BUCKET)
+                    || p_60558_.isHoldingItem(RegistryHandler.MOLTEN_LEAD_BUCKET.get()) ? Shapes.block() : Shapes.empty();
         }
-        return InteractionResult.PASS;
-    }*/
+
+        return Shapes.block();
+    }
 
     /**
      * Determines if the player can harvest this block, obtaining it's drops when the block is destroyed.
@@ -178,8 +179,4 @@ public Optional<SoundEvent> getPickupSound() {
         return Optional.of(SoundEvents.BUCKET_FILL_LAVA);
     }
 
-    /*@Override
-    public boolean isSideInvisible(BlockState state, BlockState adjacentBlockState, Direction side) {
-        return state.getBlock().equals(adjacentBlockState.getBlock());
-    }*/
 }