From 39a672b7c4b7b9033d4577c6dae1d4ea0a414ee3 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Wed, 10 Aug 2022 07:47:17 +0800
Subject: loosen the generic restrictions on hatch elements (#1236)

It honestly never occurred to me that SOMEONE would not derive from GT_MetaTileEntity_EnhancedMultiblockBase
---
 src/main/java/gregtech/api/util/GT_HatchElementBuilder.java | 5 +++--
 src/main/java/gregtech/api/util/GT_StructureUtility.java    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_HatchElementBuilder.java b/src/main/java/gregtech/api/util/GT_HatchElementBuilder.java
index 94b5f626c1..91d4d9a156 100644
--- a/src/main/java/gregtech/api/util/GT_HatchElementBuilder.java
+++ b/src/main/java/gregtech/api/util/GT_HatchElementBuilder.java
@@ -10,6 +10,7 @@ import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.common.blocks.GT_Item_Machines;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -28,7 +29,7 @@ import java.util.stream.Stream;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 
-public class GT_HatchElementBuilder<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<?>> {
+public class GT_HatchElementBuilder<T> {
     private interface Builtin {
     }
 
@@ -44,7 +45,7 @@ public class GT_HatchElementBuilder<T extends GT_MetaTileEntity_EnhancedMultiBlo
     private GT_HatchElementBuilder() {
     }
 
-    public static <T extends GT_MetaTileEntity_EnhancedMultiBlockBase<?>> GT_HatchElementBuilder<T> builder() {
+    public static <T> GT_HatchElementBuilder<T> builder() {
         return new GT_HatchElementBuilder<>();
     }
 
diff --git a/src/main/java/gregtech/api/util/GT_StructureUtility.java b/src/main/java/gregtech/api/util/GT_StructureUtility.java
index 7938214319..dc3112621e 100644
--- a/src/main/java/gregtech/api/util/GT_StructureUtility.java
+++ b/src/main/java/gregtech/api/util/GT_StructureUtility.java
@@ -16,6 +16,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
 import gregtech.common.blocks.GT_Block_Casings5;
 import gregtech.common.blocks.GT_Item_Machines;
@@ -98,14 +99,14 @@ public class GT_StructureUtility {
         };
     }
 
-    public static <T extends GT_MetaTileEntity_EnhancedMultiBlockBase<?>> GT_HatchElementBuilder<T> buildHatchAdder() {
+    public static <T> GT_HatchElementBuilder<T> buildHatchAdder() {
         return GT_HatchElementBuilder.builder();
     }
 
     /**
      * Completely equivalent to {@link #buildHatchAdder()}, except it plays nicer with type inference when statically imported
      */
-    public static <T extends GT_MetaTileEntity_EnhancedMultiBlockBase<?>> GT_HatchElementBuilder<T> buildHatchAdder(Class<T> typeToken) {
+    public static <T> GT_HatchElementBuilder<T> buildHatchAdder(Class<T> typeToken) {
         return GT_HatchElementBuilder.builder();
     }
 
-- 
cgit