mirror of
https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git
synced 2026-11-16 18:44:42 +00:00
Add magnet and restock to Universal terminal (#275)
Co-authored-by: Maya <[email protected]> Co-authored-by: Caedis <[email protected]> Co-authored-by: Ruling-0 <[email protected]>
This commit is contained in:
35 files changed
+1680
-147
No files matched your search
@@ -33,6 +33,7 @@ import com.glodblock.github.client.gui.GuiLargeIngredientBuffer;
|
||||
import com.glodblock.github.client.gui.GuiLevelMaintainer;
|
||||
import com.glodblock.github.client.gui.GuiLevelTerminal;
|
||||
import com.glodblock.github.client.gui.GuiLevelWireless;
|
||||
import com.glodblock.github.client.gui.GuiMagnetFilter;
|
||||
import com.glodblock.github.client.gui.GuiOCPatternEditor;
|
||||
import com.glodblock.github.client.gui.GuiPatternItemRenamer;
|
||||
import com.glodblock.github.client.gui.GuiPatternMulti;
|
||||
@@ -62,6 +63,7 @@ import com.glodblock.github.client.gui.container.ContainerLargeIngredientBuffer;
|
||||
import com.glodblock.github.client.gui.container.ContainerLevelMaintainer;
|
||||
import com.glodblock.github.client.gui.container.ContainerLevelTerminal;
|
||||
import com.glodblock.github.client.gui.container.ContainerLevelWireless;
|
||||
import com.glodblock.github.client.gui.container.ContainerMagnetFilter;
|
||||
import com.glodblock.github.client.gui.container.ContainerOCPatternEditor;
|
||||
import com.glodblock.github.client.gui.container.ContainerPatternMulti;
|
||||
import com.glodblock.github.client.gui.container.ContainerPatternValueAmount;
|
||||
@@ -542,6 +544,19 @@ public enum GuiType {
|
||||
protected Object createClientGui(EntityPlayer player, ITerminalHost inv) {
|
||||
return new GuiPatternItemRenamer(player.inventory, inv);
|
||||
}
|
||||
}),
|
||||
|
||||
WIRELESS_MAGNET_FILTER(new ItemGuiFactory<>(ITerminalHost.class) {
|
||||
|
||||
@Override
|
||||
protected Object createServerGui(EntityPlayer player, ITerminalHost inv) {
|
||||
return new ContainerMagnetFilter(player.inventory, inv);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Object createClientGui(EntityPlayer player, ITerminalHost inv) {
|
||||
return new GuiMagnetFilter(player.inventory, inv);
|
||||
}
|
||||
});
|
||||
|
||||
public static final List<GuiType> VALUES = ImmutableList.copyOf(values());
|
||||
|
||||
@@ -0,0 +1,186 @@
|
||||
package com.glodblock.github.inventory.item;
|
||||
|
||||
import static com.glodblock.github.common.item.ItemBaseWirelessTerminal.restockItems;
|
||||
import static com.glodblock.github.inventory.item.WirelessMagnet.modeKey;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import com.glodblock.github.common.item.ItemBaseWirelessTerminal;
|
||||
import com.glodblock.github.util.Util;
|
||||
|
||||
import appeng.api.config.Actionable;
|
||||
import appeng.api.config.PowerMultiplier;
|
||||
import appeng.api.implementations.items.IAEItemPowerStorage;
|
||||
import appeng.api.networking.IGridNode;
|
||||
import appeng.api.networking.security.PlayerSource;
|
||||
import appeng.api.networking.storage.IStorageGrid;
|
||||
import appeng.api.storage.MEMonitorHandler;
|
||||
import appeng.api.storage.StorageChannel;
|
||||
import appeng.api.storage.data.IAEFluidStack;
|
||||
import appeng.api.storage.data.IAEItemStack;
|
||||
import appeng.api.storage.data.IAEStack;
|
||||
import appeng.api.util.AECableType;
|
||||
import appeng.items.tools.powered.ToolWirelessTerminal;
|
||||
import appeng.me.storage.NullInventory;
|
||||
import appeng.util.Platform;
|
||||
|
||||
public abstract class BaseWirelessInventory extends MEMonitorHandler implements IWirelessTerminal, IWirelessExtendCard {
|
||||
|
||||
protected final ItemStack target;
|
||||
protected final IAEItemPowerStorage ips;
|
||||
protected final int inventorySlot;
|
||||
|
||||
protected final IGridNode grid;
|
||||
|
||||
protected final PlayerSource source;
|
||||
protected final StorageChannel channel;
|
||||
protected WirelessMagnet.Mode magnetMode = WirelessMagnet.Mode.Off;
|
||||
protected EntityPlayer player;
|
||||
protected boolean restock;
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public BaseWirelessInventory(final ItemStack is, final int slot, IGridNode gridNode, EntityPlayer player,
|
||||
StorageChannel channel) {
|
||||
super(Objects.requireNonNull(Util.getWirelessInv(is, player, channel)));
|
||||
this.ips = (ToolWirelessTerminal) is.getItem();
|
||||
this.grid = gridNode;
|
||||
this.target = is;
|
||||
this.inventorySlot = slot;
|
||||
this.channel = channel;
|
||||
this.source = new PlayerSource(player, this);
|
||||
this.readFromNBT();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public BaseWirelessInventory(final ItemStack is, final int slot, IGridNode gridNode, EntityPlayer player,
|
||||
StorageChannel channel, boolean nullInventory) {
|
||||
super(new NullInventory<>());
|
||||
this.ips = (ToolWirelessTerminal) is.getItem();
|
||||
this.grid = gridNode;
|
||||
this.target = is;
|
||||
this.inventorySlot = slot;
|
||||
this.channel = channel;
|
||||
this.source = new PlayerSource(player, this);
|
||||
this.readFromNBT();
|
||||
}
|
||||
|
||||
private void readFromNBT() {
|
||||
NBTTagCompound data = Platform.openNbtData(this.target);
|
||||
this.setMagnetCardMode(WirelessMagnet.Mode.values()[data.getInteger(modeKey)]);
|
||||
this.setRestock(data.getBoolean(ItemBaseWirelessTerminal.restockItems));
|
||||
}
|
||||
|
||||
public StorageChannel getChannel() {
|
||||
return this.channel;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getItemStack() {
|
||||
return this.target;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double extractAEPower(double amt, Actionable mode, PowerMultiplier usePowerMultiplier) {
|
||||
amt = usePowerMultiplier.multiply(amt);
|
||||
if (mode == Actionable.SIMULATE) {
|
||||
return usePowerMultiplier.divide(Math.min(amt, this.ips.getAECurrentPower(this.target)));
|
||||
}
|
||||
return usePowerMultiplier.divide(this.ips.extractAEPower(this.target, amt));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getInventorySlot() {
|
||||
return this.inventorySlot;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IGridNode getGridNode(ForgeDirection dir) {
|
||||
return this.grid;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AECableType getCableConnectionType(ForgeDirection dir) {
|
||||
return AECableType.NONE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void securityBreak() {
|
||||
this.getGridNode(ForgeDirection.UNKNOWN).getMachine().securityBreak();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void saveChanges() {}
|
||||
|
||||
@Override
|
||||
public IGridNode getActionableNode() {
|
||||
return this.grid;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PlayerSource getActionSource() {
|
||||
return this.source;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setMagnetCardMode(WirelessMagnet.Mode mode) {
|
||||
this.magnetMode = mode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public WirelessMagnet.Mode getMagnetCardMode() {
|
||||
return this.magnetMode;
|
||||
}
|
||||
|
||||
public void setMagnetCardNextMode() {
|
||||
setMagnetCardMode(
|
||||
WirelessMagnet.Mode.values()[(getMagnetCardMode().ordinal() + 1)
|
||||
% WirelessMagnet.Mode.values().length]);
|
||||
}
|
||||
|
||||
public void setRestock(boolean val) {
|
||||
this.restock = val;
|
||||
}
|
||||
|
||||
public boolean isRestock() {
|
||||
return this.restock;
|
||||
}
|
||||
|
||||
public IAEStack injectItems(IAEStack aeStack) {
|
||||
try {
|
||||
if (aeStack.isItem()) {
|
||||
return ((IStorageGrid) getActionableNode().getGrid().getCache(IStorageGrid.class)).getItemInventory()
|
||||
.injectItems((IAEItemStack) aeStack, Actionable.MODULATE, getActionSource());
|
||||
} else {
|
||||
return ((IStorageGrid) getActionableNode().getGrid().getCache(IStorageGrid.class)).getFluidInventory()
|
||||
.injectItems((IAEFluidStack) aeStack, Actionable.MODULATE, getActionSource());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
return aeStack;
|
||||
}
|
||||
}
|
||||
|
||||
public IAEStack extractItems(IAEStack aeStack) {
|
||||
try {
|
||||
if (aeStack.isItem()) {
|
||||
return ((IStorageGrid) getActionableNode().getGrid().getCache(IStorageGrid.class)).getItemInventory()
|
||||
.extractItems((IAEItemStack) aeStack, Actionable.MODULATE, getActionSource());
|
||||
} else {
|
||||
return ((IStorageGrid) getActionableNode().getGrid().getCache(IStorageGrid.class)).getFluidInventory()
|
||||
.extractItems((IAEFluidStack) aeStack, Actionable.MODULATE, getActionSource());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public void saveSettings() {
|
||||
NBTTagCompound data = Platform.openNbtData(this.target);
|
||||
data.setBoolean(restockItems, this.restock);
|
||||
data.setInteger(modeKey, this.getMagnetCardMode().ordinal());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.glodblock.github.inventory.item;
|
||||
|
||||
import appeng.api.networking.security.PlayerSource;
|
||||
import appeng.api.storage.data.IAEStack;
|
||||
|
||||
public interface IWirelessExtendCard {
|
||||
|
||||
default void setMagnetCardMode(WirelessMagnet.Mode mode) {}
|
||||
|
||||
WirelessMagnet.Mode getMagnetCardMode();
|
||||
|
||||
PlayerSource getActionSource();
|
||||
|
||||
IAEStack injectItems(IAEStack aeStack);
|
||||
|
||||
IAEStack extractItems(IAEStack aeStack);
|
||||
|
||||
default void setMagnetCardNextMode() {};
|
||||
|
||||
void setRestock(boolean val);
|
||||
|
||||
default boolean isRestock() {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package com.glodblock.github.inventory.item;
|
||||
|
||||
public interface IWirelessMagnetFilter extends IWirelessTerminal, IItemTerminal {
|
||||
|
||||
WirelessMagnet.ListMode getListMode();
|
||||
|
||||
boolean getNBTMode();
|
||||
|
||||
boolean getMetaMode();
|
||||
|
||||
boolean getOreMode();
|
||||
|
||||
boolean getOreDictMode();
|
||||
|
||||
String getOreDictFilter();
|
||||
|
||||
void setListMode(WirelessMagnet.ListMode mode);
|
||||
|
||||
void setNBTMode(boolean ignoreNBT);
|
||||
|
||||
void setMetaMode(boolean ignoreMeta);
|
||||
|
||||
void setOreMode(boolean useOre);
|
||||
|
||||
void setOreDictMode(boolean useOreDict);
|
||||
|
||||
void setOreDictFilter(String str);
|
||||
|
||||
default void clearConfig() {};
|
||||
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import appeng.api.implementations.guiobjects.IGuiItemObject;
|
||||
import appeng.api.implementations.tiles.IViewCellStorage;
|
||||
import appeng.api.networking.IGridHost;
|
||||
import appeng.api.networking.security.IActionHost;
|
||||
import appeng.api.storage.StorageChannel;
|
||||
import appeng.tile.inventory.IAEAppEngInventory;
|
||||
|
||||
public interface IWirelessTerminal
|
||||
@@ -21,4 +22,7 @@ public interface IWirelessTerminal
|
||||
return false;
|
||||
}
|
||||
|
||||
default StorageChannel getChannel() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
+2
-10
@@ -1,7 +1,5 @@
|
||||
package com.glodblock.github.inventory.item;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -9,7 +7,6 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import com.glodblock.github.inventory.ItemBiggerAppEngInventory;
|
||||
import com.glodblock.github.util.Util;
|
||||
|
||||
import appeng.api.config.Actionable;
|
||||
import appeng.api.config.PowerMultiplier;
|
||||
@@ -20,9 +17,7 @@ import appeng.api.config.TypeFilter;
|
||||
import appeng.api.config.ViewItems;
|
||||
import appeng.api.implementations.items.IAEItemPowerStorage;
|
||||
import appeng.api.networking.IGridNode;
|
||||
import appeng.api.storage.IMEInventoryHandler;
|
||||
import appeng.api.storage.IMEMonitor;
|
||||
import appeng.api.storage.MEMonitorHandler;
|
||||
import appeng.api.storage.StorageChannel;
|
||||
import appeng.api.storage.data.IAEFluidStack;
|
||||
import appeng.api.storage.data.IAEItemStack;
|
||||
@@ -35,8 +30,7 @@ import appeng.tile.inventory.InvOperation;
|
||||
import appeng.util.ConfigManager;
|
||||
import appeng.util.Platform;
|
||||
|
||||
public class WirelessCraftingTerminalInventory extends MEMonitorHandler<IAEItemStack>
|
||||
implements IWirelessCraftTerminal {
|
||||
public class WirelessCraftingTerminalInventory extends BaseWirelessInventory implements IWirelessCraftTerminal {
|
||||
|
||||
private final ItemStack target;
|
||||
private final IAEItemPowerStorage ips;
|
||||
@@ -51,9 +45,7 @@ public class WirelessCraftingTerminalInventory extends MEMonitorHandler<IAEItemS
|
||||
@SuppressWarnings("unchecked")
|
||||
public WirelessCraftingTerminalInventory(final ItemStack is, final int slot, IGridNode gridNode,
|
||||
EntityPlayer player) {
|
||||
super(
|
||||
(IMEInventoryHandler<IAEItemStack>) Objects
|
||||
.requireNonNull(Util.getWirelessInv(is, player, StorageChannel.ITEMS)));
|
||||
super(is, slot, gridNode, player, StorageChannel.ITEMS);
|
||||
this.ips = (ToolWirelessTerminal) is.getItem();
|
||||
this.grid = gridNode;
|
||||
this.target = is;
|
||||
|
||||
+7
-10
@@ -1,15 +1,11 @@
|
||||
package com.glodblock.github.inventory.item;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import com.glodblock.github.util.Util;
|
||||
|
||||
import appeng.api.config.Actionable;
|
||||
import appeng.api.config.PowerMultiplier;
|
||||
import appeng.api.config.Settings;
|
||||
@@ -18,9 +14,7 @@ import appeng.api.config.SortOrder;
|
||||
import appeng.api.config.ViewItems;
|
||||
import appeng.api.implementations.items.IAEItemPowerStorage;
|
||||
import appeng.api.networking.IGridNode;
|
||||
import appeng.api.storage.IMEInventoryHandler;
|
||||
import appeng.api.storage.IMEMonitor;
|
||||
import appeng.api.storage.MEMonitorHandler;
|
||||
import appeng.api.storage.StorageChannel;
|
||||
import appeng.api.storage.data.IAEFluidStack;
|
||||
import appeng.api.storage.data.IAEItemStack;
|
||||
@@ -33,7 +27,7 @@ import appeng.tile.inventory.InvOperation;
|
||||
import appeng.util.ConfigManager;
|
||||
import appeng.util.Platform;
|
||||
|
||||
public class WirelessFluidTerminalInventory extends MEMonitorHandler<IAEFluidStack> implements IWirelessTerminal {
|
||||
public class WirelessFluidTerminalInventory extends BaseWirelessInventory implements IWirelessTerminal, IItemTerminal {
|
||||
|
||||
private final ItemStack target;
|
||||
private final IAEItemPowerStorage ips;
|
||||
@@ -44,9 +38,7 @@ public class WirelessFluidTerminalInventory extends MEMonitorHandler<IAEFluidSta
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public WirelessFluidTerminalInventory(final ItemStack is, final int slot, IGridNode gridNode, EntityPlayer player) {
|
||||
super(
|
||||
(IMEInventoryHandler<IAEFluidStack>) Objects
|
||||
.requireNonNull(Util.getWirelessInv(is, player, StorageChannel.FLUIDS)));
|
||||
super(is, slot, gridNode, player, StorageChannel.FLUIDS);
|
||||
this.ips = (ToolWirelessTerminal) is.getItem();
|
||||
this.grid = gridNode;
|
||||
this.target = is;
|
||||
@@ -135,4 +127,9 @@ public class WirelessFluidTerminalInventory extends MEMonitorHandler<IAEFluidSta
|
||||
@Override
|
||||
public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removedStack,
|
||||
ItemStack newStack) {}
|
||||
|
||||
@Override
|
||||
public IInventory getInventoryByName(String name) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,139 @@
|
||||
package com.glodblock.github.inventory.item;
|
||||
|
||||
import static com.glodblock.github.common.Config.magnetRange;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.item.EntityXPOrb;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
|
||||
|
||||
import appeng.util.Platform;
|
||||
|
||||
public class WirelessMagnet {
|
||||
|
||||
public static String modeKey = "MagnetMode";
|
||||
public static String filterKey = "MagnetFilter";
|
||||
public static String filterConfigKey = "MagnetConfig";
|
||||
|
||||
public enum Mode {
|
||||
Off,
|
||||
Inv,
|
||||
ME
|
||||
}
|
||||
|
||||
public enum ListMode {
|
||||
WhiteList,
|
||||
BlackList
|
||||
}
|
||||
|
||||
public static List<?> getEntitiesInRange(Class<?> entityType, World world, int x, int y, int z, int distance) {
|
||||
return world.getEntitiesWithinAABB(
|
||||
entityType,
|
||||
AxisAlignedBB.getBoundingBox(
|
||||
x - distance,
|
||||
y - distance,
|
||||
z - distance,
|
||||
x + distance,
|
||||
y + distance,
|
||||
z + distance));
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
|
||||
public static boolean isConfigured(ItemStack wirelessTerm) {
|
||||
NBTTagCompound data = Platform.openNbtData(wirelessTerm);
|
||||
return data.hasKey(modeKey);
|
||||
}
|
||||
|
||||
public static void doMagnet(ItemStack wirelessTerm, World world, EntityPlayer player) {
|
||||
if (wirelessTerm == null || player == null || player.isSneaking() || !isConfigured(wirelessTerm)) return;
|
||||
|
||||
Iterator<?> iterator = getEntitiesInRange(
|
||||
EntityItem.class,
|
||||
world,
|
||||
(int) player.posX,
|
||||
(int) player.posY,
|
||||
(int) player.posZ,
|
||||
magnetRange).iterator();
|
||||
|
||||
while (iterator.hasNext()) {
|
||||
EntityItem itemToGet = (EntityItem) iterator.next();
|
||||
EntityPlayer closestPlayer = world.getClosestPlayerToEntity(itemToGet, magnetRange);
|
||||
|
||||
if (closestPlayer != null && closestPlayer == player) {
|
||||
NBTTagCompound itemNBT = new NBTTagCompound();
|
||||
itemToGet.writeEntityToNBT(itemNBT);
|
||||
|
||||
if (itemToGet.func_145800_j() == null
|
||||
|| !itemToGet.func_145800_j().equals(player.getCommandSenderName()))
|
||||
itemToGet.delayBeforeCanPickup = 0;
|
||||
|
||||
if (itemToGet.delayBeforeCanPickup <= 0) {
|
||||
itemNBT.setBoolean("attractable", true);
|
||||
itemToGet.readEntityFromNBT(itemNBT);
|
||||
}
|
||||
|
||||
if (itemNBT.getBoolean("attractable")) {
|
||||
itemToGet.motionX = itemToGet.motionY = itemToGet.motionZ = 0;
|
||||
itemToGet.setPosition(
|
||||
player.posX - 0.2 + (world.rand.nextDouble() * 0.4),
|
||||
player.posY - 0.6,
|
||||
player.posZ - 0.2 + (world.rand.nextDouble() * 0.4));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// xp
|
||||
iterator = getEntitiesInRange(
|
||||
EntityXPOrb.class,
|
||||
world,
|
||||
(int) player.posX,
|
||||
(int) player.posY,
|
||||
(int) player.posZ,
|
||||
magnetRange).iterator();
|
||||
while (iterator.hasNext()) {
|
||||
EntityXPOrb xpToGet = (EntityXPOrb) iterator.next();
|
||||
EntityPlayer closestPlayer = world.getClosestPlayerToEntity(xpToGet, magnetRange);
|
||||
|
||||
if (!xpToGet.isDead && !xpToGet.isInvisible() && closestPlayer != null && closestPlayer == player) {
|
||||
int xpAmount = xpToGet.xpValue;
|
||||
xpToGet.xpValue = 0;
|
||||
player.xpCooldown = 0;
|
||||
player.addExperience(xpAmount);
|
||||
xpToGet.setDead();
|
||||
xpToGet.setInvisible(true);
|
||||
world.playSoundAtEntity(
|
||||
player,
|
||||
"random.orb",
|
||||
0.08F,
|
||||
0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.8F));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static Mode getMode(ItemStack is) {
|
||||
if (is != null && is.getItem() instanceof ItemWirelessUltraTerminal) {
|
||||
NBTTagCompound data = Platform.openNbtData(is);
|
||||
if (data.hasKey(modeKey)) {
|
||||
return Mode.values()[data.getInteger(modeKey)];
|
||||
}
|
||||
setMode(is, Mode.Off);
|
||||
}
|
||||
return Mode.Off;
|
||||
}
|
||||
|
||||
public static void setMode(ItemStack is, Mode mode) {
|
||||
if (is != null && is.getItem() instanceof ItemWirelessUltraTerminal) {
|
||||
NBTTagCompound data = Platform.openNbtData(is);
|
||||
data.setInteger(modeKey, mode.ordinal());
|
||||
}
|
||||
}
|
||||
}
|
||||
+291
@@ -0,0 +1,291 @@
|
||||
package com.glodblock.github.inventory.item;
|
||||
|
||||
import static com.glodblock.github.inventory.item.WirelessMagnet.filterConfigKey;
|
||||
import static com.glodblock.github.inventory.item.WirelessMagnet.filterKey;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.WeakHashMap;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.glodblock.github.inventory.ItemBiggerAppEngInventory;
|
||||
|
||||
import appeng.api.config.Actionable;
|
||||
import appeng.api.config.PowerMultiplier;
|
||||
import appeng.api.networking.IGridNode;
|
||||
import appeng.api.storage.IMEMonitor;
|
||||
import appeng.api.storage.StorageChannel;
|
||||
import appeng.api.storage.data.IAEFluidStack;
|
||||
import appeng.api.storage.data.IAEItemStack;
|
||||
import appeng.api.util.IConfigManager;
|
||||
import appeng.tile.inventory.AppEngInternalInventory;
|
||||
import appeng.tile.inventory.InvOperation;
|
||||
import appeng.util.Platform;
|
||||
import appeng.util.item.AEItemStack;
|
||||
import appeng.util.item.OreHelper;
|
||||
import appeng.util.prioitylist.OreFilteredList;
|
||||
|
||||
public class WirelessMagnetCardFilterInventory extends BaseWirelessInventory implements IWirelessMagnetFilter {
|
||||
|
||||
private boolean ignoreNbt;
|
||||
private boolean ignoreMeta;
|
||||
private boolean useOre;
|
||||
private boolean useOreDict;
|
||||
private String oreDictFilter = "";
|
||||
protected Predicate<IAEItemStack> filterPredicate = null;
|
||||
private WirelessMagnet.ListMode listMode = WirelessMagnet.ListMode.BlackList;
|
||||
private final AppEngInternalInventory filterInventory;
|
||||
private final NBTTagCompound settingCache;
|
||||
private final NBTTagCompound filterCache;
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public WirelessMagnetCardFilterInventory(ItemStack is, int slot, IGridNode gridNode, EntityPlayer player) {
|
||||
super(is, slot, gridNode, player, StorageChannel.ITEMS, true);
|
||||
filterInventory = new ItemBiggerAppEngInventory(is, filterKey, 27) {
|
||||
|
||||
@Override
|
||||
public void setInventorySlotContents(int slot, ItemStack newItemStack) {
|
||||
if (newItemStack != null) newItemStack.stackSize = 1;
|
||||
super.setInventorySlotContents(slot, newItemStack);
|
||||
}
|
||||
};
|
||||
settingCache = getSettingTag(is);
|
||||
filterCache = getFilterTag(is);
|
||||
readFromNBT();
|
||||
}
|
||||
|
||||
public void readFromNBT() {
|
||||
NBTTagCompound data = Platform.openNbtData(this.target);
|
||||
if (!data.hasKey(filterConfigKey)) this.writeToNBT();
|
||||
NBTTagCompound tag = (NBTTagCompound) data.getTag(filterConfigKey);
|
||||
ignoreNbt = tag.getBoolean("nbt");
|
||||
ignoreMeta = tag.getBoolean("meta");
|
||||
useOre = tag.getBoolean("ore");
|
||||
useOreDict = tag.getBoolean("oreDict");
|
||||
oreDictFilter = tag.getString("oreDictFilter");
|
||||
this.listMode = WirelessMagnet.ListMode.values()[tag.getInteger("list")];
|
||||
}
|
||||
|
||||
public void writeToNBT() {
|
||||
NBTTagCompound data = Platform.openNbtData(this.target);
|
||||
NBTTagCompound tmp = new NBTTagCompound();
|
||||
tmp.setBoolean("nbt", ignoreNbt);
|
||||
tmp.setBoolean("meta", ignoreMeta);
|
||||
tmp.setBoolean("ore", useOre);
|
||||
tmp.setBoolean("oreDict", useOreDict);
|
||||
tmp.setString("oreDictFilter", oreDictFilter);
|
||||
tmp.setInteger("list", this.listMode.ordinal());
|
||||
data.setTag(filterConfigKey, tmp);
|
||||
}
|
||||
|
||||
private NBTTagCompound getSettingTag(ItemStack is) {
|
||||
return (NBTTagCompound) is.getTagCompound().getCompoundTag(filterConfigKey).copy();
|
||||
}
|
||||
|
||||
private NBTTagCompound getFilterTag(ItemStack is) {
|
||||
return (NBTTagCompound) is.getTagCompound().getCompoundTag(filterKey).copy();
|
||||
}
|
||||
|
||||
@Override
|
||||
public WirelessMagnet.ListMode getListMode() {
|
||||
return this.listMode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getNBTMode() {
|
||||
return ignoreNbt;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getMetaMode() {
|
||||
return ignoreMeta;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getOreMode() {
|
||||
return useOre;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getOreDictMode() {
|
||||
return useOreDict;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getOreDictFilter() {
|
||||
return oreDictFilter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setListMode(WirelessMagnet.ListMode mode) {
|
||||
this.listMode = mode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setNBTMode(boolean ignoreNBT) {
|
||||
ignoreNbt = ignoreNBT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setMetaMode(boolean ignoreMeta) {
|
||||
this.ignoreMeta = ignoreMeta;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setOreMode(boolean useOre) {
|
||||
this.useOre = useOre;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setOreDictMode(boolean useOreDict) {
|
||||
this.useOreDict = useOreDict;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setOreDictFilter(String str) {
|
||||
oreDictFilter = str;
|
||||
filterPredicate = null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clearConfig() {
|
||||
IInventory inv = this.getInventoryByName("config");
|
||||
for (int i = 0; i < inv.getSizeInventory(); i++) {
|
||||
inv.setInventorySlotContents(i, null);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public StorageChannel getChannel() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IInventory getViewCellStorage() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double extractAEPower(double amt, Actionable mode, PowerMultiplier usePowerMultiplier) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMEMonitor<IAEItemStack> getItemInventory() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMEMonitor<IAEFluidStack> getFluidInventory() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IConfigManager getConfigManager() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removedStack,
|
||||
ItemStack newStack) {}
|
||||
|
||||
@Override
|
||||
public void saveSettings() {
|
||||
super.saveSettings();
|
||||
writeToNBT();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IInventory getInventoryByName(String name) {
|
||||
if (name.equals("config")) {
|
||||
return filterInventory;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public boolean doInject(IAEItemStack is, EntityItem itemToGet, World world) {
|
||||
IAEItemStack ais = (IAEItemStack) injectItems(is);
|
||||
if (ais != null) {
|
||||
player.onItemPickup(itemToGet, ais.getItemStack().stackSize);
|
||||
player.inventory.addItemStackToInventory(ais.getItemStack());
|
||||
world.playSoundAtEntity(
|
||||
player,
|
||||
"random.pop",
|
||||
0.15F,
|
||||
((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean isItemFiltered(ItemStack inputItemStack) {
|
||||
if (useOreDict && !oreDictFilter.isEmpty()) {
|
||||
if (filterPredicate == null) filterPredicate = OreFilteredList.makeFilter(oreDictFilter);
|
||||
if (filterPredicate.test(AEItemStack.create(inputItemStack))) return true;
|
||||
}
|
||||
|
||||
for (int i = 0; i < filterInventory.getSizeInventory(); i++) {
|
||||
ItemStack is = filterInventory.getStackInSlot(i);
|
||||
if (is != null) {
|
||||
if (useOre) {
|
||||
// use oredict
|
||||
if (OreHelper.INSTANCE
|
||||
.sameOre(OreHelper.INSTANCE.isOre(is), OreHelper.INSTANCE.isOre(inputItemStack)))
|
||||
return true;
|
||||
}
|
||||
if (ignoreMeta && ignoreNbt) {
|
||||
// ignore meta & nbt
|
||||
return is.getItem().equals(inputItemStack.getItem());
|
||||
} else if (ignoreMeta) {
|
||||
// ignore meta only
|
||||
return ItemStack.areItemStackTagsEqual(is, inputItemStack)
|
||||
&& is.getItem() == inputItemStack.getItem();
|
||||
} else if (ignoreNbt) {
|
||||
// ignore nbt only
|
||||
return is.getItem() == inputItemStack.getItem()
|
||||
&& is.getItemDamage() == inputItemStack.getItemDamage();
|
||||
} else {
|
||||
// ignore nothing/don't use oredict--must be exact match
|
||||
return is.isItemEqual(inputItemStack) && ItemStack.areItemStackTagsEqual(is, inputItemStack);
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean isPassFilter(ItemStack is) {
|
||||
return is != null && (listMode == WirelessMagnet.ListMode.WhiteList) == isItemFiltered(is);
|
||||
}
|
||||
|
||||
public boolean checkCache(ItemStack is) {
|
||||
return settingCache.equals(getSettingTag(is)) && filterCache.equals(getFilterTag(is));
|
||||
}
|
||||
|
||||
public static class FilterCache {
|
||||
|
||||
private static final Map<UUID, WirelessMagnetCardFilterInventory> cache = new WeakHashMap<>();
|
||||
|
||||
public static WirelessMagnetCardFilterInventory getFilter(ItemStack is, int slot, IGridNode gridNode,
|
||||
EntityPlayer player) {
|
||||
WirelessMagnetCardFilterInventory cachedInv = cache.get(player.getUniqueID());
|
||||
if (cachedInv != null && cachedInv.checkCache(is)) {
|
||||
return cachedInv;
|
||||
} else {
|
||||
WirelessMagnetCardFilterInventory newInv = new WirelessMagnetCardFilterInventory(
|
||||
is,
|
||||
slot,
|
||||
gridNode,
|
||||
player);
|
||||
cache.put(player.getUniqueID(), newInv);
|
||||
return newInv;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+3
-9
@@ -2,7 +2,6 @@ package com.glodblock.github.inventory.item;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
@@ -14,7 +13,6 @@ import com.glodblock.github.common.item.ItemFluidDrop;
|
||||
import com.glodblock.github.common.item.ItemFluidPacket;
|
||||
import com.glodblock.github.inventory.ItemBiggerAppEngInventory;
|
||||
import com.glodblock.github.inventory.WirelessFluidPatternTerminalPatterns;
|
||||
import com.glodblock.github.util.Util;
|
||||
|
||||
import appeng.api.config.Actionable;
|
||||
import appeng.api.config.PowerMultiplier;
|
||||
@@ -27,9 +25,7 @@ import appeng.api.implementations.ICraftingPatternItem;
|
||||
import appeng.api.implementations.items.IAEItemPowerStorage;
|
||||
import appeng.api.networking.IGridNode;
|
||||
import appeng.api.networking.crafting.ICraftingPatternDetails;
|
||||
import appeng.api.storage.IMEInventoryHandler;
|
||||
import appeng.api.storage.IMEMonitor;
|
||||
import appeng.api.storage.MEMonitorHandler;
|
||||
import appeng.api.storage.StorageChannel;
|
||||
import appeng.api.storage.data.IAEFluidStack;
|
||||
import appeng.api.storage.data.IAEItemStack;
|
||||
@@ -42,8 +38,7 @@ import appeng.tile.inventory.InvOperation;
|
||||
import appeng.util.ConfigManager;
|
||||
import appeng.util.Platform;
|
||||
|
||||
public class WirelessPatternTerminalExInventory extends MEMonitorHandler<IAEItemStack>
|
||||
implements IWirelessPatternTerminal {
|
||||
public class WirelessPatternTerminalExInventory extends BaseWirelessInventory implements IWirelessPatternTerminal {
|
||||
|
||||
private final ItemStack target;
|
||||
private final IAEItemPowerStorage ips;
|
||||
@@ -68,9 +63,7 @@ public class WirelessPatternTerminalExInventory extends MEMonitorHandler<IAEItem
|
||||
@SuppressWarnings("unchecked")
|
||||
public WirelessPatternTerminalExInventory(final ItemStack is, final int slot, IGridNode gridNode,
|
||||
EntityPlayer player) {
|
||||
super(
|
||||
(IMEInventoryHandler<IAEItemStack>) Objects
|
||||
.requireNonNull(Util.getWirelessInv(is, player, StorageChannel.ITEMS)));
|
||||
super(is, slot, gridNode, player, StorageChannel.ITEMS);
|
||||
this.ips = (ToolWirelessTerminal) is.getItem();
|
||||
this.grid = gridNode;
|
||||
this.target = is;
|
||||
@@ -419,6 +412,7 @@ public class WirelessPatternTerminalExInventory extends MEMonitorHandler<IAEItem
|
||||
|
||||
@Override
|
||||
public void saveSettings() {
|
||||
super.saveSettings();
|
||||
this.writeToNBT();
|
||||
}
|
||||
|
||||
|
||||
+3
-9
@@ -2,7 +2,6 @@ package com.glodblock.github.inventory.item;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
@@ -14,7 +13,6 @@ import com.glodblock.github.common.item.ItemFluidDrop;
|
||||
import com.glodblock.github.common.item.ItemFluidPacket;
|
||||
import com.glodblock.github.inventory.ItemBiggerAppEngInventory;
|
||||
import com.glodblock.github.inventory.WirelessFluidPatternTerminalPatterns;
|
||||
import com.glodblock.github.util.Util;
|
||||
|
||||
import appeng.api.config.Actionable;
|
||||
import appeng.api.config.PowerMultiplier;
|
||||
@@ -27,9 +25,7 @@ import appeng.api.implementations.ICraftingPatternItem;
|
||||
import appeng.api.implementations.items.IAEItemPowerStorage;
|
||||
import appeng.api.networking.IGridNode;
|
||||
import appeng.api.networking.crafting.ICraftingPatternDetails;
|
||||
import appeng.api.storage.IMEInventoryHandler;
|
||||
import appeng.api.storage.IMEMonitor;
|
||||
import appeng.api.storage.MEMonitorHandler;
|
||||
import appeng.api.storage.StorageChannel;
|
||||
import appeng.api.storage.data.IAEFluidStack;
|
||||
import appeng.api.storage.data.IAEItemStack;
|
||||
@@ -42,8 +38,7 @@ import appeng.tile.inventory.InvOperation;
|
||||
import appeng.util.ConfigManager;
|
||||
import appeng.util.Platform;
|
||||
|
||||
public class WirelessPatternTerminalInventory extends MEMonitorHandler<IAEItemStack>
|
||||
implements IWirelessPatternTerminal {
|
||||
public class WirelessPatternTerminalInventory extends BaseWirelessInventory implements IWirelessPatternTerminal {
|
||||
|
||||
private final ItemStack target;
|
||||
private final IAEItemPowerStorage ips;
|
||||
@@ -68,9 +63,7 @@ public class WirelessPatternTerminalInventory extends MEMonitorHandler<IAEItemSt
|
||||
@SuppressWarnings("unchecked")
|
||||
public WirelessPatternTerminalInventory(final ItemStack is, final int slot, IGridNode gridNode,
|
||||
EntityPlayer player) {
|
||||
super(
|
||||
(IMEInventoryHandler<IAEItemStack>) Objects
|
||||
.requireNonNull(Util.getWirelessInv(is, player, StorageChannel.ITEMS)));
|
||||
super(is, slot, gridNode, player, StorageChannel.ITEMS);
|
||||
this.ips = (ToolWirelessTerminal) is.getItem();
|
||||
this.grid = gridNode;
|
||||
this.target = is;
|
||||
@@ -391,6 +384,7 @@ public class WirelessPatternTerminalInventory extends MEMonitorHandler<IAEItemSt
|
||||
|
||||
@Override
|
||||
public void saveSettings() {
|
||||
super.saveSettings();
|
||||
this.writeToNBT();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user