Fix MachineDefinition.getBlockEntityType()'s generic being too broad (#4903)

Author: screret

src/main/java/com/gregtechceu/gtceu/api/machine/MachineDefinition.java

@@ -18,7 +18,6 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -57,7 +56,7 @@ public class MachineDefinition implements Supplier<MetaMachineBlock> {
     @Setter
     private Supplier<? extends MetaMachineItem> itemSupplier;
     @Setter
-    private Supplier<BlockEntityType<? extends BlockEntity>> blockEntityTypeSupplier;
+    private Supplier<BlockEntityType<? extends MetaMachine>> blockEntityTypeSupplier;
     @Getter
     @Setter
     private GTRecipeType[] recipeTypes;
@@ -152,7 +151,7 @@ public MetaMachineItem getItem() {
         return itemSupplier.get();
     }
 
-    public BlockEntityType<? extends BlockEntity> getBlockEntityType() {
+    public BlockEntityType<? extends MetaMachine> getBlockEntityType() {
         return blockEntityTypeSupplier.get();
     }
 

src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java

@@ -38,7 +38,6 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
@@ -118,7 +117,7 @@ public class MachineBuilder<DEFINITION extends MachineDefinition, MACHINE extend
     private Consumer<BlockBuilder<? extends Block, ?>> blockBuilder;
     @Nullable
     private Consumer<ItemBuilder<? extends MetaMachineItem, ?>> itemBuilder;
-    private NonNullConsumer<BlockEntityType<BlockEntity>> onBlockEntityRegister = NonNullConsumer.noop();
+    private NonNullConsumer<BlockEntityType<MACHINE>> onBlockEntityRegister = NonNullConsumer.noop();
     @Getter // getter for KJS
     private @NotNull GTRecipeType @NotNull [] recipeTypes = new GTRecipeType[0];
     @Getter // getter for KJS
@@ -241,7 +240,7 @@ public SELF itemBuilder(Consumer<ItemBuilder<? extends MetaMachineItem, ?>> item
         return getThis();
     }
 
-    public SELF onBlockEntityRegister(NonNullConsumer<BlockEntityType<BlockEntity>> onBlockEntityRegister) {
+    public SELF onBlockEntityRegister(NonNullConsumer<BlockEntityType<MACHINE>> onBlockEntityRegister) {
         this.onBlockEntityRegister = onBlockEntityRegister;
         return getThis();
     }
@@ -691,7 +690,7 @@ public DEFINITION register() {
         var item = itemBuilder.register();
 
         var blockEntityBuilder = registrate
-                .blockEntity(
+                .<MACHINE>blockEntity(
                         (type, pos, state) -> instanceFactory
                                 .buildMachine(new BlockEntityCreationInfo(type, pos, state)))
                 .onRegister(onBlockEntityRegister)

src/main/java/com/gregtechceu/gtceu/client/model/machine/MachineModel.java

@@ -38,7 +38,6 @@
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockAndTintGetter;
-import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
@@ -61,7 +60,7 @@
 import java.util.stream.Collectors;
 
 public final class MachineModel extends BaseBakedModel implements ICoverableRenderer,
-                                IBlockEntityRendererBakedModel<BlockEntity> {
+                                IBlockEntityRendererBakedModel<MetaMachine> {
 
     public static final ResourceLocation PIPE_OVERLAY = GTCEu.id("block/overlay/machine/overlay_pipe");
     public static final ResourceLocation FLUID_OUTPUT_OVERLAY = GTCEu.id("block/overlay/machine/overlay_fluid_output");
@@ -432,10 +431,9 @@ public boolean isCustomRenderer() {
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
-    public void render(BlockEntity blockEntity, float partialTick,
+    public void render(MetaMachine machine, float partialTick,
                        PoseStack poseStack, MultiBufferSource buffer,
                        int packedLight, int packedOverlay) {
-        if (!(blockEntity instanceof MetaMachine machine)) return;
         if (machine.getDefinition() != getDefinition()) return;
         ICoverableRenderer.super.renderDynamicCovers(machine, partialTick, poseStack, buffer,
                 packedLight,
@@ -463,10 +461,9 @@ public void renderByItem(ItemStack stack, ItemDisplayContext displayContext,
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
-    public AABB getRenderBoundingBox(BlockEntity blockEntity) {
-        AABB bounds = IBlockEntityRendererBakedModel.super.getRenderBoundingBox(blockEntity);
+    public AABB getRenderBoundingBox(MetaMachine machine) {
+        AABB bounds = IBlockEntityRendererBakedModel.super.getRenderBoundingBox(machine);
 
-        if (!(blockEntity instanceof MetaMachine machine)) return bounds;
         if (machine.getDefinition() != getDefinition()) return bounds;
         if (dynamicRenders.isEmpty()) return bounds;
 
@@ -478,8 +475,7 @@ public AABB getRenderBoundingBox(BlockEntity blockEntity) {
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
-    public boolean shouldRenderOffScreen(BlockEntity blockEntity) {
-        if (!(blockEntity instanceof MetaMachine machine)) return false;
+    public boolean shouldRenderOffScreen(MetaMachine machine) {
         if (machine.getDefinition() != getDefinition()) return false;
         if (dynamicRenders.isEmpty()) return false;
 
@@ -491,8 +487,7 @@ public boolean shouldRenderOffScreen(BlockEntity blockEntity) {
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
-    public boolean shouldRender(BlockEntity blockEntity, Vec3 cameraPos) {
-        if (!(blockEntity instanceof MetaMachine machine)) return false;
+    public boolean shouldRender(MetaMachine machine, Vec3 cameraPos) {
         if (machine.getDefinition() != getDefinition()) return false;
         if (machine.getCoverContainer().hasDynamicCovers()) return true;
         if (dynamicRenders.isEmpty()) return false;
@@ -515,7 +510,7 @@ public int getViewDistance() {
     }
 
     @Override
-    public BlockEntityType<? extends BlockEntity> getBlockEntityType() {
+    public BlockEntityType<? extends MetaMachine> getBlockEntityType() {
         return getDefinition().getBlockEntityType();
     }
 }