dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renames, formatting

Browse Source
This commit is contained in:
raoulvdberge
2017-05-15 21:35:27 +02:00
parent 72676c5373
commit bd3ddee1bd
74 changed files with 364 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.storage.AccessType;
import com.raoulvdberge.refinedstorage.api.storage.IStorage;
import com.raoulvdberge.refinedstorage.api.storage.IStorageDisk;
@@ -138,7 +138,7 @@ public final class RSUtils {
return stack;
}
public static void writeItemStack(ByteBuf buf, ItemStack stack, @Nullable INetworkMaster network, boolean displayCraftText) {
public static void writeItemStack(ByteBuf buf, ItemStack stack, @Nullable INetwork network, boolean displayCraftText) {
writeItemStack(buf, stack);
buf.writeInt(API.instance().getItemStackHashCode(stack));

4
src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java
View File

@@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftin
import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry;
import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry;
import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeRegistry;
import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel;
@@ -85,7 +85,7 @@ public interface IRSAPI {
* @return a new reader writer channel
*/
@Nonnull
IReaderWriterChannel createReaderWriterChannel(String name, INetworkMaster network);
IReaderWriterChannel createReaderWriterChannel(String name, INetwork network);
/**
* @return an empty item stack list

12
src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/EventAutocraftingComplete.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.api.autocrafting;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.eventhandler.Event;
@@ -11,9 +11,9 @@ import net.minecraftforge.items.ItemHandlerHelper;
*/
public class EventAutocraftingComplete extends Event {
private ItemStack crafted;
private INetworkMaster network;
private INetwork network;
private EventAutocraftingComplete(INetworkMaster network, ItemStack crafted) {
private EventAutocraftingComplete(INetwork network, ItemStack crafted) {
this.crafted = crafted;
this.network = network;
}
@@ -22,15 +22,15 @@ public class EventAutocraftingComplete extends Event {
return crafted;
}
public INetworkMaster getNetwork() {
public INetwork getNetwork() {
return network;
}
public static void fire(INetworkMaster network, ItemStack crafted) {
public static void fire(INetwork network, ItemStack crafted) {
MinecraftForge.EVENT_BUS.post(new EventAutocraftingComplete(network, crafted));
}
public static void fire(INetworkMaster network, ItemStack crafted, int quantity) {
public static void fire(INetwork network, ItemStack crafted, int quantity) {
fire(network, ItemHandlerHelper.copyStackWithSize(crafted, quantity));
}
}

6
src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/registry/ICraftingTaskFactory.java
View File

@@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.api.autocrafting.registry;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChain;
import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -27,7 +27,7 @@ public interface ICraftingTaskFactory {
* @return the crafting task
*/
@Nonnull
ICraftingTask create(INetworkMaster network, @Nullable ItemStack stack, ICraftingPattern pattern, int quantity, boolean automated, @Nullable NBTTagCompound tag);
ICraftingTask create(INetwork network, @Nullable ItemStack stack, ICraftingPattern pattern, int quantity, boolean automated, @Nullable NBTTagCompound tag);
/**
* Returns a crafting task for a given NBT tag and pattern.
@@ -40,5 +40,5 @@ public interface ICraftingTaskFactory {
* @return the crafting task
*/
@Nonnull
ICraftingTask create(INetworkMaster network, @Nullable ItemStack stack, ICraftingPatternChain patternChain, int quantity, boolean automated);
ICraftingTask create(INetwork network, @Nullable ItemStack stack, ICraftingPatternChain patternChain, int quantity, boolean automated);
}

8
src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkMaster.java → src/main/java/com/raoulvdberge/refinedstorage/api/network/INetwork.java Executable file → Normal file
View File

@@ -18,9 +18,9 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
/**
* Represents a network master, usually is a controller.
* Represents a network, usually is a controller.
*/
public interface INetworkMaster {
public interface INetwork {
/**
* @return the energy usage per tick of this network
*/
@@ -120,7 +120,7 @@ public interface INetworkMaster {
/**
* Sends a crafting monitor update to all players that are watching a crafting monitor.
* <p>
* WARNING: In most cases, you should just use {@link INetworkMaster#markCraftingMonitorForUpdate()}, if not,
* WARNING: In most cases, you should just use {@link INetwork#markCraftingMonitorForUpdate()}, if not,
* you can get high bandwidth usage.
*/
void sendCraftingMonitorUpdate();
@@ -255,5 +255,5 @@ public interface INetworkMaster {
/**
* @return the world where this network is in
*/
World getNetworkWorld();
World world();
}

4
src/main/java/com/raoulvdberge/refinedstorage/api/network/item/INetworkItem.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.api.network.item;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
@@ -25,5 +25,5 @@ public interface INetworkItem {
* @param hand the hand
* @return true if the network item can be opened, false otherwise
*/
boolean onOpen(INetworkMaster network, EntityPlayer player, World controllerWorld, EnumHand hand);
boolean onOpen(INetwork network, EntityPlayer player, World controllerWorld, EnumHand hand);
}

8
src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNode.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.api.network.node;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.BlockPos;
@@ -32,14 +32,14 @@ public interface INetworkNode {
*
* @param network the network
*/
void onConnected(INetworkMaster network);
void onConnected(INetwork network);
/**
* Called when this node is disconnected from a network.
*
* @param network the network
*/
void onDisconnected(INetworkMaster network);
void onDisconnected(INetwork network);
/**
* If a node can be updated typically depends on the redstone configuration.
@@ -52,7 +52,7 @@ public interface INetworkNode {
* @return the network, or null if this node is not connected to any network
*/
@Nullable
INetworkMaster getNetwork();
INetwork getNetwork();
/**
* Updates a network node.

4
src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorageCache.java
View File

@@ -1,13 +1,13 @@
package com.raoulvdberge.refinedstorage.api.storage;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
import javax.annotation.Nonnull;
import java.util.List;
/**
* This holds all stacks from all the connected storages from a {@link INetworkMaster}.
* This holds all stacks from all the connected storages from a {@link INetwork}.
* <p>
* Refined Storage uses this class mainly for use in Grids and Detectors to avoid querying
* individual {@link IStorage}s constantly (performance impact) and to send and detect storage changes

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java
View File

@@ -6,7 +6,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftin
import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry;
import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry;
import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy;
@@ -145,7 +145,7 @@ public class API implements IRSAPI {
@Nonnull
@Override
public IReaderWriterChannel createReaderWriterChannel(String name, INetworkMaster network) {
public IReaderWriterChannel createReaderWriterChannel(String name, INetwork network) {
return new ReaderWriterChannel(name, network);
}

8
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java
View File

@@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.*;
import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskFactory;
import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingStep;
import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
@@ -280,16 +280,16 @@ public class CraftingManager implements ICraftingManager {
craftingTasks.forEach(t -> t.getMissing().clear());
}
private static ICraftingTask readCraftingTask(INetworkMaster network, NBTTagCompound tag) {
private static ICraftingTask readCraftingTask(INetwork network, NBTTagCompound tag) {
ItemStack stack = new ItemStack(tag.getCompoundTag(ICraftingTask.NBT_PATTERN_STACK));
if (!stack.isEmpty() && stack.getItem() instanceof ICraftingPatternProvider) {
TileEntity container = network.getNetworkWorld().getTileEntity(BlockPos.fromLong(tag.getLong(ICraftingTask.NBT_PATTERN_CONTAINER)));
TileEntity container = network.world().getTileEntity(BlockPos.fromLong(tag.getLong(ICraftingTask.NBT_PATTERN_CONTAINER)));
if (container instanceof INetworkNodeProxy) {
INetworkNodeProxy proxy = (INetworkNodeProxy) container;
if (proxy.getNode() instanceof ICraftingPatternContainer) {
ICraftingPattern pattern = ((ICraftingPatternProvider) stack.getItem()).create(network.getNetworkWorld(), stack, (ICraftingPatternContainer) proxy.getNode());
ICraftingPattern pattern = ((ICraftingPatternProvider) stack.getItem()).create(network.world(), stack, (ICraftingPatternContainer) proxy.getNode());
ICraftingTaskFactory factory = API.instance().getCraftingTaskRegistry().get(tag.getString(ICraftingTask.NBT_PATTERN_ID));
if (factory != null) {

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java
View File

@@ -6,7 +6,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChain;
import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskFactory;
import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingStep;
import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingStep;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingTask;
@@ -28,7 +28,7 @@ public class CraftingTaskFactory implements ICraftingTaskFactory {
@Override
@Nonnull
public ICraftingTask create(INetworkMaster network, @Nullable ItemStack stack, ICraftingPattern pattern, int quantity, boolean automated, @Nullable NBTTagCompound tag) {
public ICraftingTask create(INetwork network, @Nullable ItemStack stack, ICraftingPattern pattern, int quantity, boolean automated, @Nullable NBTTagCompound tag) {
if (tag != null) {
NBTTagList stepsList = tag.getTagList(CraftingTask.NBT_STEPS, Constants.NBT.TAG_COMPOUND);
@@ -78,7 +78,7 @@ public class CraftingTaskFactory implements ICraftingTaskFactory {
@Nonnull
@Override
public ICraftingTask create(INetworkMaster network, @Nullable ItemStack stack, ICraftingPatternChain patternChain, int quantity, boolean automated) {
public ICraftingTask create(INetwork network, @Nullable ItemStack stack, ICraftingPatternChain patternChain, int quantity, boolean automated) {
return new CraftingTask(network, stack, patternChain, quantity, automated);
}
}

14
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStep.java
View File

@@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternProvider;
import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingStep;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
@@ -30,20 +30,20 @@ public abstract class CraftingStep implements ICraftingStep {
private static final String NBT_STARTED_PROCESSING = "StartedProcessing";
private static final String NBT_PRELIMINARY_STEPS = "PreliminarySteps";
protected INetworkMaster network;
protected INetwork network;
protected ICraftingPattern pattern;
protected Map<Integer, Integer> satisfied;
protected boolean startedProcessing;
protected List<ICraftingStep> preliminarySteps;
public CraftingStep(INetworkMaster network, ICraftingPattern pattern, List<ICraftingStep> preliminarySteps) {
public CraftingStep(INetwork network, ICraftingPattern pattern, List<ICraftingStep> preliminarySteps) {
this.network = network;
this.pattern = pattern;
this.satisfied = new HashMap<>(getPattern().getOutputs().size());
this.preliminarySteps = new ArrayList<>(preliminarySteps);
}
public CraftingStep(INetworkMaster network) {
public CraftingStep(INetwork network) {
this.network = network;
}
@@ -51,12 +51,12 @@ public abstract class CraftingStep implements ICraftingStep {
ItemStack patternStack = new ItemStack(tag.getCompoundTag(NBT_PATTERN));
if (!patternStack.isEmpty()) {
TileEntity container = network.getNetworkWorld().getTileEntity(BlockPos.fromLong(tag.getLong(NBT_PATTERN_CONTAINER)));
TileEntity container = network.world().getTileEntity(BlockPos.fromLong(tag.getLong(NBT_PATTERN_CONTAINER)));
if (container instanceof INetworkNodeProxy) {
INetworkNodeProxy proxy = (INetworkNodeProxy) container;
if (proxy.getNode() instanceof ICraftingPatternContainer) {
this.pattern = ((ICraftingPatternProvider) patternStack.getItem()).create(network.getNetworkWorld(), patternStack, (ICraftingPatternContainer) proxy.getNode());
this.pattern = ((ICraftingPatternProvider) patternStack.getItem()).create(network.world(), patternStack, (ICraftingPatternContainer) proxy.getNode());
this.satisfied = new HashMap<>(pattern.getOutputs().size());
for (ItemStack stack : pattern.getOutputs()) {
@@ -257,7 +257,7 @@ public abstract class CraftingStep implements ICraftingStep {
return true;
}
public static ICraftingStep toCraftingStep(NBTTagCompound compound, INetworkMaster network) {
public static ICraftingStep toCraftingStep(NBTTagCompound compound, INetwork network) {
CraftingStep step = null;
switch (compound.getString(CraftingStep.NBT_CRAFTING_STEP_TYPE)) {

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java
View File

@@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingStep;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
import com.raoulvdberge.refinedstorage.apiimpl.API;
@@ -22,13 +22,13 @@ public class CraftingStepCraft extends CraftingStep {
private List<ItemStack> toInsert;
public CraftingStepCraft(INetworkMaster network, ICraftingPattern pattern, List<ItemStack> toInsert, List<ICraftingStep> preliminarySteps) {
public CraftingStepCraft(INetwork network, ICraftingPattern pattern, List<ItemStack> toInsert, List<ICraftingStep> preliminarySteps) {
super(network, pattern, preliminarySteps);
this.toInsert = new LinkedList<>();
toInsert.forEach(stack -> this.toInsert.add(stack == null ? null : stack.copy()));
}
public CraftingStepCraft(INetworkMaster network) {
public CraftingStepCraft(INetwork network) {
super(network);
}

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepProcess.java
View File

@@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingStep;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
import net.minecraft.item.ItemStack;
@@ -21,11 +21,11 @@ import java.util.stream.IntStream;
public class CraftingStepProcess extends CraftingStep {
public static final String ID = "process";
public CraftingStepProcess(INetworkMaster network, ICraftingPattern pattern, List<ICraftingStep> preliminarySteps) {
public CraftingStepProcess(INetwork network, ICraftingPattern pattern, List<ICraftingStep> preliminarySteps) {
super(network, pattern, preliminarySteps);
}
public CraftingStepProcess(INetworkMaster network) {
public CraftingStepProcess(INetwork network) {
super(network);
}

10
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java
View File

@@ -9,7 +9,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftin
import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement;
import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingStep;
import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
import com.raoulvdberge.refinedstorage.apiimpl.API;
@@ -39,7 +39,7 @@ public class CraftingTask implements ICraftingTask {
public static final String NBT_TO_INSERT_ITEMS = "ToInsertItems";
public static final String NBT_TO_INSERT_FLUIDS = "ToInsertFluids";
private INetworkMaster network;
private INetwork network;
@Nullable
private ItemStack requested;
private ICraftingPattern pattern;
@@ -56,7 +56,7 @@ public class CraftingTask implements ICraftingTask {
private Deque<FluidStack> toInsertFluids = new ArrayDeque<>();
private IStackList<FluidStack> toTakeFluids = API.instance().createFluidStackList();
public CraftingTask(INetworkMaster network, @Nullable ItemStack requested, ICraftingPattern pattern, int quantity, boolean automated) {
public CraftingTask(INetwork network, @Nullable ItemStack requested, ICraftingPattern pattern, int quantity, boolean automated) {
this.network = network;
this.requested = requested;
this.pattern = pattern;
@@ -64,13 +64,13 @@ public class CraftingTask implements ICraftingTask {
this.automated = automated;
}
public CraftingTask(INetworkMaster network, @Nullable ItemStack requested, ICraftingPatternChain chain, int quantity, boolean automated) {
public CraftingTask(INetwork network, @Nullable ItemStack requested, ICraftingPatternChain chain, int quantity, boolean automated) {
this(network, requested, chain.getPrototype(), quantity, automated);
this.chain = chain;
}
public CraftingTask(INetworkMaster network, @Nullable ItemStack requested, ICraftingPattern pattern, int quantity, List<ICraftingStep> mainSteps, Deque<ItemStack> toInsertItems, IStackList<FluidStack> toTakeFluids, Deque<FluidStack> toInsertFluids, boolean automated) {
public CraftingTask(INetwork network, @Nullable ItemStack requested, ICraftingPattern pattern, int quantity, List<ICraftingStep> mainSteps, Deque<ItemStack> toInsertItems, IStackList<FluidStack> toTakeFluids, Deque<FluidStack> toInsertFluids, boolean automated) {
this(network, requested, pattern, quantity, automated);
this.mainSteps = mainSteps;

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/FluidGridHandler.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.apiimpl.network.grid;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.grid.IFluidGridHandler;
import com.raoulvdberge.refinedstorage.api.network.security.Permission;
import com.raoulvdberge.refinedstorage.apiimpl.API;
@@ -17,9 +17,9 @@ import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nullable;
public class FluidGridHandler implements IFluidGridHandler {
private INetworkMaster network;
private INetwork network;
public FluidGridHandler(INetworkMaster network) {
public FluidGridHandler(INetwork network) {
this.network = network;
}

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/ItemGridHandler.java
View File

@@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingManager;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler;
import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem;
import com.raoulvdberge.refinedstorage.api.network.security.Permission;
@@ -24,9 +24,9 @@ import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
public class ItemGridHandler implements IItemGridHandler {
private INetworkMaster network;
private INetwork network;
public ItemGridHandler(INetworkMaster network) {
public ItemGridHandler(INetwork network) {
this.network = network;
}

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemHandler.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.apiimpl.network.item;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.IWirelessTransmitter;
import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem;
import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemHandler;
@@ -16,12 +16,12 @@ import java.util.Iterator;
import java.util.List;
public class NetworkItemHandler implements INetworkItemHandler {
private INetworkMaster network;
private INetwork network;
private List<INetworkItem> items = new ArrayList<>();
private List<INetworkItem> itemsToRemove = new ArrayList<>();
public NetworkItemHandler(INetworkMaster network) {
public NetworkItemHandler(INetwork network) {
this.network = network;
}

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemWirelessCraftingMonitor.java
View File

@@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.item;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSGui;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem;
import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemHandler;
import com.raoulvdberge.refinedstorage.api.network.security.Permission;
@@ -33,7 +33,7 @@ public class NetworkItemWirelessCraftingMonitor implements INetworkItem {
}
@Override
public boolean onOpen(INetworkMaster network, EntityPlayer player, World controllerWorld, EnumHand hand) {
public boolean onOpen(INetwork network, EntityPlayer player, World controllerWorld, EnumHand hand) {
if (RS.INSTANCE.config.wirelessCraftingMonitorUsesEnergy && stack.getItemDamage() != ItemWirelessCraftingMonitor.TYPE_CREATIVE && stack.getCapability(CapabilityEnergy.ENERGY, null).getEnergyStored() <= RS.INSTANCE.config.wirelessCraftingMonitorOpenUsage) {
return false;
}

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemWirelessFluidGrid.java
View File

@@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.item;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSGui;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem;
import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemHandler;
import com.raoulvdberge.refinedstorage.api.network.security.Permission;
@@ -34,7 +34,7 @@ public class NetworkItemWirelessFluidGrid implements INetworkItem {
}
@Override
public boolean onOpen(INetworkMaster network, EntityPlayer player, World controllerWorld, EnumHand hand) {
public boolean onOpen(INetwork network, EntityPlayer player, World controllerWorld, EnumHand hand) {
if (RS.INSTANCE.config.wirelessFluidGridUsesEnergy && stack.getItemDamage() != ItemWirelessFluidGrid.TYPE_CREATIVE && stack.getCapability(CapabilityEnergy.ENERGY, null).getEnergyStored() <= RS.INSTANCE.config.wirelessFluidGridOpenUsage) {
return false;
}

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemWirelessGrid.java
View File

@@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.item;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSGui;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem;
import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemHandler;
import com.raoulvdberge.refinedstorage.api.network.security.Permission;
@@ -34,7 +34,7 @@ public class NetworkItemWirelessGrid implements INetworkItem {
}
@Override
public boolean onOpen(INetworkMaster network, EntityPlayer player, World controllerWorld, EnumHand hand) {
public boolean onOpen(INetwork network, EntityPlayer player, World controllerWorld, EnumHand hand) {
if (RS.INSTANCE.config.wirelessGridUsesEnergy && stack.getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE && stack.getCapability(CapabilityEnergy.ENERGY, null).getEnergyStored() <= RS.INSTANCE.config.wirelessGridOpenUsage) {
return false;
}

8
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/IGuiReaderWriter.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.apiimpl.network.node;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
public interface IGuiReaderWriter {
@@ -14,12 +14,12 @@ public interface IGuiReaderWriter {
TileDataParameter<Integer> getRedstoneModeParameter();
INetworkMaster getNetwork();
INetwork getNetwork();
boolean canUpdate();
default void onAdd(String name) {
INetworkMaster network = getNetwork();
INetwork network = getNetwork();
if (network != null && !name.isEmpty()) {
network.addReaderWriterChannel(name);
@@ -27,7 +27,7 @@ public interface IGuiReaderWriter {
}
default void onRemove(String name) {
INetworkMaster network = getNetwork();
INetwork network = getNetwork();
if (network != null && !name.isEmpty()) {
network.removeReaderWriterChannel(name);

49
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
View File

@@ -1,11 +1,12 @@
package com.raoulvdberge.refinedstorage.apiimpl.network.node;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.INetworkNeighborhoodAware;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
import com.raoulvdberge.refinedstorage.api.util.IWrenchable;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.Item;
@@ -22,16 +23,16 @@ import javax.annotation.Nullable;
public abstract class NetworkNode implements INetworkNode, INetworkNeighborhoodAware, IWrenchable {
@Nullable
protected INetworkMaster network;
protected INetworkNodeHolder holder;
protected INetwork network;
protected INetworkNodeContainer container;
protected int ticks;
protected RedstoneMode redstoneMode = RedstoneMode.IGNORE;
private boolean couldUpdate;
private boolean active;
public NetworkNode(INetworkNodeHolder holder) {
this.holder = holder;
public NetworkNode(INetworkNodeContainer container) {
this.container = container;
}
public RedstoneMode getRedstoneMode() {
@@ -45,52 +46,50 @@ public abstract class NetworkNode implements INetworkNode, INetworkNeighborhoodA
}
@Nullable
public INetworkNodeHolder getHolder() {
return holder;
public INetworkNodeContainer getContainer() {
return container;
}
public void setHolder(INetworkNodeHolder holder) {
this.holder = holder;
public void setContainer(INetworkNodeContainer container) {
this.container = container;
}
@Nonnull
@Override
public ItemStack getItemStack() {
IBlockState state = holder.world().getBlockState(holder.pos());
IBlockState state = container.world().getBlockState(container.pos());
Item item = Item.getItemFromBlock(state.getBlock());
return new ItemStack(item, 1, state.getBlock().getMetaFromState(state));
return new ItemStack(Item.getItemFromBlock(state.getBlock()), 1, state.getBlock().getMetaFromState(state));
}
@Override
public void onConnected(INetworkMaster network) {
public void onConnected(INetwork network) {
onConnectedStateChange(network, true);
this.network = network;
}
@Override
public void onDisconnected(INetworkMaster network) {
public void onDisconnected(INetwork network) {
this.network = null;
onConnectedStateChange(network, false);
}
protected void onConnectedStateChange(INetworkMaster network, boolean state) {
protected void onConnectedStateChange(INetwork network, boolean state) {
// NO OP
}
@Override
public void markDirty() {
if (holder.world() != null && !holder.world().isRemote) {
API.instance().getNetworkNodeManager(holder.world()).markForSaving();
if (container.world() != null && !container.world().isRemote) {
API.instance().getNetworkNodeManager(container.world()).markForSaving();
}
}
@Override
public boolean canUpdate() {
return redstoneMode.isEnabled(holder.world(), holder.pos());
return redstoneMode.isEnabled(container.world(), container.pos());
}
@Override
@@ -103,7 +102,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNeighborhoodA
couldUpdate = canUpdate;
if (hasConnectivityState()) {
RSUtils.updateBlock(holder.world(), holder.pos());
RSUtils.updateBlock(container.world(), container.pos());
}
if (network != null) {
@@ -141,18 +140,18 @@ public abstract class NetworkNode implements INetworkNode, INetworkNeighborhoodA
@Nullable
@Override
public INetworkMaster getNetwork() {
public INetwork getNetwork() {
return network;
}
@Override
public BlockPos getPos() {
return holder.pos();
return container.pos();
}
@Override
public World getWorld() {
return holder.world();
return container.world();
}
public boolean canConduct(@Nullable EnumFacing direction) {
@@ -163,13 +162,13 @@ public abstract class NetworkNode implements INetworkNode, INetworkNeighborhoodA
public void walkNeighborhood(Operator operator) {
for (EnumFacing facing : EnumFacing.VALUES) {
if (canConduct(facing)) {
operator.apply(holder.world(), holder.pos().offset(facing), facing.getOpposite());
operator.apply(container.world(), container.pos().offset(facing), facing.getOpposite());
}
}
}
public TileEntity getFacingTile() {
return holder.world().getTileEntity(holder.pos().offset(holder.getDirection()));
return container.world().getTileEntity(container.pos().offset(container.getDirection()));
}
@Nullable

9
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCable.java
View File

@@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.block.BlockCable;
import com.raoulvdberge.refinedstorage.integration.mcmp.IntegrationMCMP;
import com.raoulvdberge.refinedstorage.integration.mcmp.RSMCMPAddon;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import net.minecraft.util.EnumFacing;
import javax.annotation.Nullable;
@@ -12,8 +13,8 @@ import java.util.Collections;
public class NetworkNodeCable extends NetworkNode {
public static final String ID = "cable";
public NetworkNodeCable(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeCable(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -29,8 +30,8 @@ public class NetworkNodeCable extends NetworkNode {
@Override
public boolean canConduct(@Nullable EnumFacing direction) {
if (IntegrationMCMP.isLoaded() && direction != null) {
return RSMCMPAddon.hasConnectionWith(holder.world().getTileEntity(holder.pos()), Collections.singletonList(BlockCable.getCableExtensionAABB(direction)))
&& RSMCMPAddon.hasConnectionWith(holder.world().getTileEntity(holder.pos().offset(direction)), Collections.singletonList(BlockCable.getCableExtensionAABB(direction.getOpposite())));
return RSMCMPAddon.hasConnectionWith(container.world().getTileEntity(container.pos()), Collections.singletonList(BlockCable.getCableExtensionAABB(direction)))
&& RSMCMPAddon.hasConnectionWith(container.world().getTileEntity(container.pos().offset(direction)), Collections.singletonList(BlockCable.getCableExtensionAABB(direction.getOpposite())));
}
return true;

53
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java
View File

@@ -10,6 +10,7 @@ import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.TileConstructor;
import com.raoulvdberge.refinedstorage.tile.config.IComparable;
import com.raoulvdberge.refinedstorage.tile.config.IType;
@@ -56,7 +57,7 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
super.onContentsChanged(slot);
item = getStackInSlot(slot).isEmpty() ? null : getStackInSlot(slot).copy();
block = SlotFilter.getBlockState(holder.world(), holder.pos().offset(holder.getDirection()), getStackInSlot(slot));
block = SlotFilter.getBlockState(container.world(), container.pos().offset(container.getDirection()), getStackInSlot(slot));
}
};
@@ -71,8 +72,8 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
private IBlockState block;
private ItemStack item;
public NetworkNodeConstructor(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeConstructor(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -97,7 +98,7 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
ItemStack took = network.extractItem(item, 1, false);
if (took != null) {
holder.world().spawnEntity(new EntityFireworkRocket(holder.world(), getDispensePositionX(), getDispensePositionY(), getDispensePositionZ(), took));
container.world().spawnEntity(new EntityFireworkRocket(container.world(), getDispensePositionX(), getDispensePositionY(), getDispensePositionZ(), took));
}
} else {
dropItem();
@@ -107,11 +108,11 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
FluidStack stack = fluidFilters.getFluidStackInSlot(0);
if (stack != null && stack.getFluid().canBePlacedInWorld()) {
BlockPos front = holder.pos().offset(holder.getDirection());
BlockPos front = container.pos().offset(container.getDirection());
Block block = stack.getFluid().getBlock();
if (holder.world().isAirBlock(front) && block.canPlaceBlockAt(holder.world(), front)) {
if (container.world().isAirBlock(front) && block.canPlaceBlockAt(container.world(), front)) {
FluidStack stored = network.getFluidStorageCache().getList().get(stack, compare);
if (stored != null && stored.amount >= Fluid.BUCKET_VOLUME) {
@@ -130,7 +131,7 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
return;
}
holder.world().setBlockState(front, state, 1 | 2);
container.world().setBlockState(front, state, 1 | 2);
}
}
}
@@ -140,19 +141,19 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
}
private boolean canPlace(BlockPos pos, IBlockState state) {
BlockEvent.PlaceEvent e = new BlockEvent.PlaceEvent(new BlockSnapshot(holder.world(), pos, state), holder.world().getBlockState(holder.pos()), FakePlayerFactory.getMinecraft((WorldServer) holder.world()), EnumHand.MAIN_HAND);
BlockEvent.PlaceEvent e = new BlockEvent.PlaceEvent(new BlockSnapshot(container.world(), pos, state), container.world().getBlockState(container.pos()), FakePlayerFactory.getMinecraft((WorldServer) container.world()), EnumHand.MAIN_HAND);
return !MinecraftForge.EVENT_BUS.post(e);
}
private void placeBlock() {
BlockPos front = holder.pos().offset(holder.getDirection());
BlockPos front = container.pos().offset(container.getDirection());
if (holder.world().isAirBlock(front) && block.getBlock().canPlaceBlockAt(holder.world(), front)) {
if (container.world().isAirBlock(front) && block.getBlock().canPlaceBlockAt(container.world(), front)) {
ItemStack took = network.extractItem(itemFilters.getStackInSlot(0), 1, compare, true);
if (took != null) {
IBlockState state = block.getBlock().getStateForPlacement(holder.world(), front, holder.getDirection(), 0.5F, 0.5F, 0.5F, took.getMetadata(), FakePlayerFactory.getMinecraft((WorldServer) holder.world()), EnumHand.MAIN_HAND);
IBlockState state = block.getBlock().getStateForPlacement(container.world(), front, container.getDirection(), 0.5F, 0.5F, 0.5F, took.getMetadata(), FakePlayerFactory.getMinecraft((WorldServer) container.world()), EnumHand.MAIN_HAND);
if (!canPlace(front, state)) {
return;
@@ -163,29 +164,29 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
if (item.getItem() instanceof ItemBlock) {
((ItemBlock) item.getItem()).placeBlockAt(
took,
FakePlayerFactory.getMinecraft((WorldServer) holder.world()),
holder.world(),
FakePlayerFactory.getMinecraft((WorldServer) container.world()),
container.world(),
front,
holder.getDirection(),
container.getDirection(),
0,
0,
0,
state
);
} else {
holder.world().setBlockState(front, state, 1 | 2);
container.world().setBlockState(front, state, 1 | 2);
state.getBlock().onBlockPlacedBy(holder.world(), front, state, FakePlayerFactory.getMinecraft((WorldServer) holder.world()), took);
state.getBlock().onBlockPlacedBy(container.world(), front, state, FakePlayerFactory.getMinecraft((WorldServer) container.world()), took);
}
// From ItemBlock#onItemUse
SoundType blockSound = block.getBlock().getSoundType(state, holder.world(), holder.pos(), null);
holder.world().playSound(null, front, blockSound.getPlaceSound(), SoundCategory.BLOCKS, (blockSound.getVolume() + 1.0F) / 2.0F, blockSound.getPitch() * 0.8F);
SoundType blockSound = block.getBlock().getSoundType(state, container.world(), container.pos(), null);
container.world().playSound(null, front, blockSound.getPlaceSound(), SoundCategory.BLOCKS, (blockSound.getVolume() + 1.0F) / 2.0F, blockSound.getPitch() * 0.8F);
if (block.getBlock() == Blocks.SKULL) {
holder.world().setBlockState(front, holder.world().getBlockState(front).withProperty(BlockSkull.FACING, holder.getDirection()));
container.world().setBlockState(front, container.world().getBlockState(front).withProperty(BlockSkull.FACING, container.getDirection()));
TileEntity tile = holder.world().getTileEntity(front);
TileEntity tile = container.world().getTileEntity(front);
if (tile instanceof TileEntitySkull) {
TileEntitySkull skullTile = (TileEntitySkull) tile;
@@ -208,7 +209,7 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
skullTile.setType(item.getMetadata());
}
Blocks.SKULL.checkWitherSpawn(holder.world(), front, skullTile);
Blocks.SKULL.checkWitherSpawn(container.world(), front, skullTile);
}
}
@@ -224,7 +225,7 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
ItemStack took = network.extractItem(item, upgrades.getItemInteractCount(), false);
if (took != null) {
BehaviorDefaultDispenseItem.doDispense(holder.world(), took, 6, holder.getDirection(), new PositionImpl(getDispensePositionX(), getDispensePositionY(), getDispensePositionZ()));
BehaviorDefaultDispenseItem.doDispense(container.world(), took, 6, container.getDirection(), new PositionImpl(getDispensePositionX(), getDispensePositionY(), getDispensePositionZ()));
} else if (upgrades.hasUpgrade(ItemUpgrade.TYPE_CRAFTING)) {
ItemStack craft = itemFilters.getStackInSlot(0);
@@ -234,17 +235,17 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
// From BlockDispenser#getDispensePosition
private double getDispensePositionX() {
return (double) holder.pos().getX() + 0.5D + 0.8D * (double) holder.getDirection().getFrontOffsetX();
return (double) container.pos().getX() + 0.5D + 0.8D * (double) container.getDirection().getFrontOffsetX();
}
// From BlockDispenser#getDispensePosition
private double getDispensePositionY() {
return (double) holder.pos().getY() + (holder.getDirection() == EnumFacing.DOWN ? 0.45D : 0.5D) + 0.8D * (double) holder.getDirection().getFrontOffsetY();
return (double) container.pos().getY() + (container.getDirection() == EnumFacing.DOWN ? 0.45D : 0.5D) + 0.8D * (double) container.getDirection().getFrontOffsetY();
}
// From BlockDispenser#getDispensePosition
private double getDispensePositionZ() {
return (double) holder.pos().getZ() + 0.5D + 0.8D * (double) holder.getDirection().getFrontOffsetZ();
return (double) container.pos().getZ() + 0.5D + 0.8D * (double) container.getDirection().getFrontOffsetZ();
}
@Override
@@ -338,7 +339,7 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
@Override
public int getType() {
return holder.world().isRemote ? TileConstructor.TYPE.getValue() : type;
return container.world().isRemote ? TileConstructor.TYPE.getValue() : type;
}
@Override

25
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java
View File

@@ -5,12 +5,13 @@ import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternProvider;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.BlockPos;
@@ -29,8 +30,8 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
private ItemHandlerBase patterns = new ItemHandlerBase(9, new ItemHandlerListenerNetworkNode(this), s -> {
// We can only validate the crafting pattern if the world exists.
// If the world doesn't exist, this is probably called while reading and in that case it doesn't matter.
if (holder.world() != null) {
return s.getItem() instanceof ICraftingPatternProvider && ((ICraftingPatternProvider) s.getItem()).create(holder.world(), s, this).isValid();
if (container.world() != null) {
return s.getItem() instanceof ICraftingPatternProvider && ((ICraftingPatternProvider) s.getItem()).create(container.world(), s, this).isValid();
}
return true;
@@ -39,7 +40,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
protected void onContentsChanged(int slot) {
super.onContentsChanged(slot);
if (holder.world() != null && !holder.world().isRemote) {
if (container.world() != null && !container.world().isRemote) {
rebuildPatterns();
}
@@ -56,8 +57,8 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
private boolean triggeredAutocrafting = false;
private boolean blocked = false;
public NetworkNodeCrafter(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeCrafter(INetworkNodeContainer container) {
super(container);
}
private void rebuildPatterns() {
@@ -67,7 +68,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
ItemStack patternStack = patterns.getStackInSlot(i);
if (!patternStack.isEmpty()) {
ICraftingPattern pattern = ((ICraftingPatternProvider) patternStack.getItem()).create(holder.world(), patternStack, this);
ICraftingPattern pattern = ((ICraftingPatternProvider) patternStack.getItem()).create(container.world(), patternStack, this);
if (pattern.isValid()) {
actualPatterns.add(pattern);
@@ -97,7 +98,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
rebuildPatterns();
}
if (network != null && triggeredAutocrafting && holder.world().isBlockPowered(holder.pos())) {
if (network != null && triggeredAutocrafting && container.world().isBlockPowered(container.pos())) {
for (ICraftingPattern pattern : actualPatterns) {
for (ItemStack output : pattern.getOutputs()) {
network.getCraftingManager().schedule(output, 1, IComparer.COMPARE_DAMAGE | IComparer.COMPARE_NBT);
@@ -107,12 +108,12 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
}
@Override
protected void onConnectedStateChange(INetworkMaster network, boolean state) {
protected void onConnectedStateChange(INetwork network, boolean state) {
super.onConnectedStateChange(network, state);
if (!state) {
network.getCraftingManager().getTasks().stream()
.filter(task -> task.getPattern().getContainer().getPosition().equals(holder.pos()))
.filter(task -> task.getPattern().getContainer().getPosition().equals(container.pos()))
.forEach(task -> network.getCraftingManager().cancel(task));
}
@@ -173,7 +174,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
@Override
public IItemHandler getFacingInventory() {
return RSUtils.getItemHandler(getFacingTile(), holder.getDirection().getOpposite());
return RSUtils.getItemHandler(getFacingTile(), container.getDirection().getOpposite());
}
@Override
@@ -183,7 +184,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
@Override
public BlockPos getPosition() {
return holder.pos();
return container.pos();
}
public IItemHandler getPatternItems() {

7
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCraftingMonitor.java
View File

@@ -6,6 +6,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFilter;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.item.filter.Filter;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.craftingmonitor.ICraftingMonitor;
import com.raoulvdberge.refinedstorage.tile.craftingmonitor.TileCraftingMonitor;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
@@ -37,8 +38,8 @@ public class NetworkNodeCraftingMonitor extends NetworkNode implements ICrafting
}
});
public NetworkNodeCraftingMonitor(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeCraftingMonitor(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -119,7 +120,7 @@ public class NetworkNodeCraftingMonitor extends NetworkNode implements ICrafting
@Override
public boolean canViewAutomated() {
return holder.world().isRemote ? TileCraftingMonitor.VIEW_AUTOMATED.getValue() : viewAutomated;
return container.world().isRemote ? TileCraftingMonitor.VIEW_AUTOMATED.getValue() : viewAutomated;
}
@Override

37
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java
View File

@@ -8,6 +8,7 @@ import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.TileDestructor;
import com.raoulvdberge.refinedstorage.tile.config.IComparable;
import com.raoulvdberge.refinedstorage.tile.config.IFilterable;
@@ -59,8 +60,8 @@ public class NetworkNodeDestructor extends NetworkNode implements IComparable, I
private int type = IType.ITEMS;
private boolean pickupItem = false;
public NetworkNodeDestructor(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeDestructor(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -73,12 +74,12 @@ public class NetworkNodeDestructor extends NetworkNode implements IComparable, I
super.update();
if (network != null && canUpdate() && ticks % upgrades.getSpeed(BASE_SPEED, 4) == 0) {
BlockPos front = holder.pos().offset(holder.getDirection());
BlockPos front = container.pos().offset(container.getDirection());
if (pickupItem && type == IType.ITEMS) {
List<Entity> droppedItems = new ArrayList<>();
Chunk chunk = holder.world().getChunkFromBlockCoords(front);
Chunk chunk = container.world().getChunkFromBlockCoords(front);
chunk.getEntitiesWithinAABBForEntity(null, new AxisAlignedBB(front), droppedItems, null);
for (Entity entity : droppedItems) {
@@ -88,25 +89,25 @@ public class NetworkNodeDestructor extends NetworkNode implements IComparable, I
if (IFilterable.canTake(itemFilters, mode, compare, droppedItem) && network.insertItem(droppedItem, droppedItem.getCount(), true) == null) {
network.insertItemTracked(droppedItem.copy(), droppedItem.getCount());
holder.world().removeEntity(entity);
container.world().removeEntity(entity);
break;
}
}
}
} else if (type == IType.ITEMS) {
IBlockState frontBlockState = holder.world().getBlockState(front);
IBlockState frontBlockState = container.world().getBlockState(front);
Block frontBlock = frontBlockState.getBlock();
ItemStack frontStack = frontBlock.getPickBlock(frontBlockState, null, holder.world(), front, null);
ItemStack frontStack = frontBlock.getPickBlock(frontBlockState, null, container.world(), front, null);
if (!frontStack.isEmpty()) {
if (IFilterable.canTake(itemFilters, mode, compare, frontStack) && frontBlockState.getBlockHardness(holder.world(), front) != -1.0) {
if (IFilterable.canTake(itemFilters, mode, compare, frontStack) && frontBlockState.getBlockHardness(container.world(), front) != -1.0) {
List<ItemStack> drops;
if (upgrades.hasUpgrade(ItemUpgrade.TYPE_SILK_TOUCH) && frontBlock.canSilkHarvest(holder.world(), front, frontBlockState, null)) {
if (upgrades.hasUpgrade(ItemUpgrade.TYPE_SILK_TOUCH) && frontBlock.canSilkHarvest(container.world(), front, frontBlockState, null)) {
drops = Collections.singletonList(frontStack);
} else {
drops = frontBlock.getDrops(holder.world(), front, frontBlockState, upgrades.getFortuneLevel());
drops = frontBlock.getDrops(container.world(), front, frontBlockState, upgrades.getFortuneLevel());
}
for (ItemStack drop : drops) {
@@ -115,17 +116,17 @@ public class NetworkNodeDestructor extends NetworkNode implements IComparable, I
}
}
BlockEvent.BreakEvent e = new BlockEvent.BreakEvent(holder.world(), front, frontBlockState, FakePlayerFactory.getMinecraft((WorldServer) holder.world()));
BlockEvent.BreakEvent e = new BlockEvent.BreakEvent(container.world(), front, frontBlockState, FakePlayerFactory.getMinecraft((WorldServer) container.world()));
if (!MinecraftForge.EVENT_BUS.post(e)) {
holder.world().playEvent(null, 2001, front, Block.getStateId(frontBlockState));
holder.world().setBlockToAir(front);
container.world().playEvent(null, 2001, front, Block.getStateId(frontBlockState));
container.world().setBlockToAir(front);
for (ItemStack drop : drops) {
// We check if the controller isn't null here because when a destructor faces a node and removes it
// it will essentially remove this block itself from the network without knowing
if (network == null) {
InventoryHelper.spawnItemStack(holder.world(), front.getX(), front.getY(), front.getZ(), drop);
InventoryHelper.spawnItemStack(container.world(), front.getX(), front.getY(), front.getZ(), drop);
} else {
network.insertItemTracked(drop, drop.getCount());
}
@@ -134,14 +135,14 @@ public class NetworkNodeDestructor extends NetworkNode implements IComparable, I
}
}
} else if (type == IType.FLUIDS) {
Block frontBlock = holder.world().getBlockState(front).getBlock();
Block frontBlock = container.world().getBlockState(front).getBlock();
IFluidHandler handler = null;
if (frontBlock instanceof BlockLiquid) {
handler = new BlockLiquidWrapper((BlockLiquid) frontBlock, holder.world(), front);
handler = new BlockLiquidWrapper((BlockLiquid) frontBlock, container.world(), front);
} else if (frontBlock instanceof IFluidBlock) {
handler = new FluidBlockWrapper((IFluidBlock) frontBlock, holder.world(), front);
handler = new FluidBlockWrapper((IFluidBlock) frontBlock, container.world(), front);
}
if (handler != null) {
@@ -261,7 +262,7 @@ public class NetworkNodeDestructor extends NetworkNode implements IComparable, I
@Override
public int getType() {
return holder.world().isRemote ? TileDestructor.TYPE.getValue() : type;
return container.world().isRemote ? TileDestructor.TYPE.getValue() : type;
}
@Override

15
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java
View File

@@ -4,12 +4,13 @@ import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.TileDetector;
import com.raoulvdberge.refinedstorage.tile.config.IComparable;
import com.raoulvdberge.refinedstorage.tile.config.IType;
@@ -45,8 +46,8 @@ public class NetworkNodeDetector extends NetworkNode implements IComparable, ITy
private boolean powered = false;
private boolean wasPowered;
public NetworkNodeDetector(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeDetector(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -61,9 +62,9 @@ public class NetworkNodeDetector extends NetworkNode implements IComparable, ITy
if (powered != wasPowered) {
wasPowered = powered;
holder.world().notifyNeighborsOfStateChange(holder.pos(), RSBlocks.DETECTOR, true);
container.world().notifyNeighborsOfStateChange(container.pos(), RSBlocks.DETECTOR, true);
RSUtils.updateBlock(holder.world(), holder.pos());
RSUtils.updateBlock(container.world(), container.pos());
}
if (network != null && canUpdate() && ticks % SPEED == 0) {
@@ -117,7 +118,7 @@ public class NetworkNodeDetector extends NetworkNode implements IComparable, ITy
}
@Override
public void onConnectedStateChange(INetworkMaster network, boolean state) {
public void onConnectedStateChange(INetwork network, boolean state) {
super.onConnectedStateChange(network, state);
if (!state) {
@@ -234,7 +235,7 @@ public class NetworkNodeDetector extends NetworkNode implements IComparable, ITy
@Override
public int getType() {
return holder.world().isRemote ? TileDetector.TYPE.getValue() : type;
return container.world().isRemote ? TileDetector.TYPE.getValue() : type;
}
@Override

19
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java
View File

@@ -14,6 +14,7 @@ import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.item.filter.ItemFilter;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.TileExporter;
import com.raoulvdberge.refinedstorage.tile.config.IComparable;
import com.raoulvdberge.refinedstorage.tile.config.IType;
@@ -46,8 +47,8 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
private ICraftingTask[] craftOnlyTask = new ICraftingTask[9];
private Integer[] craftOnlyToExtract = new Integer[9];
public NetworkNodeExporter(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeExporter(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -61,7 +62,7 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
if (network != null && canUpdate() && ticks % upgrades.getSpeed() == 0) {
if (type == IType.ITEMS) {
IItemHandler handler = RSUtils.getItemHandler(getFacingTile(), holder.getDirection().getOpposite());
IItemHandler handler = RSUtils.getItemHandler(getFacingTile(), container.getDirection().getOpposite());
if (handler != null) {
for (int i = 0; i < itemFilters.getSlots(); ++i) {
@@ -81,7 +82,7 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
}
}
} else if (type == IType.FLUIDS) {
IFluidHandler handler = RSUtils.getFluidHandler(getFacingTile(), holder.getDirection().getOpposite());
IFluidHandler handler = RSUtils.getFluidHandler(getFacingTile(), container.getDirection().getOpposite());
if (handler != null) {
for (FluidStack stack : fluidFilters.getFluids()) {
@@ -186,11 +187,11 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
}
} else {
if (IntegrationCyclopsCore.isLoaded()
&& SlotlessItemHandlerHelper.isSlotless(getFacingTile(), holder.getDirection().getOpposite())
&& SlotlessItemHandlerHelper.insertItem(getFacingTile(), holder.getDirection().getOpposite(), took, true).isEmpty()) {
&& SlotlessItemHandlerHelper.isSlotless(getFacingTile(), container.getDirection().getOpposite())
&& SlotlessItemHandlerHelper.insertItem(getFacingTile(), container.getDirection().getOpposite(), took, true).isEmpty()) {
took = network.extractItem(slot, upgrades.getItemInteractCount(), compare, false);
SlotlessItemHandlerHelper.insertItem(getFacingTile(), holder.getDirection().getOpposite(), took, false);
SlotlessItemHandlerHelper.insertItem(getFacingTile(), container.getDirection().getOpposite(), took, false);
} else if (ItemHandlerHelper.insertItem(handler, took, true).isEmpty()) {
took = network.extractItem(slot, upgrades.getItemInteractCount(), compare, false);
@@ -283,7 +284,7 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
@Override
public int getType() {
return holder.world().isRemote ? TileExporter.TYPE.getValue() : type;
return container.world().isRemote ? TileExporter.TYPE.getValue() : type;
}
@Override
@@ -298,7 +299,7 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
}
public boolean isRegulator() {
return holder.world().isRemote ? TileExporter.REGULATOR.getValue() : regulator;
return container.world().isRemote ? TileExporter.REGULATOR.getValue() : regulator;
}
public ItemHandlerBase getItemFilters() {

13
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java
View File

@@ -5,6 +5,7 @@ import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.inventory.*;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.TileFluidInterface;
import com.raoulvdberge.refinedstorage.tile.config.IComparable;
import net.minecraft.item.ItemStack;
@@ -32,8 +33,8 @@ public class NetworkNodeFluidInterface extends NetworkNode implements IComparabl
protected void onContentsChanged() {
super.onContentsChanged();
if (holder.world() != null && !holder.world().isRemote) {
((TileFluidInterface) holder.world().getTileEntity(holder.pos())).getDataManager().sendParameterToWatchers(TileFluidInterface.TANK_IN);
if (container.world() != null && !container.world().isRemote) {
((TileFluidInterface) container.world().getTileEntity(container.pos())).getDataManager().sendParameterToWatchers(TileFluidInterface.TANK_IN);
}
markDirty();
@@ -45,8 +46,8 @@ public class NetworkNodeFluidInterface extends NetworkNode implements IComparabl
protected void onContentsChanged() {
super.onContentsChanged();
if (holder.world() != null && !holder.world().isRemote) {
((TileFluidInterface) holder.world().getTileEntity(holder.pos())).getDataManager().sendParameterToWatchers(TileFluidInterface.TANK_OUT);
if (container.world() != null && !container.world().isRemote) {
((TileFluidInterface) container.world().getTileEntity(container.pos())).getDataManager().sendParameterToWatchers(TileFluidInterface.TANK_OUT);
}
markDirty();
@@ -60,8 +61,8 @@ public class NetworkNodeFluidInterface extends NetworkNode implements IComparabl
private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ItemHandlerListenerNetworkNode(this), ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK);
public NetworkNodeFluidInterface(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeFluidInterface(INetworkNodeContainer container) {
super(container);
tankIn.setCanDrain(false);
tankIn.setCanFill(true);

13
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidStorage.java
View File

@@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.storage.AccessType;
import com.raoulvdberge.refinedstorage.api.storage.IStorage;
import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider;
@@ -13,6 +13,7 @@ import com.raoulvdberge.refinedstorage.block.BlockFluidStorage;
import com.raoulvdberge.refinedstorage.block.FluidStorageType;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.TileFluidStorage;
import com.raoulvdberge.refinedstorage.tile.config.*;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
@@ -74,8 +75,8 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage,
private int mode = IFilterable.WHITELIST;
private boolean voidExcess = false;
public NetworkNodeFluidStorage(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeFluidStorage(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -111,7 +112,7 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage,
}
@Override
public void onConnectedStateChange(INetworkMaster network, boolean state) {
public void onConnectedStateChange(INetwork network, boolean state) {
super.onConnectedStateChange(network, state);
network.getFluidStorageCache().invalidate();
@@ -196,8 +197,8 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage,
}
public FluidStorageType getType() {
if (type == null && holder.world() != null && holder.world().getBlockState(holder.pos()).getBlock() == RSBlocks.FLUID_STORAGE) {
type = (FluidStorageType) holder.world().getBlockState(holder.pos()).getValue(BlockFluidStorage.TYPE);
if (type == null && container.world() != null && container.world().getBlockState(container.pos()).getBlock() == RSBlocks.FLUID_STORAGE) {
type = (FluidStorageType) container.world().getBlockState(container.pos()).getValue(BlockFluidStorage.TYPE);
}
return type == null ? FluidStorageType.TYPE_64K : type;

25
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java
View File

@@ -16,6 +16,7 @@ import com.raoulvdberge.refinedstorage.inventory.ItemValidatorBasic;
import com.raoulvdberge.refinedstorage.item.ItemPattern;
import com.raoulvdberge.refinedstorage.item.filter.Filter;
import com.raoulvdberge.refinedstorage.item.filter.FilterTab;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
import com.raoulvdberge.refinedstorage.tile.grid.IGrid;
@@ -99,8 +100,8 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid {
private boolean oredictPattern = false;
public NetworkNodeGrid(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeGrid(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -152,8 +153,8 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid {
}
public GridType getType() {
if (type == null && holder.world().getBlockState(holder.pos()).getBlock() == RSBlocks.GRID) {
type = (GridType) holder.world().getBlockState(holder.pos()).getValue(BlockGrid.TYPE);
if (type == null && container.world().getBlockState(container.pos()).getBlock() == RSBlocks.GRID) {
type = (GridType) container.world().getBlockState(container.pos()).getValue(BlockGrid.TYPE);
}
return type == null ? GridType.NORMAL : type;
@@ -205,7 +206,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid {
@Override
public void onCraftingMatrixChanged() {
result.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(matrix, holder.world()));
result.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(matrix, container.world()));
markDirty();
}
@@ -301,7 +302,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid {
@Override
public void onCrafted(EntityPlayer player) {
NonNullList<ItemStack> remainder = CraftingManager.getInstance().getRemainingItems(matrix, holder.world());
NonNullList<ItemStack> remainder = CraftingManager.getInstance().getRemainingItems(matrix, container.world());
for (int i = 0; i < matrix.getSizeInventory(); ++i) {
ItemStack slot = matrix.getStackInSlot(i);
@@ -390,32 +391,32 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid {
@Override
public int getViewType() {
return holder.world().isRemote ? TileGrid.VIEW_TYPE.getValue() : viewType;
return container.world().isRemote ? TileGrid.VIEW_TYPE.getValue() : viewType;
}
@Override
public int getSortingDirection() {
return holder.world().isRemote ? TileGrid.SORTING_DIRECTION.getValue() : sortingDirection;
return container.world().isRemote ? TileGrid.SORTING_DIRECTION.getValue() : sortingDirection;
}
@Override
public int getSortingType() {
return holder.world().isRemote ? TileGrid.SORTING_TYPE.getValue() : sortingType;
return container.world().isRemote ? TileGrid.SORTING_TYPE.getValue() : sortingType;
}
@Override
public int getSearchBoxMode() {
return holder.world().isRemote ? TileGrid.SEARCH_BOX_MODE.getValue() : searchBoxMode;
return container.world().isRemote ? TileGrid.SEARCH_BOX_MODE.getValue() : searchBoxMode;
}
@Override
public int getSize() {
return holder.world().isRemote ? TileGrid.SIZE.getValue() : size;
return container.world().isRemote ? TileGrid.SIZE.getValue() : size;
}
@Override
public int getTabSelected() {
return holder.world().isRemote ? TileGrid.TAB_SELECTED.getValue() : tabSelected;
return container.world().isRemote ? TileGrid.TAB_SELECTED.getValue() : tabSelected;
}
@Override

13
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java
View File

@@ -8,6 +8,7 @@ import com.raoulvdberge.refinedstorage.integration.cyclopscore.IntegrationCyclop
import com.raoulvdberge.refinedstorage.integration.cyclopscore.SlotlessItemHandlerHelper;
import com.raoulvdberge.refinedstorage.inventory.*;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.TileImporter;
import com.raoulvdberge.refinedstorage.tile.config.IComparable;
import com.raoulvdberge.refinedstorage.tile.config.IFilterable;
@@ -36,8 +37,8 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IFi
private int currentSlot;
public NetworkNodeImporter(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeImporter(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -55,12 +56,12 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IFi
if (type == IType.ITEMS) {
IImportingBehavior behavior = ImportingBehaviorItemHandler.INSTANCE;
if (IntegrationCyclopsCore.isLoaded() && SlotlessItemHandlerHelper.isSlotless(getFacingTile(), holder.getDirection().getOpposite())) {
if (IntegrationCyclopsCore.isLoaded() && SlotlessItemHandlerHelper.isSlotless(getFacingTile(), container.getDirection().getOpposite())) {
behavior = ImportingBehaviorCyclops.INSTANCE;
}
currentSlot = behavior.doImport(getFacingTile(), holder.getDirection().getOpposite(), currentSlot, itemFilters, mode, compare, ticks, upgrades, network);
currentSlot = behavior.doImport(getFacingTile(), container.getDirection().getOpposite(), currentSlot, itemFilters, mode, compare, ticks, upgrades, network);
} else if (type == IType.FLUIDS && ticks % upgrades.getSpeed() == 0) {
IFluidHandler handler = RSUtils.getFluidHandler(getFacingTile(), holder.getDirection().getOpposite());
IFluidHandler handler = RSUtils.getFluidHandler(getFacingTile(), container.getDirection().getOpposite());
if (handler != null) {
FluidStack stack = handler.drain(Fluid.BUCKET_VOLUME, false);
@@ -170,7 +171,7 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IFi
@Override
public int getType() {
return holder.world().isRemote ? TileImporter.TYPE.getValue() : type;
return container.world().isRemote ? TileImporter.TYPE.getValue() : type;
}
@Override

5
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java
View File

@@ -9,6 +9,7 @@ import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerProxy;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.config.IComparable;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -33,8 +34,8 @@ public class NetworkNodeInterface extends NetworkNode implements IComparable {
private int currentSlot = 0;
public NetworkNodeInterface(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeInterface(INetworkNodeContainer container) {
super(container);
}
@Override

5
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkReceiver.java
View File

@@ -1,12 +1,13 @@
package com.raoulvdberge.refinedstorage.apiimpl.network.node;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
public class NetworkNodeNetworkReceiver extends NetworkNode {
public static final String ID = "network_receiver";
public NetworkNodeNetworkReceiver(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeNetworkReceiver(INetworkNodeContainer container) {
super(container);
}
@Override

11
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java
View File

@@ -9,6 +9,7 @@ import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.inventory.ItemValidatorBasic;
import com.raoulvdberge.refinedstorage.item.ItemNetworkCard;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.BlockPos;
@@ -56,8 +57,8 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode {
private BlockPos receiver;
private int receiverDimension;
public NetworkNodeNetworkTransmitter(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeNetworkTransmitter(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -118,11 +119,11 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode {
return 0;
}
return (int) Math.sqrt(Math.pow(holder.pos().getX() - receiver.getX(), 2) + Math.pow(holder.pos().getY() - receiver.getY(), 2) + Math.pow(holder.pos().getZ() - receiver.getZ(), 2));
return (int) Math.sqrt(Math.pow(container.pos().getX() - receiver.getX(), 2) + Math.pow(container.pos().getY() - receiver.getY(), 2) + Math.pow(container.pos().getZ() - receiver.getZ(), 2));
}
public boolean isSameDimension() {
return holder.world().provider.getDimension() == receiverDimension;
return container.world().provider.getDimension() == receiverDimension;
}
public boolean isDimensionSupported() {
@@ -154,7 +155,7 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode {
operator.apply(dimensionWorld, receiver, null);
}
} else {
operator.apply(holder.world(), receiver, null);
operator.apply(container.world(), receiver, null);
}
}
}

7
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeReader.java
View File

@@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReader;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.TileReader;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
import net.minecraft.entity.player.EntityPlayer;
@@ -15,8 +16,8 @@ public class NetworkNodeReader extends NetworkNode implements IReader, IGuiReade
private String channel = "";
public NetworkNodeReader(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeReader(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -26,7 +27,7 @@ public class NetworkNodeReader extends NetworkNode implements IReader, IGuiReade
@Override
public int getRedstoneStrength() {
return holder.world().getRedstonePower(holder.pos().offset(holder.getDirection()), holder.getDirection());
return container.world().getRedstonePower(container.pos().offset(container.getDirection()), container.getDirection());
}
@Override

5
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeRelay.java
View File

@@ -1,6 +1,7 @@
package com.raoulvdberge.refinedstorage.apiimpl.network.node;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode;
import net.minecraft.util.EnumFacing;
@@ -9,8 +10,8 @@ import javax.annotation.Nullable;
public class NetworkNodeRelay extends NetworkNode {
public static final String ID = "relay";
public NetworkNodeRelay(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeRelay(INetworkNodeContainer container) {
super(container);
this.redstoneMode = RedstoneMode.LOW;
}

11
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java
View File

@@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSItems;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.security.ISecurityCard;
import com.raoulvdberge.refinedstorage.api.network.security.ISecurityCardContainer;
import com.raoulvdberge.refinedstorage.api.network.security.Permission;
@@ -12,6 +12,7 @@ import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.inventory.ItemValidatorBasic;
import com.raoulvdberge.refinedstorage.item.ItemSecurityCard;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.items.IItemHandler;
@@ -34,7 +35,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity
protected void onContentsChanged(int slot) {
super.onContentsChanged(slot);
if (holder.world() != null && !holder.world().isRemote) {
if (container.world() != null && !container.world().isRemote) {
rebuildCards();
}
@@ -48,8 +49,8 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity
@Nullable
private UUID owner;
public NetworkNodeSecurityManager(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeSecurityManager(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -141,7 +142,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity
}
@Override
public void onConnectedStateChange(INetworkMaster network, boolean state) {
public void onConnectedStateChange(INetwork network, boolean state) {
super.onConnectedStateChange(network, state);
network.getSecurityManager().rebuild();

11
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSolderer.java
View File

@@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.apiimpl.API;
@@ -11,6 +11,7 @@ import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerProxy;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.items.IItemHandler;
@@ -56,8 +57,8 @@ public class NetworkNodeSolderer extends NetworkNode {
private boolean wasWorking = false;
private int progress = 0;
public NetworkNodeSolderer(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeSolderer(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -74,7 +75,7 @@ public class NetworkNodeSolderer extends NetworkNode {
markDirty();
RSUtils.updateBlock(holder.world(), holder.pos());
RSUtils.updateBlock(container.world(), container.pos());
}
if (network == null || !canUpdate()) {
@@ -125,7 +126,7 @@ public class NetworkNodeSolderer extends NetworkNode {
}
@Override
public void onConnectedStateChange(INetworkMaster network, boolean state) {
public void onConnectedStateChange(INetwork network, boolean state) {
super.onConnectedStateChange(network, state);
if (!state) {

13
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorage.java
View File

@@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.storage.AccessType;
import com.raoulvdberge.refinedstorage.api.storage.IStorage;
import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider;
@@ -13,6 +13,7 @@ import com.raoulvdberge.refinedstorage.block.BlockStorage;
import com.raoulvdberge.refinedstorage.block.ItemStorageType;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.TileStorage;
import com.raoulvdberge.refinedstorage.tile.config.*;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
@@ -73,8 +74,8 @@ public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, ISto
private int mode = IFilterable.WHITELIST;
private boolean voidExcess = false;
public NetworkNodeStorage(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeStorage(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -108,7 +109,7 @@ public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, ISto
}
@Override
public void onConnectedStateChange(INetworkMaster network, boolean state) {
public void onConnectedStateChange(INetwork network, boolean state) {
super.onConnectedStateChange(network, state);
network.getItemStorageCache().invalidate();
@@ -191,8 +192,8 @@ public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, ISto
}
public ItemStorageType getType() {
if (type == null && holder.world() != null && holder.world().getBlockState(holder.pos()).getBlock() == RSBlocks.STORAGE) {
type = (ItemStorageType) holder.world().getBlockState(holder.pos()).getValue(BlockStorage.TYPE);
if (type == null && container.world() != null && container.world().getBlockState(container.pos()).getBlock() == RSBlocks.STORAGE) {
type = (ItemStorageType) container.world().getBlockState(container.pos()).getValue(BlockStorage.TYPE);
}
return type == null ? ItemStorageType.TYPE_1K : type;

21
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java
View File

@@ -7,6 +7,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.TileStorageMonitor;
import com.raoulvdberge.refinedstorage.tile.config.IComparable;
import com.raoulvdberge.refinedstorage.tile.config.IType;
@@ -37,7 +38,7 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl
public void onContentsChanged(int slot) {
super.onContentsChanged(slot);
RSUtils.updateBlock(holder.world(), holder.pos());
RSUtils.updateBlock(container.world(), container.pos());
}
};
@@ -46,7 +47,7 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl
public void onContentsChanged(int slot) {
super.onContentsChanged(slot);
RSUtils.updateBlock(holder.world(), holder.pos());
RSUtils.updateBlock(container.world(), container.pos());
}
};
@@ -57,8 +58,8 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl
private int oldAmount = -1;
public NetworkNodeStorageMonitor(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeStorageMonitor(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -72,7 +73,7 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl
} else if (oldAmount != newAmount) {
oldAmount = newAmount;
RSUtils.updateBlock(holder.world(), holder.pos());
RSUtils.updateBlock(container.world(), container.pos());
}
}
@@ -128,7 +129,7 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl
}
public void extract(EntityPlayer player, EnumFacing side) {
if (type != IType.ITEMS || network == null || holder.getDirection() != side) {
if (type != IType.ITEMS || network == null || container.getDirection() != side) {
return;
}
@@ -145,7 +146,7 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl
if (result != null) {
if (!player.inventory.addItemStackToInventory(result.copy())) {
InventoryHelper.spawnItemStack(holder.world(), player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), result);
InventoryHelper.spawnItemStack(container.world(), player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), result);
}
}
}
@@ -170,21 +171,21 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl
public void setCompare(int compare) {
this.compare = compare;
RSUtils.updateBlock(holder.world(), holder.pos());
RSUtils.updateBlock(container.world(), container.pos());
markDirty();
}
@Override
public int getType() {
return holder.world().isRemote ? TileStorageMonitor.TYPE.getValue() : type;
return container.world().isRemote ? TileStorageMonitor.TYPE.getValue() : type;
}
@Override
public void setType(int type) {
this.type = type;
RSUtils.updateBlock(holder.world(), holder.pos());
RSUtils.updateBlock(container.world(), container.pos());
markDirty();
}

11
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java
View File

@@ -7,6 +7,7 @@ import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -19,8 +20,8 @@ public class NetworkNodeWirelessTransmitter extends NetworkNode implements IWire
private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ItemHandlerListenerNetworkNode(this), ItemUpgrade.TYPE_RANGE);
public NetworkNodeWirelessTransmitter(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeWirelessTransmitter(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -56,12 +57,12 @@ public class NetworkNodeWirelessTransmitter extends NetworkNode implements IWire
@Override
public BlockPos getOrigin() {
return holder.pos();
return container.pos();
}
@Override
public int getDimension() {
return holder.world().provider.getDimension();
return container.world().provider.getDimension();
}
public ItemHandlerBase getUpgrades() {
@@ -85,6 +86,6 @@ public class NetworkNodeWirelessTransmitter extends NetworkNode implements IWire
@Override
public void walkNeighborhood(Operator operator) {
operator.apply(holder.world(), holder.pos().offset(EnumFacing.DOWN), EnumFacing.UP);
operator.apply(container.world(), container.pos().offset(EnumFacing.DOWN), EnumFacing.UP);
}
}

9
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWriter.java
View File

@@ -5,6 +5,7 @@ import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel;
import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterHandler;
import com.raoulvdberge.refinedstorage.api.network.readerwriter.IWriter;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.TileWriter;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
import net.minecraft.entity.player.EntityPlayer;
@@ -22,8 +23,8 @@ public class NetworkNodeWriter extends NetworkNode implements IWriter, IGuiReade
private int redstoneStrength;
private int lastRedstoneStrength;
public NetworkNodeWriter(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeWriter(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -38,7 +39,7 @@ public class NetworkNodeWriter extends NetworkNode implements IWriter, IGuiReade
if (getRedstoneStrength() != lastRedstoneStrength) {
lastRedstoneStrength = getRedstoneStrength();
holder.world().notifyNeighborsOfStateChange(holder.pos(), RSBlocks.WRITER, true);
container.world().notifyNeighborsOfStateChange(container.pos(), RSBlocks.WRITER, true);
}
}
@@ -54,7 +55,7 @@ public class NetworkNodeWriter extends NetworkNode implements IWriter, IGuiReade
@Override
public EnumFacing getDirection() {
return holder.getDirection();
return container.getDirection();
}
@Override

16
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/NetworkNodeDiskDrive.java
View File

@@ -2,15 +2,15 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.storage.*;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.IGuiStorage;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.INetworkNodeHolder;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.TileDiskDrive;
import com.raoulvdberge.refinedstorage.tile.config.*;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
@@ -55,7 +55,7 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IS
network.getFluidStorageCache().invalidate();
}
RSUtils.updateBlock(holder.world(), holder.pos());
RSUtils.updateBlock(container.world(), container.pos());
}
}
@@ -86,8 +86,8 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IS
private int type = IType.ITEMS;
private boolean voidExcess = false;
public NetworkNodeDiskDrive(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeDiskDrive(INetworkNodeContainer container) {
super(container);
}
public IStorageDisk[] getItemStorages() {
@@ -126,13 +126,13 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IS
}
@Override
public void onConnectedStateChange(INetworkMaster network, boolean state) {
public void onConnectedStateChange(INetwork network, boolean state) {
super.onConnectedStateChange(network, state);
network.getItemStorageCache().invalidate();
network.getFluidStorageCache().invalidate();
RSUtils.updateBlock(holder.world(), holder.pos());
RSUtils.updateBlock(container.world(), container.pos());
}
@Override
@@ -363,7 +363,7 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IS
@Override
public int getType() {
return holder.world().isRemote ? TileDiskDrive.TYPE.getValue() : type;
return container.world().isRemote ? TileDiskDrive.TYPE.getValue() : type;
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/StorageFluidDiskDrive.java
View File

@@ -31,7 +31,7 @@ public class StorageFluidDiskDrive implements IStorageDisk<FluidStack> {
if (lastState != currentState) {
lastState = currentState;
RSUtils.updateBlock(diskDrive.getHolder().world(), diskDrive.getHolder().pos());
RSUtils.updateBlock(diskDrive.getContainer().world(), diskDrive.getContainer().pos());
}
},
diskDrive::getVoidExcess,

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/StorageItemDiskDrive.java
View File

@@ -31,7 +31,7 @@ public class StorageItemDiskDrive implements IStorageDisk<ItemStack> {
if (lastState != currentState) {
lastState = currentState;
RSUtils.updateBlock(diskDrive.getHolder().world(), diskDrive.getHolder().pos());
RSUtils.updateBlock(diskDrive.getContainer().world(), diskDrive.getContainer().pos());
}
},
diskDrive::getVoidExcess,

12
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java
View File

@@ -4,7 +4,6 @@ import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.storage.IStorageDisk;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.INetworkNodeHolder;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive.NetworkNodeDiskDrive;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
@@ -12,6 +11,7 @@ import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.TileDiskManipulator;
import com.raoulvdberge.refinedstorage.tile.config.IComparable;
import com.raoulvdberge.refinedstorage.tile.config.IFilterable;
@@ -64,7 +64,7 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
s -> new StorageFluidDiskManipulator(NetworkNodeDiskManipulator.this, s)
);
RSUtils.updateBlock(holder.world(), holder.pos());
RSUtils.updateBlock(container.world(), container.pos());
}
}
@@ -98,13 +98,13 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
s -> new StorageFluidDiskManipulator(NetworkNodeDiskManipulator.this, s)
);
RSUtils.updateBlock(holder.world(), holder.pos());
RSUtils.updateBlock(container.world(), container.pos());
}
}
};
public NetworkNodeDiskManipulator(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeDiskManipulator(INetworkNodeContainer container) {
super(container);
}
private ItemHandlerBase itemFilters = new ItemHandlerBase(9, new ItemHandlerListenerNetworkNode(this));
@@ -358,7 +358,7 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
@Override
public int getType() {
return holder.world().isRemote ? TileDiskManipulator.TYPE.getValue() : type;
return container.world().isRemote ? TileDiskManipulator.TYPE.getValue() : type;
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/StorageFluidDiskManipulator.java
View File

@@ -31,7 +31,7 @@ public class StorageFluidDiskManipulator implements IStorageDisk<FluidStack> {
if (lastState != currentState) {
lastState = currentState;
RSUtils.updateBlock(diskManipulator.getHolder().world(), diskManipulator.getHolder().pos());
RSUtils.updateBlock(diskManipulator.getContainer().world(), diskManipulator.getContainer().pos());
}
},
() -> false,

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/StorageItemDiskManipulator.java
View File

@@ -31,7 +31,7 @@ public class StorageItemDiskManipulator implements IStorageDisk<ItemStack> {
if (lastState != currentState) {
lastState = currentState;
RSUtils.updateBlock(diskManipulator.getHolder().world(), diskManipulator.getHolder().pos());
RSUtils.updateBlock(diskManipulator.getContainer().world(), diskManipulator.getContainer().pos());
}
},
() -> false,

24
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/NetworkNodeExternalStorage.java
View File

@@ -4,18 +4,18 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer;
import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.storage.AccessType;
import com.raoulvdberge.refinedstorage.api.storage.IStorage;
import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.IGuiStorage;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.INetworkNodeHolder;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode;
import com.raoulvdberge.refinedstorage.integration.cyclopscore.IntegrationCyclopsCore;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.tile.INetworkNodeContainer;
import com.raoulvdberge.refinedstorage.tile.TileExternalStorage;
import com.raoulvdberge.refinedstorage.tile.TileNode;
import com.raoulvdberge.refinedstorage.tile.config.*;
@@ -51,8 +51,8 @@ public class NetworkNodeExternalStorage extends NetworkNode implements IStorageP
private List<StorageItemExternal> itemStorages = new ArrayList<>();
private List<StorageFluidExternal> fluidStorages = new ArrayList<>();
public NetworkNodeExternalStorage(INetworkNodeHolder holder) {
super(holder);
public NetworkNodeExternalStorage(INetworkNodeContainer container) {
super(container);
}
@Override
@@ -61,7 +61,7 @@ public class NetworkNodeExternalStorage extends NetworkNode implements IStorageP
}
@Override
public void onConnectedStateChange(INetworkMaster network, boolean state) {
public void onConnectedStateChange(INetwork network, boolean state) {
super.onConnectedStateChange(network, state);
updateStorage(network);
@@ -188,7 +188,7 @@ public class NetworkNodeExternalStorage extends NetworkNode implements IStorageP
}
}
public void updateStorage(INetworkMaster network) {
public void updateStorage(INetwork network) {
itemStorages.clear();
fluidStorages.clear();
@@ -207,20 +207,20 @@ public class NetworkNodeExternalStorage extends NetworkNode implements IStorageP
return f instanceof IDrawer ? (IDrawer) f : null;
}));
} else if (IntegrationCyclopsCore.isLoaded() && StorageItemCyclops.isValid(facing, holder.getDirection().getOpposite())) {
} else if (IntegrationCyclopsCore.isLoaded() && StorageItemCyclops.isValid(facing, container.getDirection().getOpposite())) {
itemStorages.add(new StorageItemCyclops(this));
} else if (!(facing instanceof TileNode)) {
IItemHandler itemHandler = RSUtils.getItemHandler(facing, holder.getDirection().getOpposite());
IItemHandler itemHandler = RSUtils.getItemHandler(facing, container.getDirection().getOpposite());
if (itemHandler != null) {
itemStorages.add(new StorageItemItemHandler(this, () -> RSUtils.getItemHandler(getFacingTile(), holder.getDirection().getOpposite())));
itemStorages.add(new StorageItemItemHandler(this, () -> RSUtils.getItemHandler(getFacingTile(), container.getDirection().getOpposite())));
}
}
} else if (type == IType.FLUIDS) {
IFluidHandler fluidHandler = RSUtils.getFluidHandler(facing, holder.getDirection().getOpposite());
IFluidHandler fluidHandler = RSUtils.getFluidHandler(facing, container.getDirection().getOpposite());
if (fluidHandler != null) {
fluidStorages.add(new StorageFluidExternal(this, () -> RSUtils.getFluidHandler(getFacingTile(), holder.getDirection().getOpposite())));
fluidStorages.add(new StorageFluidExternal(this, () -> RSUtils.getFluidHandler(getFacingTile(), container.getDirection().getOpposite())));
}
}
@@ -312,7 +312,7 @@ public class NetworkNodeExternalStorage extends NetworkNode implements IStorageP
@Override
public int getType() {
return holder.world().isRemote ? TileExternalStorage.TYPE.getValue() : type;
return container.world().isRemote ? TileExternalStorage.TYPE.getValue() : type;
}
@Override

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageItemCyclops.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.apiimpl.network.node.externalstorage;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.storage.AccessType;
import com.raoulvdberge.refinedstorage.integration.cyclopscore.SlotlessItemHandlerHelper;
import com.raoulvdberge.refinedstorage.tile.config.IFilterable;
@@ -29,7 +29,7 @@ public class StorageItemCyclops extends StorageItemExternal {
public StorageItemCyclops(NetworkNodeExternalStorage externalStorage) {
this.externalStorage = externalStorage;
this.opposite = externalStorage.getHolder().getDirection().getOpposite();
this.opposite = externalStorage.getContainer().getDirection().getOpposite();
this.cyclopsInv = () -> {
TileEntity f = externalStorage.getFacingTile();
@@ -38,7 +38,7 @@ public class StorageItemCyclops extends StorageItemExternal {
}
@Override
public void detectChanges(INetworkMaster network) {
public void detectChanges(INetwork network) {
InventoryTileEntityBase inv = cyclopsInv.get();
if (inv != null) {
int inventoryHash = inv.getInventoryHash();

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageItemExternal.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.apiimpl.network.node.externalstorage;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.storage.AccessType;
import com.raoulvdberge.refinedstorage.api.storage.IStorage;
import com.raoulvdberge.refinedstorage.apiimpl.API;
@@ -15,7 +15,7 @@ public abstract class StorageItemExternal implements IStorage<ItemStack> {
public abstract int getCapacity();
public void detectChanges(INetworkMaster network) {
public void detectChanges(INetwork network) {
// If we are insert only, we don't care about sending changes
if (getAccessType() == AccessType.INSERT) {
return;

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterChannel.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.readerwriter.*;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import net.minecraft.nbt.NBTTagCompound;
@@ -13,11 +13,11 @@ public class ReaderWriterChannel implements IReaderWriterChannel {
private static final String NBT_HANDLER = "Handler_%s";
private String name;
private INetworkMaster network;
private INetwork network;
private List<IReaderWriterHandler> handlers = new ArrayList<>();
public ReaderWriterChannel(String name, INetworkMaster network) {
public ReaderWriterChannel(String name, INetwork network) {
this.name = name;
this.network = network;
this.handlers.addAll(API.instance().getReaderWriterHandlerRegistry().all().stream().map(f -> f.create(null)).collect(Collectors.toList()));

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/security/SecurityManager.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.apiimpl.network.security;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
import com.raoulvdberge.refinedstorage.api.network.security.ISecurityCard;
import com.raoulvdberge.refinedstorage.api.network.security.ISecurityCardContainer;
@@ -15,10 +15,10 @@ import java.util.Map;
import java.util.UUID;
public class SecurityManager implements ISecurityManager {
private INetworkMaster network;
private INetwork network;
private Map<UUID, ISecurityCard> cards = new HashMap<>();
public SecurityManager(INetworkMaster network) {
public SecurityManager(INetwork network) {
this.network = network;
}

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluid.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.apiimpl.storage;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.storage.AccessType;
import com.raoulvdberge.refinedstorage.api.storage.IStorage;
import com.raoulvdberge.refinedstorage.api.storage.IStorageCache;
@@ -15,11 +15,11 @@ import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
public class StorageCacheFluid implements IStorageCache<FluidStack> {
private INetworkMaster network;
private INetwork network;
private List<IStorage<FluidStack>> storages = new CopyOnWriteArrayList<>();
private IStackList<FluidStack> list = API.instance().createFluidStackList();
public StorageCacheFluid(INetworkMaster network) {
public StorageCacheFluid(INetwork network) {
this.network = network;
}

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItem.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.apiimpl.storage;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.storage.AccessType;
import com.raoulvdberge.refinedstorage.api.storage.IStorage;
import com.raoulvdberge.refinedstorage.api.storage.IStorageCache;
@@ -15,11 +15,11 @@ import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
public class StorageCacheItem implements IStorageCache<ItemStack> {
private INetworkMaster network;
private INetwork network;
private List<IStorage<ItemStack>> storages = new CopyOnWriteArrayList<>();
private IStackList<ItemStack> list = API.instance().createItemStackList();
public StorageCacheItem(INetworkMaster network) {
public StorageCacheItem(INetwork network) {
this.network = network;
}

2
src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotFilterType.java
View File

@@ -38,7 +38,7 @@ public class SlotFilterType extends SlotFilter {
@Override
@Nonnull
public ItemStack getStack() {
return (type.getType() == IType.ITEMS || !((NetworkNode) type).getHolder().world().isRemote) ? super.getStack() : ItemStack.EMPTY;
return (type.getType() == IType.ITEMS || !((NetworkNode) type).getContainer().world().isRemote) ? super.getStack() : ItemStack.EMPTY;
}
public ItemStack getRealStack() {

4
src/main/java/com/raoulvdberge/refinedstorage/integration/cyclopscore/ImportingBehaviorCyclops.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.integration.cyclopscore;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.inventory.IImportingBehavior;
import com.raoulvdberge.refinedstorage.inventory.ImportingBehaviorItemHandler;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade;
@@ -14,7 +14,7 @@ public class ImportingBehaviorCyclops implements IImportingBehavior {
public static final IImportingBehavior INSTANCE = new ImportingBehaviorCyclops();
@Override
public int doImport(TileEntity entity, EnumFacing facing, int currentSlot, IItemHandler itemFilters, int mode, int compare, int ticks, ItemHandlerUpgrade upgrades, INetworkMaster network) {
public int doImport(TileEntity entity, EnumFacing facing, int currentSlot, IItemHandler itemFilters, int mode, int compare, int ticks, ItemHandlerUpgrade upgrades, INetwork network) {
if (IFilterable.isEmpty(itemFilters)) {
if (ticks % upgrades.getSpeed() == 0) {
ItemStack result = SlotlessItemHandlerHelper.extractItem(entity, facing, upgrades.getItemInteractCount(), true);

4
src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java
View File

@@ -170,7 +170,7 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment {
EnumFacing facing = EnumFacing.getFront(args.optInteger(2, 0));
// Get the tile-entity on the specified side
TileEntity targetEntity = node.getNetwork().getNetworkWorld().getTileEntity(node.getPos().offset(facing));
TileEntity targetEntity = node.getNetwork().world().getTileEntity(node.getPos().offset(facing));
if (targetEntity == null || !targetEntity.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing.getOpposite())) {
throw new IllegalArgumentException("No fluid tank on the given side");
}
@@ -244,7 +244,7 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment {
EnumFacing facing = EnumFacing.getFront(args.optInteger(2, 0));
// Get the tile-entity on the specified side
TileEntity targetEntity = node.getNetwork().getNetworkWorld().getTileEntity(node.getPos().offset(facing));
TileEntity targetEntity = node.getNetwork().world().getTileEntity(node.getPos().offset(facing));
if (targetEntity == null || !targetEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing.getOpposite())) {
throw new IllegalArgumentException("No inventory on the given side");
}

4
src/main/java/com/raoulvdberge/refinedstorage/inventory/IImportingBehavior.java
View File

@@ -1,10 +1,10 @@
package com.raoulvdberge.refinedstorage.inventory;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.IItemHandler;
public interface IImportingBehavior {
int doImport(TileEntity entity, EnumFacing facing, int currentSlot, IItemHandler itemFilters, int mode, int compare, int ticks, ItemHandlerUpgrade upgrades, INetworkMaster network);
int doImport(TileEntity entity, EnumFacing facing, int currentSlot, IItemHandler itemFilters, int mode, int compare, int ticks, ItemHandlerUpgrade upgrades, INetwork network);
}

4
src/main/java/com/raoulvdberge/refinedstorage/inventory/ImportingBehaviorItemHandler.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.inventory;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.tile.TileDiskDrive;
import com.raoulvdberge.refinedstorage.tile.config.IFilterable;
import net.minecraft.item.ItemStack;
@@ -13,7 +13,7 @@ public class ImportingBehaviorItemHandler implements IImportingBehavior {
public static final IImportingBehavior INSTANCE = new ImportingBehaviorItemHandler();
@Override
public int doImport(TileEntity entity, EnumFacing facing, int currentSlot, IItemHandler itemFilters, int mode, int compare, int ticks, ItemHandlerUpgrade upgrades, INetworkMaster network) {
public int doImport(TileEntity entity, EnumFacing facing, int currentSlot, IItemHandler itemFilters, int mode, int compare, int ticks, ItemHandlerUpgrade upgrades, INetwork network) {
IItemHandler handler = RSUtils.getItemHandler(entity, facing);
if (entity instanceof TileDiskDrive || handler == null) {

6
src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidUpdate.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.network;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackFluid;
import io.netty.buffer.ByteBuf;
@@ -14,14 +14,14 @@ import java.util.ArrayList;
import java.util.List;
public class MessageGridFluidUpdate implements IMessage, IMessageHandler<MessageGridFluidUpdate, IMessage> {
private INetworkMaster network;
private INetwork network;
private boolean canCraft;
private List<GridStackFluid> stacks = new ArrayList<>();
public MessageGridFluidUpdate() {
}
public MessageGridFluidUpdate(INetworkMaster network, boolean canCraft) {
public MessageGridFluidUpdate(INetwork network, boolean canCraft) {
this.network = network;
this.canCraft = canCraft;
}

6
src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemDelta.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.network;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackItem;
import io.netty.buffer.ByteBuf;
@@ -15,7 +15,7 @@ import javax.annotation.Nullable;
public class MessageGridItemDelta implements IMessage, IMessageHandler<MessageGridItemDelta, IMessage> {
@Nullable
private INetworkMaster network;
private INetwork network;
private ItemStack stack;
private int delta;
@@ -24,7 +24,7 @@ public class MessageGridItemDelta implements IMessage, IMessageHandler<MessageGr
public MessageGridItemDelta() {
}
public MessageGridItemDelta(@Nullable INetworkMaster network, ItemStack stack, int delta) {
public MessageGridItemDelta(@Nullable INetwork network, ItemStack stack, int delta) {
this.network = network;
this.stack = stack;
this.delta = delta;

4
src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemUpdate.java
View File

@@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.network;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackItem;
@@ -25,7 +25,7 @@ public class MessageGridItemUpdate implements IMessage, IMessageHandler<MessageG
public MessageGridItemUpdate() {
}
public MessageGridItemUpdate(INetworkMaster network, boolean canCraft) {
public MessageGridItemUpdate(INetwork network, boolean canCraft) {
this.sendHandler = (buf) -> {
int size = network.getItemStorageCache().getList().getStacks().size();

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/INetworkNodeHolder.java → src/main/java/com/raoulvdberge/refinedstorage/tile/INetworkNodeContainer.java
View File

@@ -1,10 +1,10 @@
package com.raoulvdberge.refinedstorage.apiimpl.network.node;
package com.raoulvdberge.refinedstorage.tile;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface INetworkNodeHolder {
public interface INetworkNodeContainer {
EnumFacing getDirection();
void setDirection(EnumFacing direction);

12
src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
View File

@@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingManager;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.INetworkNodeGraph;
import com.raoulvdberge.refinedstorage.api.network.grid.IFluidGridHandler;
import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler;
@@ -70,7 +70,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.*;
public class TileController extends TileBase implements ITickable, INetworkMaster, IRedstoneConfigurable, INetworkNode, INetworkNodeProxy<TileController> {
public class TileController extends TileBase implements ITickable, INetwork, IRedstoneConfigurable, INetworkNode, INetworkNodeProxy<TileController> {
public static final TileDataParameter<Integer> REDSTONE_MODE = RedstoneMode.createParameter();
public static final TileDataParameter<Integer> ENERGY_USAGE = new TileDataParameter<>(DataSerializers.VARINT, 0, new ITileDataProducer<Integer, TileController>() {
@@ -593,7 +593,7 @@ public class TileController extends TileBase implements ITickable, INetworkMaste
}
@Override
public World getNetworkWorld() {
public World world() {
return getWorld();
}
@@ -713,12 +713,12 @@ public class TileController extends TileBase implements ITickable, INetworkMaste
}
@Override
public void onConnected(INetworkMaster network) {
public void onConnected(INetwork network) {
Preconditions.checkArgument(this == network, "Should not be connected to another controller");
}
@Override
public void onDisconnected(INetworkMaster network) {
public void onDisconnected(INetwork network) {
Preconditions.checkArgument(this == network, "Should not be connected to another controller");
}
@@ -728,7 +728,7 @@ public class TileController extends TileBase implements ITickable, INetworkMaste
}
@Override
public INetworkMaster getNetwork() {
public INetwork getNetwork() {
return this;
}

7
src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
View File

@@ -4,7 +4,6 @@ import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy;
import com.raoulvdberge.refinedstorage.api.util.IWrenchable;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.INetworkNodeHolder;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode;
import com.raoulvdberge.refinedstorage.proxy.CapabilityNetworkNodeProxy;
import com.raoulvdberge.refinedstorage.tile.config.IRedstoneConfigurable;
@@ -20,7 +19,7 @@ import net.minecraftforge.items.IItemHandler;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public abstract class TileNode<N extends NetworkNode> extends TileBase implements INetworkNodeProxy<N>, INetworkNodeHolder, IRedstoneConfigurable, IWrenchable {
public abstract class TileNode<N extends NetworkNode> extends TileBase implements INetworkNodeProxy<N>, INetworkNodeContainer, IRedstoneConfigurable, IWrenchable {
public static final TileDataParameter<Integer> REDSTONE_MODE = RedstoneMode.createParameter();
private NBTTagCompound legacyTag;
@@ -112,8 +111,8 @@ public abstract class TileNode<N extends NetworkNode> extends TileBase implement
manager.markForSaving();
}
if (node.getHolder().world() == null) {
node.setHolder(this);
if (node.getContainer().world() == null) {
node.setContainer(this);
}
if (legacyTag != null) {

4
src/main/java/com/raoulvdberge/refinedstorage/tile/grid/IGrid.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.tile.grid;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.grid.IFluidGridHandler;
import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler;
import com.raoulvdberge.refinedstorage.block.GridType;
@@ -20,7 +20,7 @@ public interface IGrid {
GridType getType();
@Nullable
INetworkMaster getNetwork();
INetwork getNetwork();
@Nullable
default IItemGridHandler getItemHandler() {

8
src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.tile.grid;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.block.GridType;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
@@ -60,13 +60,13 @@ public class WirelessFluidGrid implements IGrid {
@Override
@Nullable
public INetworkMaster getNetwork() {
public INetwork getNetwork() {
World world = DimensionManager.getWorld(controllerDimension);
if (world != null) {
TileEntity tile = world.getTileEntity(controller);
return tile instanceof INetworkMaster ? (INetworkMaster) tile : null;
return tile instanceof INetwork ? (INetwork) tile : null;
}
return null;
@@ -210,7 +210,7 @@ public class WirelessFluidGrid implements IGrid {
@Override
public void onClosed(EntityPlayer player) {
INetworkMaster network = getNetwork();
INetwork network = getNetwork();
if (network != null) {
network.getNetworkItemHandler().onClose(player);

8
src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java
View File

@@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.tile.grid;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.block.GridType;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
@@ -88,13 +88,13 @@ public class WirelessGrid implements IGrid {
@Override
@Nullable
public INetworkMaster getNetwork() {
public INetwork getNetwork() {
World world = DimensionManager.getWorld(controllerDimension);
if (world != null) {
TileEntity tile = world.getTileEntity(controller);
return tile instanceof INetworkMaster ? (INetworkMaster) tile : null;
return tile instanceof INetwork ? (INetwork) tile : null;
}
return null;
@@ -246,7 +246,7 @@ public class WirelessGrid implements IGrid {
@Override
public void onClosed(EntityPlayer player) {
INetworkMaster network = getNetwork();
INetwork network = getNetwork();
if (network != null) {
network.getNetworkItemHandler().onClose(player);

4
src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java
View File

@@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.tile.grid.portable;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler;
import com.raoulvdberge.refinedstorage.api.storage.AccessType;
import com.raoulvdberge.refinedstorage.api.storage.IStorageDisk;
@@ -167,7 +167,7 @@ public class PortableGrid implements IGrid, IPortableGrid {
@Nullable
@Override
public INetworkMaster getNetwork() {
public INetwork getNetwork() {
return null;
}

4
src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java
View File

@@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.tile.grid.portable;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler;
import com.raoulvdberge.refinedstorage.api.storage.*;
import com.raoulvdberge.refinedstorage.apiimpl.network.grid.ItemGridHandlerPortable;
@@ -270,7 +270,7 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid,
@Nullable
@Override
public INetworkMaster getNetwork() {
public INetwork getNetwork() {
return null;
}