删除ECO提取物品一次只能提取Int上限的限制

一些小调整

Author: Circulate233

src/main/java/github/kasuminova/novaeng/client/gui/GuiEFabricatorController.java

@@ -13,6 +13,7 @@
 import github.kasuminova.novaeng.common.container.ContainerEFabricatorController;
 import github.kasuminova.novaeng.common.container.data.EFabricatorData;
 import github.kasuminova.novaeng.common.tile.ecotech.efabricator.EFabricatorController;
+import lombok.Getter;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.EntityPlayer;
@@ -29,6 +30,7 @@ public class GuiEFabricatorController extends GuiContainerDynamic<ContainerEFabr
     public static final ResourceLocation TEXTURES_ELEMENTS = new ResourceLocation(
             NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_elements.png");
 
+    @Getter
     private EFabricatorData data = null;
 
     public GuiEFabricatorController(final EFabricatorController controller, final EntityPlayer opening) {
@@ -61,8 +63,4 @@ public void onDataUpdate(final EFabricatorData data) {
         this.widgetController.postGuiEvent(new EFGUIDataUpdateEvent(this));
     }
 
-    public EFabricatorData getData() {
-        return data;
-    }
-
 }

src/main/java/github/kasuminova/novaeng/client/gui/GuiEFabricatorPatternSearch.java

@@ -12,6 +12,7 @@
 import github.kasuminova.novaeng.common.container.ContainerEFabricatorPatternSearch;
 import github.kasuminova.novaeng.common.container.data.EFabricatorPatternData;
 import github.kasuminova.novaeng.common.tile.ecotech.efabricator.EFabricatorController;
+import lombok.Getter;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.resources.I18n;
@@ -29,6 +30,7 @@ public class GuiEFabricatorPatternSearch extends GuiContainerDynamic<ContainerEF
     public static final ResourceLocation TEXTURES_INVENTORY = new ResourceLocation(
             NovaEngineeringCore.MOD_ID, "textures/gui/efabricator_inventory.png");
 
+    @Getter
     private EFabricatorPatternData data = null;
 
     public GuiEFabricatorPatternSearch(final EFabricatorController controller, final EntityPlayer opening) {
@@ -62,8 +64,4 @@ public void onDataUpdate(final EFabricatorPatternData data, final boolean fullUp
         this.widgetController.postGuiEvent(new EFPatternSearchGUIUpdateEvent(this, fullUpdate));
     }
 
-    public EFabricatorPatternData getData() {
-        return data;
-    }
-
 }

src/main/java/github/kasuminova/novaeng/client/gui/GuiEStorageController.java

@@ -14,6 +14,8 @@
 import github.kasuminova.novaeng.common.container.data.EStorageCellData;
 import github.kasuminova.novaeng.common.container.data.EStorageEnergyData;
 import github.kasuminova.novaeng.common.tile.ecotech.estorage.EStorageController;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.EntityPlayer;
@@ -22,6 +24,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+@Setter
+@Getter
 public class GuiEStorageController extends GuiContainerDynamic<ContainerEStorageController> {
     public static final ResourceLocation TEXTURES_BACKGROUND = new ResourceLocation(
             NovaEngineeringCore.MOD_ID, "textures/gui/estorage_controller.png");
@@ -48,22 +52,6 @@ protected void drawGuiContainerBackgroundLayer(final float partialTicks, final i
         super.drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY);
     }
 
-    public void setCellDataList(final List<EStorageCellData> cellDataList) {
-        this.cellDataList = cellDataList;
-    }
-
-    public List<EStorageCellData> getCellDataList() {
-        return cellDataList;
-    }
-
-    public EStorageEnergyData getEnergyData() {
-        return energyData;
-    }
-
-    public void setEnergyData(final EStorageEnergyData energyData) {
-        this.energyData = energyData;
-    }
-    
     public void onDataReceived() {
         this.widgetController.postGuiEvent(new ESGUIDataUpdateEvent());
     }

src/main/java/github/kasuminova/novaeng/common/container/ContainerECalculatorController.java

@@ -2,24 +2,20 @@
 
 import github.kasuminova.novaeng.common.tile.ecotech.ecalculator.ECalculatorController;
 import hellfirepvp.modularmachinery.common.container.ContainerBase;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.entity.player.EntityPlayer;
 
 public class ContainerECalculatorController extends ContainerBase<ECalculatorController> {
 
+    @Setter
+    @Getter
     protected int tickExisted = 0;
 
     public ContainerECalculatorController(final ECalculatorController owner, final EntityPlayer opening) {
         super(owner, opening);
     }
 
-    public int getTickExisted() {
-        return tickExisted;
-    }
-
-    public void setTickExisted(final int tickExisted) {
-        this.tickExisted = tickExisted;
-    }
-
     @Override
     protected void addPlayerSlots(final EntityPlayer opening) {
         // No player slots

src/main/java/github/kasuminova/novaeng/common/container/ContainerEFabricatorController.java

@@ -2,25 +2,21 @@
 
 import github.kasuminova.novaeng.common.tile.ecotech.efabricator.EFabricatorController;
 import hellfirepvp.modularmachinery.common.container.ContainerBase;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 
 public class ContainerEFabricatorController extends ContainerBase<EFabricatorController> {
 
+    @Setter
+    @Getter
     protected int tickExisted = 0;
 
     public ContainerEFabricatorController(final EFabricatorController owner, final EntityPlayer opening) {
         super(owner, opening);
     }
 
-    public int getTickExisted() {
-        return tickExisted;
-    }
-
-    public void setTickExisted(final int tickExisted) {
-        this.tickExisted = tickExisted;
-    }
-
     @Override
     protected void addPlayerSlots(EntityPlayer opening) {
         for (int i = 0; i < 3; i++) {

src/main/java/github/kasuminova/novaeng/common/container/ContainerEFabricatorPatternBus.java

@@ -4,13 +4,15 @@
 import appeng.container.slot.SlotRestrictedInput;
 import appeng.tile.inventory.AppEngInternalInventory;
 import github.kasuminova.novaeng.common.tile.ecotech.efabricator.EFabricatorPatternBus;
+import lombok.Getter;
 import net.minecraft.entity.player.EntityPlayer;
 
 public class ContainerEFabricatorPatternBus extends AEBaseContainer {
 
     public static final int ROWS = 6;
     public static final int COLS = 12;
 
+    @Getter
     private final EFabricatorPatternBus owner;
 
     public ContainerEFabricatorPatternBus(final EFabricatorPatternBus owner, final EntityPlayer player) {
@@ -28,8 +30,4 @@ public ContainerEFabricatorPatternBus(final EFabricatorPatternBus owner, final E
         }
     }
 
-    public EFabricatorPatternBus getOwner() {
-        return owner;
-    }
-
 }

src/main/java/github/kasuminova/novaeng/common/container/ContainerEStorageController.java

@@ -2,25 +2,21 @@
 
 import github.kasuminova.novaeng.common.tile.ecotech.estorage.EStorageController;
 import hellfirepvp.modularmachinery.common.container.ContainerBase;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 
 public class ContainerEStorageController extends ContainerBase<EStorageController> {
-    
+
+    @Setter
+    @Getter
     protected int tickExisted = 0;
 
     public ContainerEStorageController(final EStorageController owner, final EntityPlayer opening) {
         super(owner, opening);
     }
 
-    public int getTickExisted() {
-        return tickExisted;
-    }
-
-    public void setTickExisted(final int tickExisted) {
-        this.tickExisted = tickExisted;
-    }
-
     @Override
     protected void addPlayerSlots(EntityPlayer opening) {
         for (int i = 0; i < 3; i++) {

src/main/java/github/kasuminova/novaeng/common/container/ContainerGeocentricDrill.java

@@ -2,25 +2,21 @@
 
 import github.kasuminova.novaeng.common.tile.machine.GeocentricDrillController;
 import hellfirepvp.modularmachinery.common.container.ContainerBase;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 
 public class ContainerGeocentricDrill extends ContainerBase<GeocentricDrillController> {
 
+    @Setter
+    @Getter
     protected int tickExisted = 0;
 
     public ContainerGeocentricDrill(final GeocentricDrillController owner, final EntityPlayer opening) {
         super(owner, opening);
     }
 
-    public int getTickExisted() {
-        return tickExisted;
-    }
-
-    public void setTickExisted(final int tickExisted) {
-        this.tickExisted = tickExisted;
-    }
-
     @Override
     protected void addPlayerSlots(EntityPlayer opening) {
         for (int i = 0; i < 3; i++) {

src/main/java/github/kasuminova/novaeng/common/container/ContainerModularServerAssembler.java

@@ -5,6 +5,7 @@
 import github.kasuminova.novaeng.common.hypernet.computer.ModularServer;
 import github.kasuminova.novaeng.common.tile.TileModularServerAssembler;
 import hellfirepvp.modularmachinery.common.container.ContainerBase;
+import lombok.Getter;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
@@ -13,8 +14,10 @@
 
 public class ContainerModularServerAssembler extends ContainerBase<TileModularServerAssembler> {
     protected final EntityPlayer opening;
+    @Getter
     protected final SlotModularServer slotModularServer;
 
+    @Getter
     protected AssemblySlotManager slotManager;
 
     public ContainerModularServerAssembler(final TileModularServerAssembler owner, final EntityPlayer opening) {
@@ -107,14 +110,6 @@ public ItemStack transferStackInSlot(@Nonnull final EntityPlayer playerIn, final
         return itemstack;
     }
 
-    public AssemblySlotManager getSlotManager() {
-        return slotManager;
-    }
-
-    public SlotModularServer getSlotModularServer() {
-        return slotModularServer;
-    }
-
     @Override
     protected void addPlayerSlots(EntityPlayer opening) {
         for (int i = 0; i < 3; i++) {

src/main/java/github/kasuminova/novaeng/common/container/ContainerSingularityCore.java

@@ -2,25 +2,21 @@
 
 import github.kasuminova.novaeng.common.tile.machine.SingularityCore;
 import hellfirepvp.modularmachinery.common.container.ContainerBase;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 
 public class ContainerSingularityCore extends ContainerBase<SingularityCore> {
 
+    @Setter
+    @Getter
     protected int tickExisted = 0;
 
     public ContainerSingularityCore(final SingularityCore owner, final EntityPlayer opening) {
         super(owner, opening);
     }
 
-    public int getTickExisted() {
-        return tickExisted;
-    }
-
-    public void setTickExisted(final int tickExisted) {
-        this.tickExisted = tickExisted;
-    }
-
     @Override
     protected void addPlayerSlots(EntityPlayer opening) {
         for (int i = 0; i < 3; i++) {