From f942e3a9ab8decba71044c979abad0f574d90680 Mon Sep 17 00:00:00 2001 From: Kogepan229 Date: Tue, 4 Nov 2025 20:37:23 +0900 Subject: [PATCH] Move level things to AE2 --- .../registries/ILevelTerminalRegistry.java | 1 + .../github/api/registries/ILevelViewable.java | 58 ------------------- .../api/registries/ILevelViewableAdapter.java | 1 + .../github/api/registries/LevelItemInfo.java | 20 ------- .../github/api/registries/LevelState.java | 11 ---- .../github/client/gui/GuiLevelMaintainer.java | 2 +- .../github/client/gui/GuiLevelTerminal.java | 4 +- .../gui/container/ContainerLevelTerminal.java | 4 +- .../common/tile/TileLevelMaintainer.java | 6 +- .../registries/LevelTerminalRegistry.java | 2 +- .../SPacketLevelMaintainerGuiUpdate.java | 2 +- .../network/SPacketLevelTerminalUpdate.java | 4 +- 12 files changed, 14 insertions(+), 101 deletions(-) delete mode 100644 src/main/java/com/glodblock/github/api/registries/ILevelViewable.java delete mode 100644 src/main/java/com/glodblock/github/api/registries/LevelItemInfo.java delete mode 100644 src/main/java/com/glodblock/github/api/registries/LevelState.java diff --git a/src/main/java/com/glodblock/github/api/registries/ILevelTerminalRegistry.java b/src/main/java/com/glodblock/github/api/registries/ILevelTerminalRegistry.java index d00c4d16..19d2421d 100644 --- a/src/main/java/com/glodblock/github/api/registries/ILevelTerminalRegistry.java +++ b/src/main/java/com/glodblock/github/api/registries/ILevelTerminalRegistry.java @@ -2,6 +2,7 @@ package com.glodblock.github.api.registries; import java.util.Set; +import appeng.api.features.ILevelViewable; import appeng.api.networking.IGridHost; public interface ILevelTerminalRegistry { diff --git a/src/main/java/com/glodblock/github/api/registries/ILevelViewable.java b/src/main/java/com/glodblock/github/api/registries/ILevelViewable.java deleted file mode 100644 index 2ea07cdb..00000000 --- a/src/main/java/com/glodblock/github/api/registries/ILevelViewable.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.glodblock.github.api.registries; - -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -import com.glodblock.github.api.ISide; - -import appeng.api.networking.IGridHost; -import appeng.api.util.DimensionalCoord; -import appeng.helpers.ICustomNameObject; - -public interface ILevelViewable extends IGridHost, ISide, ICustomNameObject { - - DimensionalCoord getLocation(); - - TileEntity getTile(); - - @Deprecated - default long getSortValue() { - TileEntity te = getTile(); - return ((long) te.zCoord << 24) ^ ((long) te.xCoord << 8) ^ te.yCoord; - } - - @Deprecated - default boolean shouldDisplay() { - return true; - } - - /** - * Number of rows to expect. This is used with {@link #rowSize()} to determine how to render the slots. - */ - default int rows() { - return 1; - }; - - /** - * Number of slots per row. - */ - default int rowSize() { - return 1; - }; - - @Deprecated - default ItemStack getSelfItemStack() { - return null; - } - - /** - * "Target" Display representation - */ - @Deprecated - default ItemStack getDisplayItemStack() { - return null; - } - - LevelItemInfo[] getLevelItemInfoList(); - -} diff --git a/src/main/java/com/glodblock/github/api/registries/ILevelViewableAdapter.java b/src/main/java/com/glodblock/github/api/registries/ILevelViewableAdapter.java index 890b3f77..f71c8d9e 100644 --- a/src/main/java/com/glodblock/github/api/registries/ILevelViewableAdapter.java +++ b/src/main/java/com/glodblock/github/api/registries/ILevelViewableAdapter.java @@ -1,5 +1,6 @@ package com.glodblock.github.api.registries; +import appeng.api.features.ILevelViewable; import appeng.api.networking.IGridHost; public interface ILevelViewableAdapter extends ILevelViewable { diff --git a/src/main/java/com/glodblock/github/api/registries/LevelItemInfo.java b/src/main/java/com/glodblock/github/api/registries/LevelItemInfo.java deleted file mode 100644 index 9237baa4..00000000 --- a/src/main/java/com/glodblock/github/api/registries/LevelItemInfo.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.glodblock.github.api.registries; - -import org.jetbrains.annotations.NotNull; - -import appeng.api.storage.data.IAEStack; - -public class LevelItemInfo { - - public IAEStack stack; - public long quantity; - public long batchSize; - public LevelState state; - - public LevelItemInfo(@NotNull IAEStack stack, long quantity, long batchSize, LevelState state) { - this.stack = stack; - this.quantity = quantity; - this.batchSize = batchSize; - this.state = state; - } -} diff --git a/src/main/java/com/glodblock/github/api/registries/LevelState.java b/src/main/java/com/glodblock/github/api/registries/LevelState.java deleted file mode 100644 index 9041a84e..00000000 --- a/src/main/java/com/glodblock/github/api/registries/LevelState.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.glodblock.github.api.registries; - -public enum LevelState { - None, - Idle, - Craft, - Export, - Error, - NotFound, - CantCraft -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java index 3fe023c9..c56bcd65 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java @@ -14,7 +14,6 @@ import org.jetbrains.annotations.Nullable; import org.lwjgl.input.Keyboard; import com.glodblock.github.FluidCraft; -import com.glodblock.github.api.registries.LevelState; import com.glodblock.github.client.gui.container.ContainerLevelMaintainer; import com.glodblock.github.common.tile.TileLevelMaintainer; import com.glodblock.github.inventory.gui.MouseRegionManager; @@ -23,6 +22,7 @@ import com.glodblock.github.network.CPacketLevelMaintainer.Action; import com.glodblock.github.util.FCGuiColors; import com.glodblock.github.util.NameConst; +import appeng.api.features.LevelState; import appeng.api.storage.data.IAEStack; import appeng.client.gui.GuiSub; import appeng.client.gui.slots.VirtualMEPhantomSlot; 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 0297079c..c4a3cebd 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java @@ -33,8 +33,6 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import com.glodblock.github.FluidCraft; -import com.glodblock.github.api.registries.LevelItemInfo; -import com.glodblock.github.api.registries.LevelState; import com.glodblock.github.client.gui.base.FCBaseMEGui; import com.glodblock.github.client.gui.container.ContainerLevelTerminal; import com.glodblock.github.network.CPacketLevelTerminalCommands; @@ -49,6 +47,8 @@ import appeng.api.config.Settings; import appeng.api.config.TerminalFontSize; import appeng.api.config.TerminalStyle; import appeng.api.config.YesNo; +import appeng.api.features.LevelItemInfo; +import appeng.api.features.LevelState; import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEStack; import appeng.client.gui.IGuiTooltipHandler; diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelTerminal.java index 519a23fe..bd83b674 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelTerminal.java @@ -14,8 +14,6 @@ import net.minecraftforge.common.util.ForgeDirection; import org.jetbrains.annotations.Nullable; import com.glodblock.github.FluidCraft; -import com.glodblock.github.api.registries.ILevelViewable; -import com.glodblock.github.api.registries.LevelItemInfo; import com.glodblock.github.client.gui.container.base.FCBaseContainer; import com.glodblock.github.common.parts.PartLevelTerminal; import com.glodblock.github.coremod.registries.LevelTerminalRegistry; @@ -25,6 +23,8 @@ import com.glodblock.github.loader.ItemAndBlockHolder; import com.glodblock.github.network.SPacketLevelTerminalUpdate; import com.glodblock.github.util.FluidPrimaryGui; +import appeng.api.features.ILevelViewable; +import appeng.api.features.LevelItemInfo; import appeng.api.networking.IGrid; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; diff --git a/src/main/java/com/glodblock/github/common/tile/TileLevelMaintainer.java b/src/main/java/com/glodblock/github/common/tile/TileLevelMaintainer.java index b9149b06..60c21155 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileLevelMaintainer.java +++ b/src/main/java/com/glodblock/github/common/tile/TileLevelMaintainer.java @@ -15,9 +15,6 @@ import net.minecraftforge.common.util.ForgeDirection; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.glodblock.github.api.registries.ILevelViewable; -import com.glodblock.github.api.registries.LevelItemInfo; -import com.glodblock.github.api.registries.LevelState; import com.glodblock.github.common.Config; import com.glodblock.github.common.item.ItemFluidDrop; import com.glodblock.github.crossmod.thaumcraft.ThaumicEnergisticsCrafting; @@ -27,6 +24,9 @@ import com.google.common.collect.ImmutableSet; import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; +import appeng.api.features.ILevelViewable; +import appeng.api.features.LevelItemInfo; +import appeng.api.features.LevelState; import appeng.api.implementations.IPowerChannelState; import appeng.api.networking.GridFlags; import appeng.api.networking.IGrid; 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 2f8e78e0..480c1c60 100644 --- a/src/main/java/com/glodblock/github/coremod/registries/LevelTerminalRegistry.java +++ b/src/main/java/com/glodblock/github/coremod/registries/LevelTerminalRegistry.java @@ -6,11 +6,11 @@ import java.util.Set; 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 appeng.api.features.ILevelViewable; import appeng.api.networking.IGridHost; import appeng.parts.automation.PartLevelEmitter; diff --git a/src/main/java/com/glodblock/github/network/SPacketLevelMaintainerGuiUpdate.java b/src/main/java/com/glodblock/github/network/SPacketLevelMaintainerGuiUpdate.java index 4ca244d7..2d564e5d 100644 --- a/src/main/java/com/glodblock/github/network/SPacketLevelMaintainerGuiUpdate.java +++ b/src/main/java/com/glodblock/github/network/SPacketLevelMaintainerGuiUpdate.java @@ -6,9 +6,9 @@ import static com.glodblock.github.common.tile.TileLevelMaintainer.RequestInfo; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import com.glodblock.github.api.registries.LevelState; import com.glodblock.github.client.gui.GuiLevelMaintainer; +import appeng.api.features.LevelState; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/com/glodblock/github/network/SPacketLevelTerminalUpdate.java b/src/main/java/com/glodblock/github/network/SPacketLevelTerminalUpdate.java index a946c575..b495aadf 100644 --- a/src/main/java/com/glodblock/github/network/SPacketLevelTerminalUpdate.java +++ b/src/main/java/com/glodblock/github/network/SPacketLevelTerminalUpdate.java @@ -12,10 +12,10 @@ import net.minecraft.client.gui.GuiScreen; import org.jetbrains.annotations.Nullable; -import com.glodblock.github.api.registries.LevelItemInfo; -import com.glodblock.github.api.registries.LevelState; import com.glodblock.github.client.gui.GuiLevelTerminal; +import appeng.api.features.LevelItemInfo; +import appeng.api.features.LevelState; import appeng.api.storage.data.IAEStack; import appeng.core.AEConfig; import appeng.core.AELog;