diff --git a/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java index fc8521b7..0297079c 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java @@ -1,7 +1,5 @@ package com.glodblock.github.client.gui; -import static com.glodblock.github.common.item.ItemWirelessUltraTerminal.hasInfinityBoosterCard; - import java.text.NumberFormat; import java.util.ArrayList; import java.util.Arrays; @@ -504,7 +502,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel entry.renameButton.yPosition = viewY + 1; entry.configButton.yPosition = viewY + 1; GuiFCImgButton toRender; - if (isCtrlKeyDown() && isShiftKeyDown() && hasInfinityBoosterCard(player)) { + if (isCtrlKeyDown() && isShiftKeyDown()) { toRender = entry.configButton; } else if (isShiftKeyDown()) { toRender = entry.renameButton; diff --git a/src/main/java/com/glodblock/github/coremod/registries/LevelTerminalRegistry.java b/src/main/java/com/glodblock/github/coremod/registries/LevelTerminalRegistry.java index 405837de..2f8e78e0 100644 --- a/src/main/java/com/glodblock/github/coremod/registries/LevelTerminalRegistry.java +++ b/src/main/java/com/glodblock/github/coremod/registries/LevelTerminalRegistry.java @@ -8,8 +8,8 @@ import java.util.WeakHashMap; import com.glodblock.github.api.registries.ILevelTerminalRegistry; import com.glodblock.github.api.registries.ILevelViewable; import com.glodblock.github.api.registries.ILevelViewableAdapter; +import com.glodblock.github.common.parts.PartFluidLevelEmitter; import com.glodblock.github.common.tile.TileLevelMaintainer; -import com.glodblock.github.coremod.registries.adapters.PartLevelEmitterAdapter; import appeng.api.networking.IGridHost; import appeng.parts.automation.PartLevelEmitter; @@ -27,7 +27,8 @@ public class LevelTerminalRegistry implements ILevelTerminalRegistry { { this.register(TileLevelMaintainer.class); - this.register(PartLevelEmitter.class, new PartLevelEmitterAdapter()); + this.register(PartLevelEmitter.class); + this.register(PartFluidLevelEmitter.class); } public Set> getSupportedClasses() { diff --git a/src/main/java/com/glodblock/github/coremod/registries/adapters/PartLevelEmitterAdapter.java b/src/main/java/com/glodblock/github/coremod/registries/adapters/PartLevelEmitterAdapter.java deleted file mode 100644 index ebf65500..00000000 --- a/src/main/java/com/glodblock/github/coremod/registries/adapters/PartLevelEmitterAdapter.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.glodblock.github.coremod.registries.adapters; - -import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -import com.glodblock.github.api.registries.ILevelViewable; -import com.glodblock.github.api.registries.ILevelViewableAdapter; -import com.glodblock.github.api.registries.LevelItemInfo; -import com.glodblock.github.api.registries.LevelState; - -import appeng.api.networking.IGridHost; -import appeng.api.networking.IGridNode; -import appeng.api.storage.data.IAEStack; -import appeng.api.util.AECableType; -import appeng.api.util.DimensionalCoord; -import appeng.client.StorageName; -import appeng.parts.automation.PartLevelEmitter; - -public class PartLevelEmitterAdapter implements ILevelViewable, ILevelViewableAdapter { - - private PartLevelEmitter delegate; - - public PartLevelEmitterAdapter() {} - - public ILevelViewable adapt(IGridHost gridHost) { - if (gridHost instanceof PartLevelEmitter levelEmitter) this.delegate = levelEmitter; - return this; - } - - @Override - public DimensionalCoord getLocation() { - return delegate.getLocation(); - } - - @Override - public TileEntity getTile() { - return delegate.getTile(); - } - - @Override - public IInventory getInventoryByName(String name) { - return delegate.getInventoryByName(name); - } - - @Override - public IGridNode getGridNode(ForgeDirection dir) { - return delegate.getGridNode(dir); - } - - @Override - public AECableType getCableConnectionType(ForgeDirection dir) { - return delegate.getCableConnectionType(dir); - } - - @Override - public ForgeDirection getSide() { - return delegate.getSide(); - } - - @Override - public void securityBreak() { - delegate.securityBreak(); - } - - @Override - public String getCustomName() { - return delegate.getCustomName(); - } - - @Override - public boolean hasCustomName() { - return delegate.hasCustomName(); - } - - @Override - public void setCustomName(String name) { - delegate.hasCustomName(); - } - - @Override - public LevelItemInfo[] getLevelItemInfoList() { - IAEStack stack = delegate.getAEInventoryByName(StorageName.NONE).getAEStackInSlot(0); - if (stack == null) return new LevelItemInfo[] { null }; - return new LevelItemInfo[] { new LevelItemInfo( - stack, - delegate.getReportingValue(), - -1, - delegate.isProvidingStrongPower() > 0 ? LevelState.Craft : LevelState.Idle) }; - } -}