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
---
 .../java/gregtech/api/enums/GT_HatchElement.java   | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/src/main/java/gregtech/api/enums/GT_HatchElement.java b/src/main/java/gregtech/api/enums/GT_HatchElement.java
index 5e26c43f80..1bc94340bb 100644
--- a/src/main/java/gregtech/api/enums/GT_HatchElement.java
+++ b/src/main/java/gregtech/api/enums/GT_HatchElement.java
@@ -19,52 +19,52 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-public enum GT_HatchElement implements IHatchElement<GT_MetaTileEntity_EnhancedMultiBlockBase<?>> {
+public enum GT_HatchElement implements IHatchElement<GT_MetaTileEntity_MultiBlockBase> {
     Muffler(GT_MetaTileEntity_MultiBlockBase::addMufflerToMachineList, GT_MetaTileEntity_Hatch_Muffler.class) {
         @Override
-        public long count(GT_MetaTileEntity_EnhancedMultiBlockBase<?> t) {
+        public long count(GT_MetaTileEntity_MultiBlockBase t) {
             return t.mMufflerHatches.size();
         }
     },
     Maintenance(GT_MetaTileEntity_MultiBlockBase::addMaintenanceToMachineList, GT_MetaTileEntity_Hatch_Maintenance.class) {
         @Override
-        public long count(GT_MetaTileEntity_EnhancedMultiBlockBase<?> t) {
+        public long count(GT_MetaTileEntity_MultiBlockBase t) {
             return t.mMaintenanceHatches.size();
         }
     },
     InputHatch(GT_MetaTileEntity_MultiBlockBase::addInputHatchToMachineList, GT_MetaTileEntity_Hatch_Input.class) {
         @Override
-        public long count(GT_MetaTileEntity_EnhancedMultiBlockBase<?> t) {
+        public long count(GT_MetaTileEntity_MultiBlockBase t) {
             return t.mInputHatches.size();
         }
     },
     InputBus(GT_MetaTileEntity_MultiBlockBase::addInputBusToMachineList, GT_MetaTileEntity_Hatch_InputBus.class) {
         @Override
-        public long count(GT_MetaTileEntity_EnhancedMultiBlockBase<?> t) {
+        public long count(GT_MetaTileEntity_MultiBlockBase t) {
             return t.mInputBusses.size();
         }
     },
     OutputHatch(GT_MetaTileEntity_MultiBlockBase::addOutputHatchToMachineList, GT_MetaTileEntity_Hatch_Output.class) {
         @Override
-        public long count(GT_MetaTileEntity_EnhancedMultiBlockBase<?> t) {
+        public long count(GT_MetaTileEntity_MultiBlockBase t) {
             return t.mOutputHatches.size();
         }
     },
     OutputBus(GT_MetaTileEntity_MultiBlockBase::addOutputBusToMachineList, GT_MetaTileEntity_Hatch_OutputBus.class) {
         @Override
-        public long count(GT_MetaTileEntity_EnhancedMultiBlockBase<?> t) {
+        public long count(GT_MetaTileEntity_MultiBlockBase t) {
             return t.mOutputBusses.size();
         }
     },
     Energy(GT_MetaTileEntity_MultiBlockBase::addEnergyInputToMachineList, GT_MetaTileEntity_Hatch_Energy.class) {
         @Override
-        public long count(GT_MetaTileEntity_EnhancedMultiBlockBase<?> t) {
+        public long count(GT_MetaTileEntity_MultiBlockBase t) {
             return t.mEnergyHatches.size();
         }
     },
     Dynamo(GT_MetaTileEntity_MultiBlockBase::addDynamoToMachineList, GT_MetaTileEntity_Hatch_Dynamo.class) {
         @Override
-        public long count(GT_MetaTileEntity_EnhancedMultiBlockBase<?> t) {
+        public long count(GT_MetaTileEntity_MultiBlockBase t) {
             return t.mDynamoHatches.size();
         }
     },
@@ -75,16 +75,16 @@ public enum GT_HatchElement implements IHatchElement<GT_MetaTileEntity_EnhancedM
         }
 
         @Override
-        public long count(GT_MetaTileEntity_EnhancedMultiBlockBase<?> t) {
+        public long count(GT_MetaTileEntity_MultiBlockBase t) {
             return t.getExoticEnergyHatches().size();
         }
     },
     ;
     private final List<Class<? extends IMetaTileEntity>> mteClasses;
-    private final IGT_HatchAdder<GT_MetaTileEntity_EnhancedMultiBlockBase<?>> adder;
+    private final IGT_HatchAdder<GT_MetaTileEntity_MultiBlockBase> adder;
 
     @SafeVarargs
-    GT_HatchElement(IGT_HatchAdder<GT_MetaTileEntity_EnhancedMultiBlockBase<?>> adder, Class<? extends IMetaTileEntity>... mteClasses) {
+    GT_HatchElement(IGT_HatchAdder<GT_MetaTileEntity_MultiBlockBase> adder, Class<? extends IMetaTileEntity>... mteClasses) {
         this.mteClasses = Collections.unmodifiableList(Arrays.asList(mteClasses));
         this.adder = adder;
     }
@@ -94,7 +94,7 @@ public enum GT_HatchElement implements IHatchElement<GT_MetaTileEntity_EnhancedM
         return mteClasses;
     }
 
-    public IGT_HatchAdder<? super GT_MetaTileEntity_EnhancedMultiBlockBase<?>> adder() {
+    public IGT_HatchAdder<? super GT_MetaTileEntity_MultiBlockBase> adder() {
         return adder;
     }
 }
-- 
cgit