pick 97420a31d The big reformat of 2020

This commit is contained in:
yueh
2020-06-16 21:41:28 +02:00
parent 5304b3febe
commit 5225ea426b
2252 changed files with 95466 additions and 118582 deletions
@@ -18,14 +18,9 @@
package appeng.me.helpers;
import java.util.Collections;
import java.util.EnumSet;
import appeng.core.worlddata.WorldData;
import appeng.hooks.TickHandler;
import appeng.me.cache.P2PCache;
import appeng.parts.networking.PartCable;
import com.mojang.authlib.GameProfile;
import net.minecraft.entity.player.PlayerEntity;
@@ -50,402 +45,333 @@ import appeng.api.networking.ticking.ITickManager;
import appeng.api.util.AEColor;
import appeng.api.util.DimensionalCoord;
import appeng.api.util.IOrientable;
import appeng.core.worlddata.WorldData;
import appeng.hooks.TickHandler;
import appeng.me.GridAccessException;
import appeng.me.cache.P2PCache;
import appeng.parts.networking.PartCable;
import appeng.tile.AEBaseTile;
import appeng.util.Platform;
public class AENetworkProxy implements IGridBlock {
public class AENetworkProxy implements IGridBlock
{
private final IGridProxyable gp;
private final boolean worldNode;
private final String nbtName; // name
private AEColor myColor = AEColor.TRANSPARENT;
private CompoundNBT data = null; // input
private ItemStack myRepInstance = ItemStack.EMPTY;
private boolean isReady = false;
private IGridNode node = null;
private EnumSet<Direction> validSides;
private EnumSet<GridFlags> flags = EnumSet.noneOf(GridFlags.class);
private double idleDraw = 1.0;
private PlayerEntity owner;
private final IGridProxyable gp;
private final boolean worldNode;
private final String nbtName; // name
private AEColor myColor = AEColor.TRANSPARENT;
private CompoundNBT data = null; // input
private ItemStack myRepInstance = ItemStack.EMPTY;
private boolean isReady = false;
private IGridNode node = null;
private EnumSet<Direction> validSides;
private EnumSet<GridFlags> flags = EnumSet.noneOf( GridFlags.class );
private double idleDraw = 1.0;
private PlayerEntity owner;
public AENetworkProxy(final IGridProxyable te, final String nbtName, final ItemStack visual,
final boolean inWorld) {
this.gp = te;
this.nbtName = nbtName;
this.worldNode = inWorld;
this.myRepInstance = visual;
this.validSides = EnumSet.allOf(Direction.class);
}
public AENetworkProxy( final IGridProxyable te, final String nbtName, final ItemStack visual, final boolean inWorld )
{
this.gp = te;
this.nbtName = nbtName;
this.worldNode = inWorld;
this.myRepInstance = visual;
this.validSides = EnumSet.allOf( Direction.class );
}
public void setVisualRepresentation(final ItemStack is) {
this.myRepInstance = is;
}
public void setVisualRepresentation( final ItemStack is )
{
this.myRepInstance = is;
}
public void writeToNBT(final CompoundNBT tag) {
if (this.node != null) {
this.node.saveToNBT(this.nbtName, tag);
}
}
public void writeToNBT( final CompoundNBT tag )
{
if( this.node != null )
{
this.node.saveToNBT( this.nbtName, tag );
}
}
public void setValidSides(final EnumSet<Direction> validSides) {
this.validSides = validSides;
if (this.node != null) {
this.node.updateState();
}
}
public void setValidSides( final EnumSet<Direction> validSides )
{
this.validSides = validSides;
if( this.node != null )
{
this.node.updateState();
}
}
public void validate() {
if (this.gp instanceof AEBaseTile) {
TickHandler.INSTANCE.addInit((AEBaseTile) this.gp);
}
}
public void validate()
{
if( this.gp instanceof AEBaseTile )
{
TickHandler.INSTANCE.addInit( (AEBaseTile) this.gp );
}
}
public void onChunkUnloaded() {
this.isReady = false;
this.remove();
}
public void onChunkUnloaded()
{
this.isReady = false;
this.remove();
}
public void remove() {
this.isReady = false;
if (this.node != null) {
this.node.destroy();
this.node = null;
}
}
public void remove()
{
this.isReady = false;
if( this.node != null )
{
this.node.destroy();
this.node = null;
}
}
public void onReady() {
this.isReady = true;
public void onReady()
{
this.isReady = true;
// send orientation based directionality to the node.
if (this.gp instanceof IOrientable) {
final IOrientable ori = (IOrientable) this.gp;
if (ori.canBeRotated()) {
ori.setOrientation(ori.getForward(), ori.getUp());
}
}
// send orientation based directionality to the node.
if( this.gp instanceof IOrientable )
{
final IOrientable ori = (IOrientable) this.gp;
if( ori.canBeRotated() )
{
ori.setOrientation( ori.getForward(), ori.getUp() );
}
}
this.getNode();
}
this.getNode();
}
public IGridNode getNode() {
if (this.node == null && Platform.isServer() && this.isReady) {
this.node = AEApi.instance().grid().createGridNode(this);
this.readFromNBT(this.data);
this.node.updateState();
}
public IGridNode getNode()
{
if( this.node == null && Platform.isServer() && this.isReady )
{
this.node = AEApi.instance().grid().createGridNode( this );
this.readFromNBT( this.data );
this.node.updateState();
}
return this.node;
}
return this.node;
}
public void readFromNBT(final CompoundNBT tag) {
this.data = tag;
if (this.node != null && this.data != null) {
this.node.loadFromNBT(this.nbtName, this.data);
this.data = null;
} else if (this.node != null && this.owner != null) {
final GameProfile profile = this.owner.getGameProfile();
final int playerID = WorldData.instance().playerData().getMePlayerId(profile);
public void readFromNBT( final CompoundNBT tag )
{
this.data = tag;
if( this.node != null && this.data != null )
{
this.node.loadFromNBT( this.nbtName, this.data );
this.data = null;
}
else if( this.node != null && this.owner != null )
{
final GameProfile profile = this.owner.getGameProfile();
final int playerID = WorldData.instance().playerData().getMePlayerId( profile );
this.node.setPlayerID(playerID);
this.owner = null;
}
}
this.node.setPlayerID( playerID );
this.owner = null;
}
}
public IPathingGrid getPath() throws GridAccessException {
final IGrid grid = this.getGrid();
if (grid == null) {
throw new GridAccessException();
}
final IPathingGrid pg = grid.getCache(IPathingGrid.class);
if (pg == null) {
throw new GridAccessException();
}
return pg;
}
public IPathingGrid getPath() throws GridAccessException
{
final IGrid grid = this.getGrid();
if( grid == null )
{
throw new GridAccessException();
}
final IPathingGrid pg = grid.getCache( IPathingGrid.class );
if( pg == null )
{
throw new GridAccessException();
}
return pg;
}
/**
* short cut!
*
* @return grid of node
*
* @throws GridAccessException of node or grid is null
*/
public IGrid getGrid() throws GridAccessException {
if (this.node == null) {
throw new GridAccessException();
}
final IGrid grid = this.node.getGrid();
if (grid == null) {
throw new GridAccessException();
}
return grid;
}
/**
* short cut!
*
* @return grid of node
*
* @throws GridAccessException of node or grid is null
*/
public IGrid getGrid() throws GridAccessException
{
if( this.node == null )
{
throw new GridAccessException();
}
final IGrid grid = this.node.getGrid();
if( grid == null )
{
throw new GridAccessException();
}
return grid;
}
public ITickManager getTick() throws GridAccessException {
final IGrid grid = this.getGrid();
if (grid == null) {
throw new GridAccessException();
}
final ITickManager pg = grid.getCache(ITickManager.class);
if (pg == null) {
throw new GridAccessException();
}
return pg;
}
public ITickManager getTick() throws GridAccessException
{
final IGrid grid = this.getGrid();
if( grid == null )
{
throw new GridAccessException();
}
final ITickManager pg = grid.getCache( ITickManager.class );
if( pg == null )
{
throw new GridAccessException();
}
return pg;
}
public IStorageGrid getStorage() throws GridAccessException {
final IGrid grid = this.getGrid();
if (grid == null) {
throw new GridAccessException();
}
public IStorageGrid getStorage() throws GridAccessException
{
final IGrid grid = this.getGrid();
if( grid == null )
{
throw new GridAccessException();
}
final IStorageGrid pg = grid.getCache(IStorageGrid.class);
final IStorageGrid pg = grid.getCache( IStorageGrid.class );
if (pg == null) {
throw new GridAccessException();
}
if( pg == null )
{
throw new GridAccessException();
}
return pg;
}
return pg;
}
public P2PCache getP2P() throws GridAccessException {
final IGrid grid = this.getGrid();
if (grid == null) {
throw new GridAccessException();
}
public P2PCache getP2P() throws GridAccessException
{
final IGrid grid = this.getGrid();
if( grid == null )
{
throw new GridAccessException();
}
final P2PCache pg = grid.getCache(P2PCache.class);
final P2PCache pg = grid.getCache( P2PCache.class );
if (pg == null) {
throw new GridAccessException();
}
if( pg == null )
{
throw new GridAccessException();
}
return pg;
}
return pg;
}
public ISecurityGrid getSecurity() throws GridAccessException {
final IGrid grid = this.getGrid();
if (grid == null) {
throw new GridAccessException();
}
public ISecurityGrid getSecurity() throws GridAccessException
{
final IGrid grid = this.getGrid();
if( grid == null )
{
throw new GridAccessException();
}
final ISecurityGrid sg = grid.getCache(ISecurityGrid.class);
final ISecurityGrid sg = grid.getCache( ISecurityGrid.class );
if (sg == null) {
throw new GridAccessException();
}
if( sg == null )
{
throw new GridAccessException();
}
return sg;
}
return sg;
}
public ICraftingGrid getCrafting() throws GridAccessException {
final IGrid grid = this.getGrid();
if (grid == null) {
throw new GridAccessException();
}
public ICraftingGrid getCrafting() throws GridAccessException
{
final IGrid grid = this.getGrid();
if( grid == null )
{
throw new GridAccessException();
}
final ICraftingGrid sg = grid.getCache(ICraftingGrid.class);
final ICraftingGrid sg = grid.getCache( ICraftingGrid.class );
if (sg == null) {
throw new GridAccessException();
}
if( sg == null )
{
throw new GridAccessException();
}
return sg;
}
return sg;
}
@Override
public double getIdlePowerUsage() {
return this.idleDraw;
}
@Override
public double getIdlePowerUsage()
{
return this.idleDraw;
}
@Override
public EnumSet<GridFlags> getFlags() {
return this.flags;
}
@Override
public EnumSet<GridFlags> getFlags()
{
return this.flags;
}
@Override
public boolean isWorldAccessible() {
return this.worldNode;
}
@Override
public boolean isWorldAccessible()
{
return this.worldNode;
}
@Override
public DimensionalCoord getLocation() {
return this.gp.getLocation();
}
@Override
public DimensionalCoord getLocation()
{
return this.gp.getLocation();
}
@Override
public AEColor getGridColor() {
return this.getColor();
}
@Override
public AEColor getGridColor()
{
return this.getColor();
}
@Override
public void onGridNotification(final GridNotification notification) {
if (this.gp instanceof PartCable) {
((PartCable) this.gp).markForUpdate();
}
}
@Override
public void onGridNotification( final GridNotification notification )
{
if( this.gp instanceof PartCable)
{
( (PartCable) this.gp ).markForUpdate();
}
}
@Override
public void setNetworkStatus(final IGrid grid, final int channelsInUse) {
@Override
public void setNetworkStatus( final IGrid grid, final int channelsInUse )
{
}
}
@Override
public EnumSet<Direction> getConnectableSides() {
return this.validSides;
}
@Override
public EnumSet<Direction> getConnectableSides()
{
return this.validSides;
}
@Override
public IGridHost getMachine() {
return this.gp;
}
@Override
public IGridHost getMachine()
{
return this.gp;
}
@Override
public void gridChanged() {
this.gp.gridChanged();
}
@Override
public void gridChanged()
{
this.gp.gridChanged();
}
@Override
public ItemStack getMachineRepresentation() {
return this.myRepInstance;
}
@Override
public ItemStack getMachineRepresentation()
{
return this.myRepInstance;
}
public void setFlags(final GridFlags... requireChannel) {
final EnumSet<GridFlags> flags = EnumSet.noneOf(GridFlags.class);
public void setFlags( final GridFlags... requireChannel )
{
final EnumSet<GridFlags> flags = EnumSet.noneOf( GridFlags.class );
Collections.addAll(flags, requireChannel);
Collections.addAll( flags, requireChannel );
this.flags = flags;
}
this.flags = flags;
}
public void setIdlePowerUsage(final double idle) {
this.idleDraw = idle;
public void setIdlePowerUsage( final double idle )
{
this.idleDraw = idle;
if (this.node != null) {
try {
final IGrid g = this.getGrid();
g.postEvent(new MENetworkPowerIdleChange(this.node));
} catch (final GridAccessException e) {
// not ready for this yet..
}
}
}
if( this.node != null )
{
try
{
final IGrid g = this.getGrid();
g.postEvent( new MENetworkPowerIdleChange( this.node ) );
}
catch( final GridAccessException e )
{
// not ready for this yet..
}
}
}
public boolean isReady() {
return this.isReady;
}
public boolean isReady()
{
return this.isReady;
}
public boolean isActive() {
if (this.node == null) {
return false;
}
public boolean isActive()
{
if( this.node == null )
{
return false;
}
return this.node.isActive();
}
return this.node.isActive();
}
public boolean isPowered() {
try {
return this.getEnergy().isNetworkPowered();
} catch (final GridAccessException e) {
return false;
}
}
public boolean isPowered()
{
try
{
return this.getEnergy().isNetworkPowered();
}
catch( final GridAccessException e )
{
return false;
}
}
public IEnergyGrid getEnergy() throws GridAccessException {
final IGrid grid = this.getGrid();
if (grid == null) {
throw new GridAccessException();
}
final IEnergyGrid eg = grid.getCache(IEnergyGrid.class);
if (eg == null) {
throw new GridAccessException();
}
return eg;
}
public IEnergyGrid getEnergy() throws GridAccessException
{
final IGrid grid = this.getGrid();
if( grid == null )
{
throw new GridAccessException();
}
final IEnergyGrid eg = grid.getCache( IEnergyGrid.class );
if( eg == null )
{
throw new GridAccessException();
}
return eg;
}
public void setOwner(final PlayerEntity player) {
this.owner = player;
}
public void setOwner( final PlayerEntity player )
{
this.owner = player;
}
public AEColor getColor() {
return this.myColor;
}
public AEColor getColor()
{
return this.myColor;
}
public void setColor( final AEColor myColor )
{
this.myColor = myColor;
}
public void setColor(final AEColor myColor) {
this.myColor = myColor;
}
}
@@ -18,7 +18,6 @@
package appeng.me.helpers;
import java.util.Iterator;
import net.minecraft.item.ItemStack;
@@ -30,28 +29,23 @@ import appeng.me.cluster.IAEMultiBlock;
import appeng.util.iterators.ChainedIterator;
import appeng.util.iterators.ProxyNodeIterator;
public class AENetworkProxyMultiblock extends AENetworkProxy implements IGridMultiblock {
public class AENetworkProxyMultiblock extends AENetworkProxy implements IGridMultiblock
{
public AENetworkProxyMultiblock(final IGridProxyable te, final String nbtName, final ItemStack itemStack,
final boolean inWorld) {
super(te, nbtName, itemStack, inWorld);
}
public AENetworkProxyMultiblock( final IGridProxyable te, final String nbtName, final ItemStack itemStack, final boolean inWorld )
{
super( te, nbtName, itemStack, inWorld );
}
@Override
public Iterator<IGridNode> getMultiblockNodes() {
if (this.getCluster() == null) {
return new ChainedIterator<>();
}
@Override
public Iterator<IGridNode> getMultiblockNodes()
{
if( this.getCluster() == null )
{
return new ChainedIterator<>();
}
return new ProxyNodeIterator(this.getCluster().getTiles());
}
return new ProxyNodeIterator( this.getCluster().getTiles() );
}
private IAECluster getCluster()
{
return ( (IAEMultiBlock) this.getMachine() ).getCluster();
}
private IAECluster getCluster() {
return ((IAEMultiBlock) this.getMachine()).getCluster();
}
}
@@ -18,7 +18,6 @@
package appeng.me.helpers;
import java.util.Optional;
import net.minecraft.entity.player.PlayerEntity;
@@ -26,25 +25,20 @@ import net.minecraft.entity.player.PlayerEntity;
import appeng.api.networking.security.IActionHost;
import appeng.api.networking.security.IActionSource;
public class BaseActionSource implements IActionSource {
public class BaseActionSource implements IActionSource
{
@Override
public Optional<PlayerEntity> player() {
return Optional.empty();
}
@Override
public Optional<PlayerEntity> player()
{
return Optional.empty();
}
@Override
public Optional<IActionHost> machine() {
return Optional.empty();
}
@Override
public Optional<IActionHost> machine()
{
return Optional.empty();
}
@Override
public <T> Optional<T> context( Class<T> key )
{
return Optional.empty();
}
@Override
public <T> Optional<T> context(Class<T> key) {
return Optional.empty();
}
}
@@ -18,32 +18,26 @@
package appeng.me.helpers;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
import appeng.api.networking.IGridNode;
import appeng.api.networking.energy.IEnergySource;
public class ChannelPowerSrc implements IEnergySource {
public class ChannelPowerSrc implements IEnergySource
{
private final IGridNode node;
private final IEnergySource realSrc;
private final IGridNode node;
private final IEnergySource realSrc;
public ChannelPowerSrc(final IGridNode networkNode, final IEnergySource src) {
this.node = networkNode;
this.realSrc = src;
}
public ChannelPowerSrc( final IGridNode networkNode, final IEnergySource src )
{
this.node = networkNode;
this.realSrc = src;
}
@Override
public double extractAEPower( final double amt, final Actionable mode, final PowerMultiplier usePowerMultiplier )
{
if( this.node.isActive() )
{
return this.realSrc.extractAEPower( amt, mode, usePowerMultiplier );
}
return 0.0;
}
@Override
public double extractAEPower(final double amt, final Actionable mode, final PowerMultiplier usePowerMultiplier) {
if (this.node.isActive()) {
return this.realSrc.extractAEPower(amt, mode, usePowerMultiplier);
}
return 0.0;
}
}
@@ -18,7 +18,6 @@
package appeng.me.helpers;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -27,100 +26,77 @@ import com.google.common.collect.Multimap;
import appeng.api.storage.data.IAEStack;
public class GenericInterestManager<T> {
public class GenericInterestManager<T>
{
private final Multimap<IAEStack, T> container;
private List<SavedTransactions> transactions = null;
private int transDepth = 0;
private final Multimap<IAEStack, T> container;
private List<SavedTransactions> transactions = null;
private int transDepth = 0;
public GenericInterestManager(final Multimap<IAEStack, T> interests) {
this.container = interests;
}
public GenericInterestManager( final Multimap<IAEStack, T> interests )
{
this.container = interests;
}
public void enableTransactions() {
if (this.transDepth == 0) {
this.transactions = new ArrayList<>();
}
public void enableTransactions()
{
if( this.transDepth == 0 )
{
this.transactions = new ArrayList<>();
}
this.transDepth++;
}
this.transDepth++;
}
public void disableTransactions() {
this.transDepth--;
public void disableTransactions()
{
this.transDepth--;
if (this.transDepth == 0) {
final List<SavedTransactions> myActions = this.transactions;
this.transactions = null;
if( this.transDepth == 0 )
{
final List<SavedTransactions> myActions = this.transactions;
this.transactions = null;
for (final SavedTransactions t : myActions) {
if (t.put) {
this.put(t.stack, t.iw);
} else {
this.remove(t.stack, t.iw);
}
}
}
}
for( final SavedTransactions t : myActions )
{
if( t.put )
{
this.put( t.stack, t.iw );
}
else
{
this.remove( t.stack, t.iw );
}
}
}
}
public boolean put(final IAEStack stack, final T iw) {
if (this.transactions != null) {
this.transactions.add(new SavedTransactions(true, stack, iw));
return true;
} else {
return this.container.put(stack, iw);
}
}
public boolean put( final IAEStack stack, final T iw )
{
if( this.transactions != null )
{
this.transactions.add( new SavedTransactions( true, stack, iw ) );
return true;
}
else
{
return this.container.put( stack, iw );
}
}
public boolean remove(final IAEStack stack, final T iw) {
if (this.transactions != null) {
this.transactions.add(new SavedTransactions(false, stack, iw));
return true;
} else {
return this.container.remove(stack, iw);
}
}
public boolean remove( final IAEStack stack, final T iw )
{
if( this.transactions != null )
{
this.transactions.add( new SavedTransactions( false, stack, iw ) );
return true;
}
else
{
return this.container.remove( stack, iw );
}
}
public boolean containsKey(final IAEStack stack) {
return this.container.containsKey(stack);
}
public boolean containsKey( final IAEStack stack )
{
return this.container.containsKey( stack );
}
public Collection<T> get(final IAEStack stack) {
return this.container.get(stack);
}
public Collection<T> get( final IAEStack stack )
{
return this.container.get( stack );
}
private class SavedTransactions {
private class SavedTransactions
{
private final boolean put;
private final IAEStack stack;
private final T iw;
private final boolean put;
private final IAEStack stack;
private final T iw;
public SavedTransactions( final boolean putOperation, final IAEStack myStack, final T watcher )
{
this.put = putOperation;
this.stack = myStack;
this.iw = watcher;
}
}
public SavedTransactions(final boolean putOperation, final IAEStack myStack, final T watcher) {
this.put = putOperation;
this.stack = myStack;
this.iw = watcher;
}
}
}
@@ -18,17 +18,14 @@
package appeng.me.helpers;
import appeng.api.networking.IGridHost;
import appeng.api.util.DimensionalCoord;
public interface IGridProxyable extends IGridHost {
public interface IGridProxyable extends IGridHost
{
AENetworkProxy getProxy();
AENetworkProxy getProxy();
DimensionalCoord getLocation();
DimensionalCoord getLocation();
void gridChanged();
void gridChanged();
}
@@ -23,7 +23,6 @@
package appeng.me.helpers;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map.Entry;
@@ -40,182 +39,150 @@ import appeng.api.storage.IStorageChannel;
import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList;
/**
* Common implementation of a simple class that monitors injection/extraction of a inventory to send events to a list of
* listeners.
* Common implementation of a simple class that monitors injection/extraction of
* a inventory to send events to a list of listeners.
*
* @param <T>
*
* TODO: Needs to be redesigned to solve performance issues.
* TODO: Needs to be redesigned to solve performance issues.
*/
public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T>
{
public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T> {
private final IMEInventoryHandler<T> internalHandler;
private final IItemList<T> cachedList;
private final HashMap<IMEMonitorHandlerReceiver<T>, Object> listeners = new HashMap<>();
private final IMEInventoryHandler<T> internalHandler;
private final IItemList<T> cachedList;
private final HashMap<IMEMonitorHandlerReceiver<T>, Object> listeners = new HashMap<>();
protected boolean hasChanged = true;
protected boolean hasChanged = true;
public MEMonitorHandler( final IMEInventoryHandler<T> t )
{
this.internalHandler = t;
this.cachedList = t.getChannel().createList();
}
public MEMonitorHandler(final IMEInventoryHandler<T> t) {
this.internalHandler = t;
this.cachedList = t.getChannel().createList();
}
public MEMonitorHandler( final IMEInventoryHandler<T> t, final IStorageChannel<T> chan )
{
this.internalHandler = t;
this.cachedList = chan.createList();
}
public MEMonitorHandler(final IMEInventoryHandler<T> t, final IStorageChannel<T> chan) {
this.internalHandler = t;
this.cachedList = chan.createList();
}
@Override
public void addListener( final IMEMonitorHandlerReceiver<T> l, final Object verificationToken )
{
this.listeners.put( l, verificationToken );
}
@Override
public void addListener(final IMEMonitorHandlerReceiver<T> l, final Object verificationToken) {
this.listeners.put(l, verificationToken);
}
@Override
public void removeListener( final IMEMonitorHandlerReceiver<T> l )
{
this.listeners.remove( l );
}
@Override
public void removeListener(final IMEMonitorHandlerReceiver<T> l) {
this.listeners.remove(l);
}
@Override
public T injectItems( final T input, final Actionable mode, final IActionSource src )
{
if( mode == Actionable.SIMULATE )
{
return this.getHandler().injectItems( input, mode, src );
}
return this.monitorDifference( input.copy(), this.getHandler().injectItems( input, mode, src ), false, src );
}
@Override
public T injectItems(final T input, final Actionable mode, final IActionSource src) {
if (mode == Actionable.SIMULATE) {
return this.getHandler().injectItems(input, mode, src);
}
return this.monitorDifference(input.copy(), this.getHandler().injectItems(input, mode, src), false, src);
}
protected IMEInventoryHandler<T> getHandler()
{
return this.internalHandler;
}
protected IMEInventoryHandler<T> getHandler() {
return this.internalHandler;
}
private T monitorDifference( final T original, final T leftOvers, final boolean extraction, final IActionSource src )
{
final T diff = original.copy();
private T monitorDifference(final T original, final T leftOvers, final boolean extraction,
final IActionSource src) {
final T diff = original.copy();
if( extraction )
{
diff.setStackSize( leftOvers == null ? 0 : -leftOvers.getStackSize() );
}
else if( leftOvers != null )
{
diff.decStackSize( leftOvers.getStackSize() );
}
if (extraction) {
diff.setStackSize(leftOvers == null ? 0 : -leftOvers.getStackSize());
} else if (leftOvers != null) {
diff.decStackSize(leftOvers.getStackSize());
}
if( diff.getStackSize() != 0 )
{
this.postChangesToListeners( ImmutableList.of( diff ), src );
}
if (diff.getStackSize() != 0) {
this.postChangesToListeners(ImmutableList.of(diff), src);
}
return leftOvers;
}
return leftOvers;
}
protected void postChangesToListeners( final Iterable<T> changes, final IActionSource src )
{
this.notifyListenersOfChange( changes, src );
}
protected void postChangesToListeners(final Iterable<T> changes, final IActionSource src) {
this.notifyListenersOfChange(changes, src);
}
protected void notifyListenersOfChange( final Iterable<T> diff, final IActionSource src )
{
this.hasChanged = true;// need to update the cache.
final Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> i = this.getListeners();
while( i.hasNext() )
{
final Entry<IMEMonitorHandlerReceiver<T>, Object> o = i.next();
final IMEMonitorHandlerReceiver<T> receiver = o.getKey();
if( receiver.isValid( o.getValue() ) )
{
receiver.postChange( this, diff, src );
}
else
{
i.remove();
}
}
}
protected void notifyListenersOfChange(final Iterable<T> diff, final IActionSource src) {
this.hasChanged = true;// need to update the cache.
final Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> i = this.getListeners();
while (i.hasNext()) {
final Entry<IMEMonitorHandlerReceiver<T>, Object> o = i.next();
final IMEMonitorHandlerReceiver<T> receiver = o.getKey();
if (receiver.isValid(o.getValue())) {
receiver.postChange(this, diff, src);
} else {
i.remove();
}
}
}
protected Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> getListeners()
{
return this.listeners.entrySet().iterator();
}
protected Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> getListeners() {
return this.listeners.entrySet().iterator();
}
@Override
public T extractItems( final T request, final Actionable mode, final IActionSource src )
{
if( mode == Actionable.SIMULATE )
{
return this.getHandler().extractItems( request, mode, src );
}
return this.monitorDifference( request.copy(), this.getHandler().extractItems( request, mode, src ), true, src );
}
@Override
public T extractItems(final T request, final Actionable mode, final IActionSource src) {
if (mode == Actionable.SIMULATE) {
return this.getHandler().extractItems(request, mode, src);
}
return this.monitorDifference(request.copy(), this.getHandler().extractItems(request, mode, src), true, src);
}
@Override
public IStorageChannel<T> getChannel()
{
return this.getHandler().getChannel();
}
@Override
public IStorageChannel<T> getChannel() {
return this.getHandler().getChannel();
}
@Override
public AccessRestriction getAccess()
{
return this.getHandler().getAccess();
}
@Override
public AccessRestriction getAccess() {
return this.getHandler().getAccess();
}
@Override
public IItemList<T> getStorageList()
{
if( this.hasChanged )
{
this.hasChanged = false;
this.cachedList.resetStatus();
return this.getAvailableItems( this.cachedList );
}
@Override
public IItemList<T> getStorageList() {
if (this.hasChanged) {
this.hasChanged = false;
this.cachedList.resetStatus();
return this.getAvailableItems(this.cachedList);
}
return this.cachedList;
}
return this.cachedList;
}
@Override
public boolean isPrioritized( final T input )
{
return this.getHandler().isPrioritized( input );
}
@Override
public boolean isPrioritized(final T input) {
return this.getHandler().isPrioritized(input);
}
@Override
public boolean canAccept( final T input )
{
return this.getHandler().canAccept( input );
}
@Override
public boolean canAccept(final T input) {
return this.getHandler().canAccept(input);
}
@Override
public IItemList<T> getAvailableItems( final IItemList<T> out )
{
return this.getHandler().getAvailableItems( out );
}
@Override
public IItemList<T> getAvailableItems(final IItemList<T> out) {
return this.getHandler().getAvailableItems(out);
}
@Override
public int getPriority()
{
return this.getHandler().getPriority();
}
@Override
public int getPriority() {
return this.getHandler().getPriority();
}
@Override
public int getSlot()
{
return this.getHandler().getSlot();
}
@Override
public int getSlot() {
return this.getHandler().getSlot();
}
@Override
public boolean validForPass( final int i )
{
return this.getHandler().validForPass( i );
}
@Override
public boolean validForPass(final int i) {
return this.getHandler().validForPass(i);
}
}
@@ -18,7 +18,6 @@
package appeng.me.helpers;
import java.util.Optional;
import net.minecraft.entity.player.PlayerEntity;
@@ -26,33 +25,27 @@ import net.minecraft.entity.player.PlayerEntity;
import appeng.api.networking.security.IActionHost;
import appeng.api.networking.security.IActionSource;
public class MachineSource implements IActionSource {
public class MachineSource implements IActionSource
{
private final IActionHost via;
private final IActionHost via;
public MachineSource(final IActionHost v) {
this.via = v;
}
public MachineSource( final IActionHost v )
{
this.via = v;
}
@Override
public Optional<PlayerEntity> player() {
return Optional.empty();
}
@Override
public Optional<PlayerEntity> player()
{
return Optional.empty();
}
@Override
public Optional<IActionHost> machine() {
return Optional.of(this.via);
}
@Override
public Optional<IActionHost> machine()
{
return Optional.of( this.via );
}
@Override
public <T> Optional<T> context( Class<T> key )
{
return Optional.empty();
}
@Override
public <T> Optional<T> context(Class<T> key) {
return Optional.empty();
}
}
@@ -18,7 +18,6 @@
package appeng.me.helpers;
import java.util.Optional;
import com.google.common.base.Preconditions;
@@ -28,35 +27,29 @@ import net.minecraft.entity.player.PlayerEntity;
import appeng.api.networking.security.IActionHost;
import appeng.api.networking.security.IActionSource;
public class PlayerSource implements IActionSource {
public class PlayerSource implements IActionSource
{
private final PlayerEntity player;
private final IActionHost via;
private final PlayerEntity player;
private final IActionHost via;
public PlayerSource(final PlayerEntity p, final IActionHost v) {
Preconditions.checkNotNull(p);
this.player = p;
this.via = v;
}
public PlayerSource( final PlayerEntity p, final IActionHost v )
{
Preconditions.checkNotNull( p );
this.player = p;
this.via = v;
}
@Override
public Optional<PlayerEntity> player() {
return Optional.of(this.player);
}
@Override
public Optional<PlayerEntity> player()
{
return Optional.of( this.player );
}
@Override
public Optional<IActionHost> machine() {
return Optional.ofNullable(this.via);
}
@Override
public Optional<IActionHost> machine()
{
return Optional.ofNullable( this.via );
}
@Override
public <T> Optional<T> context( Class<T> key )
{
return Optional.empty();
}
@Override
public <T> Optional<T> context(Class<T> key) {
return Optional.empty();
}
}