return default energy container in ARL

remove redundant methods
GregTechCEu · Jan 20, 2025 · fcff27d · fcff27d
1 parent abf09de
commit fcff27d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 20 deletions.
diff --git a/src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java
@@ -120,7 +120,9 @@ protected long getEnergyCapacity() {
         return getEnergyContainer().getEnergyCapacity();
     }
 
-    protected abstract IEnergyContainer getEnergyContainer();
+    protected IEnergyContainer getEnergyContainer() {
+        return IEnergyContainer.DEFAULT;
+    }
 
     /**
      * Draw energy from the energy container

diff --git a/src/main/java/gregtech/api/capability/impl/BoilerRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/BoilerRecipeLogic.java
@@ -334,7 +334,7 @@ public long getMaxVoltage() {
     @Override
     protected IEnergyContainer getEnergyContainer() {
         GTLog.logger.error("Large Boiler called getEnergyContainer(), this should not be possible!");
-        return IEnergyContainer.DEFAULT;
+        return super.getEnergyContainer();
     }
 
     /**

diff --git a/src/main/java/gregtech/api/capability/impl/PrimitiveRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/PrimitiveRecipeLogic.java
@@ -1,7 +1,6 @@
 package gregtech.api.capability.impl;
 
 import gregtech.api.GTValues;
-import gregtech.api.capability.IEnergyContainer;
 import gregtech.api.metatileentity.multiblock.RecipeMapPrimitiveMultiblockController;
 import gregtech.api.recipes.RecipeMap;
 import gregtech.api.recipes.logic.OCParams;
@@ -34,11 +33,6 @@ protected long getEnergyCapacity() {
         return Integer.MAX_VALUE;
     }
 
-    @Override
-    protected IEnergyContainer getEnergyContainer() {
-        return IEnergyContainer.DEFAULT;
-    }
-
     @Override
     protected boolean drawEnergy(long recipeEUt, boolean simulate) {
         return true; // spoof energy being drawn

diff --git a/src/main/java/gregtech/api/capability/impl/RecipeLogicSteam.java b/src/main/java/gregtech/api/capability/impl/RecipeLogicSteam.java
@@ -2,7 +2,6 @@
 
 import gregtech.api.GTValues;
 import gregtech.api.capability.GregtechDataCodes;
-import gregtech.api.capability.IEnergyContainer;
 import gregtech.api.capability.IVentable;
 import gregtech.api.damagesources.DamageSources;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -216,11 +215,6 @@ protected long getEnergyCapacity() {
         return (long) Math.floor(steamFluidTank.getCapacity() * conversionRate);
     }
 
-    @Override
-    protected IEnergyContainer getEnergyContainer() {
-        return IEnergyContainer.DEFAULT;
-    }
-
     @Override
     protected boolean drawEnergy(long recipeEUt, boolean simulate) {
         int resultDraw = GTUtility.safeCastLongToInt((long) Math.ceil(recipeEUt / conversionRate));

diff --git a/src/main/java/gregtech/api/capability/impl/SteamMultiblockRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/SteamMultiblockRecipeLogic.java
@@ -1,7 +1,6 @@
 package gregtech.api.capability.impl;
 
 import gregtech.api.GTValues;
-import gregtech.api.capability.IEnergyContainer;
 import gregtech.api.capability.IMultipleTankHandler;
 import gregtech.api.metatileentity.multiblock.RecipeMapSteamMultiblockController;
 import gregtech.api.recipes.Recipe;
@@ -48,11 +47,6 @@ public IFluidTank getSteamFluidTankCombined() {
         return steamFluidTankCombined;
     }
 
-    @Override
-    protected IEnergyContainer getEnergyContainer() {
-        return IEnergyContainer.DEFAULT;
-    }
-
     @Override
     protected IItemHandlerModifiable getInputInventory() {
         RecipeMapSteamMultiblockController controller = (RecipeMapSteamMultiblockController) metaTileEntity;