Fix early block entry dereference causing null pointer exception

Author: hlysine

src/main/java/com/hlysine/create_connected/CCBlocks.java

@@ -245,8 +245,8 @@ public class CCBlocks {
             .register();
 
     public static final BlockEntry<LinkedAnalogLeverBlock> LINKED_ANALOG_LEVER = REGISTRATE
-            .block("linked_analog_lever", properties -> new LinkedAnalogLeverBlock(properties, AllBlocks.ANALOG_LEVER.get()))
-            .initialProperties(AllBlocks.ANALOG_LEVER)
+            .block("linked_analog_lever", properties -> new LinkedAnalogLeverBlock(properties, AllBlocks.ANALOG_LEVER))
+            .initialProperties(() -> Blocks.LEVER)
             .transform(LinkedTransmitterItem.register())
             .blockstate(CCBlockStateGen.linkedLever(
                     Create.asResource("block/analog_lever/block"),

src/main/java/com/hlysine/create_connected/content/linkedtransmitter/LinkedAnalogLeverBlock.java

@@ -8,6 +8,7 @@
 import com.simibubi.create.content.redstone.analogLever.AnalogLeverBlock;
 import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
 import com.simibubi.create.content.schematics.requirement.ItemRequirement;
+import com.tterrag.registrate.util.nullness.NonNullSupplier;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.InteractionHand;
@@ -38,12 +39,12 @@
 public class LinkedAnalogLeverBlock extends AnalogLeverBlock implements ISpecialBlockItemRequirement, IWrenchable, LinkedTransmitterBlock {
 
     public static final BooleanProperty POWERED = BlockStateProperties.POWERED;
-    private final AnalogLeverBlock base;
+    private final NonNullSupplier<AnalogLeverBlock> baseSupplier;
 
-    public LinkedAnalogLeverBlock(Properties pProperties, AnalogLeverBlock base) {
+    public LinkedAnalogLeverBlock(Properties pProperties, NonNullSupplier<AnalogLeverBlock> baseSupplier) {
         super(pProperties);
         registerDefaultState(defaultBlockState().setValue(POWERED, false));
-        this.base = base;
+        this.baseSupplier = baseSupplier;
     }
 
     @Override
@@ -59,7 +60,7 @@ public Block getBlock() {
 
     @Override
     public Block getBase() {
-        return base;
+        return baseSupplier.get();
     }
 
     @Override
@@ -78,7 +79,7 @@ public Block getBase() {
     @SuppressWarnings("deprecation")
     @Override
     public @NotNull List<ItemStack> getDrops(@NotNull BlockState state, LootParams.@NotNull Builder builder) {
-        return base.getDrops(state, builder);
+        return getBase().getDrops(state, builder);
     }
 
     private boolean isHittingBase(BlockState state, BlockGetter level, BlockPos pos, HitResult hit) {
@@ -101,7 +102,7 @@ private boolean isHittingBase(BlockState state, BlockGetter level, BlockPos pos,
     public void onRemove(@NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull BlockState newState, boolean isMoving) {
         if (!state.is(newState.getBlock()) && !isMoving && getBlockEntityOptional(world, pos).map(be -> ((LinkedAnalogLeverBlockEntity) be).containsBase).orElse(false))
             Block.popResource(world, pos, new ItemStack(CCItems.LINKED_TRANSMITTER));
-        base.onRemove(state, world, pos, newState, isMoving);
+        getBase().onRemove(state, world, pos, newState, isMoving);
     }
 
     @Override
@@ -132,22 +133,22 @@ public void replaceBase(BlockState baseState, Level world, BlockPos pos) {
 
     public void replaceWithBase(BlockState state, Level world, BlockPos pos) {
         AllSoundEvents.CONTROLLER_TAKE.playOnServer(world, pos);
-        world.setBlockAndUpdate(pos, base.defaultBlockState()
+        world.setBlockAndUpdate(pos, getBase().defaultBlockState()
                 .setValue(FACING, state.getValue(FACING))
                 .setValue(FACE, state.getValue(FACE)));
     }
 
     @Override
     public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
         if (isHittingBase(state, world, pos, target))
-            return base.getCloneItemStack(state, target, world, pos, player);
+            return getBase().getCloneItemStack(state, target, world, pos, player);
         return new ItemStack(CCItems.LINKED_TRANSMITTER.get());
     }
 
     @Override
     public ItemRequirement getRequiredItems(BlockState state, BlockEntity be) {
         ArrayList<ItemStack> requiredItems = new ArrayList<>();
-        requiredItems.add(new ItemStack(base));
+        requiredItems.add(new ItemStack(getBase()));
         requiredItems.add(new ItemStack(CCItems.LINKED_TRANSMITTER.get()));
         return new ItemRequirement(ItemRequirement.ItemUseType.CONSUME, requiredItems);
     }