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

Fix some TODOs

Browse Source
This commit is contained in:
raoulvdberge
2019-10-16 19:37:30 +02:00
parent 73ccc830c3
commit 46bcea920c
27 changed files with 26 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IFluidGridHandler.java
View File

@@ -36,16 +36,6 @@ public interface IFluidGridHandler {
*/
void onInsertHeldContainer(ServerPlayerEntity player);
/**
* Called when the player shift clicks a container into the grid.
*
* @param player the player
* @param container the container
* @return the remainder container
*/
@Nonnull
ItemStack onShiftClick(ServerPlayerEntity player, ItemStack container);
/**
* Called when a player requests the crafting preview window to be opened.
*

11
src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IItemGridHandler.java
View File

@@ -42,17 +42,6 @@ public interface IItemGridHandler {
*/
void onInsertHeldItem(ServerPlayerEntity player, boolean single);
/**
* Called when the player shift clicks an item into the grid.
*
* @param player the player
* @param stack the stack
* @return the remainder, or an empty stack if there is no remainder
*/
// TODO Maybe remove?
@Nonnull
ItemStack onShiftClick(ServerPlayerEntity player, ItemStack stack);
/**
* Called when a player requests the crafting preview window to be opened.
*

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

@@ -107,12 +107,6 @@ public class FluidGridHandler implements IFluidGridHandler {
player.updateHeldItem();
}
@Override
@Nonnull
public ItemStack onShiftClick(ServerPlayerEntity player, ItemStack container) {
return onInsert(player, container);
}
@Override
public void onCraftingPreviewRequested(ServerPlayerEntity player, UUID id, int quantity, boolean noPreview) {
if (!network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)) {

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

@@ -136,11 +136,6 @@ public class ItemGridHandler implements IItemGridHandler {
network.insertItem(stack, size, Action.PERFORM);
stack.shrink(size);
// TODO Is this still needed?
if (stack.isEmpty()) {
player.inventory.setItemStack(ItemStack.EMPTY);
}
}
} else {
player.inventory.setItemStack(network.insertItem(stack, size, Action.PERFORM));
@@ -151,12 +146,6 @@ public class ItemGridHandler implements IItemGridHandler {
// TODO network.getNetworkItemHandler().drainEnergy(player, RS.INSTANCE.config.wirelessGridInsertUsage);
}
@Override
@Nonnull
public ItemStack onShiftClick(ServerPlayerEntity player, ItemStack stack) {
return onInsert(player, stack);
}
@Override
public void onCraftingPreviewRequested(ServerPlayerEntity player, UUID id, int quantity, boolean noPreview) {
if (!network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)) {

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

@@ -94,12 +94,6 @@ public class PortableFluidGridHandler implements IFluidGridHandler {
player.updateHeldItem();
}
@Override
@Nonnull
public ItemStack onShiftClick(ServerPlayerEntity player, ItemStack container) {
return onInsert(player, container);
}
@Override
public void onCraftingPreviewRequested(ServerPlayerEntity player, UUID id, int quantity, boolean noPreview) {
// NO OP

11
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java
View File

@@ -137,11 +137,6 @@ public class PortableItemGridHandler implements IItemGridHandler {
portableGrid.getItemStorage().insert(stack, size, Action.PERFORM);
stack.shrink(size);
// TODO ???
if (stack.isEmpty()) {
player.inventory.setItemStack(ItemStack.EMPTY);
}
}
} else {
player.inventory.setItemStack(portableGrid.getItemStorage().insert(stack, size, Action.PERFORM));
@@ -152,12 +147,6 @@ public class PortableItemGridHandler implements IItemGridHandler {
portableGrid.drainEnergy(RS.INSTANCE.config.portableGridInsertUsage);
}
@Override
@Nonnull
public ItemStack onShiftClick(ServerPlayerEntity player, ItemStack stack) {
return onInsert(player, stack);
}
@Override
public void onCraftingPreviewRequested(ServerPlayerEntity player, UUID id, int quantity, boolean noPreview) {
// NO OP

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

@@ -575,11 +575,6 @@ public class GridNetworkNode extends NetworkNode implements IGridNetworkAware, I
return processingMatrixFluids;
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public void read(CompoundNBT tag) {
super.read(tag);

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

@@ -123,11 +123,6 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor {
throttlingDisabled = true;
}
// @TODO: DELETE.
public boolean hasConnectivityState() {
return true;
}
@Override
public void update() {
++ticks;

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

@@ -354,11 +354,6 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
return upgrades;
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public int getType() {
return world.isRemote ? TileConstructor.TYPE.getValue() : type;

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

@@ -374,11 +374,6 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
return new CombinedInvWrapper(patternsInventory, upgrades);
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
@Nullable
public ICraftingPatternContainer getRootContainer() {

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

@@ -78,11 +78,6 @@ public class NetworkNodeCrafterManager extends NetworkNode {
this.searchBoxMode = searchBoxMode;
}
@Override
public boolean hasConnectivityState() {
return true;
}
public boolean isActive() {
return world.getBlockState(pos).get(NodeBlock.CONNECTED);
}

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

@@ -44,11 +44,6 @@ public class NetworkNodeCraftingMonitor extends NetworkNode implements ICrafting
return ID;
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public String getGuiTitle() {
return "gui.refinedstorage:crafting_monitor";

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

@@ -291,11 +291,6 @@ public class NetworkNodeDestructor extends NetworkNode implements IComparable, I
return itemFilters;
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public IItemHandler getDrops() {
return upgrades;

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

@@ -260,9 +260,4 @@ public class NetworkNodeFluidInterface extends NetworkNode {
public IItemHandler getDrops() {
return new CombinedInvWrapper(in, upgrades);
}
@Override
public boolean hasConnectivityState() {
return true;
}
}

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

@@ -226,9 +226,4 @@ public class NetworkNodeInterface extends NetworkNode implements IComparable {
public IItemHandler getDrops() {
return new CombinedInvWrapper(importItems, exportItems, upgrades);
}
@Override
public boolean hasConnectivityState() {
return true;
}
}

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

@@ -17,11 +17,6 @@ public class NetworkNodeNetworkReceiver extends NetworkNode {
return RS.INSTANCE.config.networkReceiverUsage;
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public ResourceLocation getId() {
return ID;

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

@@ -106,11 +106,6 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode {
return canUpdate() && receiver != null;
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public boolean shouldRebuildGraphOnChange() {
return true;

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

@@ -61,11 +61,6 @@ public class NetworkNodeReader extends NetworkNode implements IReader, IGuiReade
return world.getBlockState(pos).get(NodeBlock.CONNECTED);
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public void read(CompoundNBT tag) {
super.read(tag);

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

@@ -43,11 +43,6 @@ public class NetworkNodeRelay extends NetworkNode {
return canUpdate();
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public boolean shouldRebuildGraphOnChange() {
return true;

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

@@ -10,6 +10,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.security.SecurityCard;
import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler;
import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic;
import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener;
import com.raoulvdberge.refinedstorage.item.SecurityCardItem;
import com.raoulvdberge.refinedstorage.util.StackUtils;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
@@ -80,8 +81,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity
ItemStack stack = cardsInv.getStackInSlot(i);
if (!stack.isEmpty()) {
UUID uuid = null;/*TODO ItemSecurityCard.getOwner(stack)*/
;
UUID uuid = SecurityCardItem.getOwner(stack);
if (uuid == null) {
this.globalCard = createCard(stack, null);
@@ -98,7 +98,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity
SecurityCard card = new SecurityCard(uuid);
for (Permission permission : Permission.values()) {
card.getPermissions().put(permission, /*TODO ItemSecurityCard.hasPermission(stack, permission)*/false);
card.getPermissions().put(permission, SecurityCardItem.hasPermission(stack, permission));
}
return card;
@@ -146,7 +146,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity
ItemStack card = getEditCard().getStackInSlot(0);
if (!card.isEmpty()) {
// TODO ItemSecurityCard.setPermission(card, permission, state);
SecurityCardItem.setPermission(card, permission, state);
}
}
@@ -165,9 +165,4 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity
public IItemHandler getDrops() {
return new CombinedInvWrapper(cardsInv, editCard);
}
@Override
public boolean hasConnectivityState() {
return true;
}
}

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

@@ -204,11 +204,6 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl
return itemFilter;
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public void setRedstoneMode(RedstoneMode mode) {
// NO OP

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

@@ -80,11 +80,6 @@ public class NetworkNodeWirelessTransmitter extends NetworkNode implements IWire
return direction != null && Direction.DOWN.equals(direction);
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public void visit(Operator operator) {
operator.apply(world, pos.offset(Direction.DOWN), Direction.UP);

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

@@ -93,11 +93,6 @@ public class NetworkNodeWriter extends NetworkNode implements IWriter, IGuiReade
return world.getBlockState(pos).get(NodeBlock.CONNECTED);
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public void read(CompoundNBT tag) {
super.read(tag);

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

@@ -127,11 +127,6 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
return RS.INSTANCE.config.diskManipulatorUsage + upgrades.getEnergyUsage();
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public void update() {
super.update();

4
src/main/java/com/raoulvdberge/refinedstorage/container/GridContainer.java
View File

@@ -87,13 +87,13 @@ public class GridContainer extends BaseContainer implements ICraftingGridListene
IFluidGridHandler fluidHandler = grid.getFluidHandler();
if (fluidHandler != null) {
slot.putStack(fluidHandler.onShiftClick((ServerPlayerEntity) getPlayer(), stack));
slot.putStack(fluidHandler.onInsert((ServerPlayerEntity) getPlayer(), stack));
}
} else {
IItemGridHandler itemHandler = grid.getItemHandler();
if (itemHandler != null) {
slot.putStack(itemHandler.onShiftClick((ServerPlayerEntity) getPlayer(), stack));
slot.putStack(itemHandler.onInsert((ServerPlayerEntity) getPlayer(), stack));
} else if (slot instanceof CraftingGridSlot && mergeItemStack(stack, 14, 14 + (9 * 4), false)) {
slot.onSlotChanged();

11
src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterManagerSearchBoxModeSideButton.java
View File

@@ -1,6 +1,7 @@
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.integration.jei.JeiIntegration;
import com.raoulvdberge.refinedstorage.screen.GuiCrafterManager;
import com.raoulvdberge.refinedstorage.tile.TileCrafterManager;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
@@ -31,11 +32,11 @@ public class CrafterManagerSearchBoxModeSideButton extends SideButton {
if (mode == IGrid.SEARCH_BOX_MODE_NORMAL) {
mode = IGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED;
} else if (mode == IGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED) {
//TODO if (IntegrationJEI.isLoaded()) {
// mode = IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED;
//} else {
mode = IGrid.SEARCH_BOX_MODE_NORMAL;
//}
if (JeiIntegration.isLoaded()) {
mode = IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED;
} else {
mode = IGrid.SEARCH_BOX_MODE_NORMAL;
}
} else if (mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED) {
mode = IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED;
} else if (mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED) {

25
src/main/java/com/raoulvdberge/refinedstorage/tile/grid/GridTile.java
View File

@@ -10,10 +10,16 @@ import com.raoulvdberge.refinedstorage.tile.config.IType;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
import com.raoulvdberge.refinedstorage.util.GridUtils;
import net.minecraft.network.datasync.DataSerializers;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class GridTile extends NetworkNodeTile<GridNetworkNode> {
public static final TileDataParameter<Integer, GridTile> VIEW_TYPE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getViewType(), (t, v) -> {
@@ -75,6 +81,8 @@ public class GridTile extends NetworkNodeTile<GridNetworkNode> {
private final GridType type;
private LazyOptional<IItemHandler> diskCapability = LazyOptional.of(() -> getNode().getPatterns());
public GridTile(GridType type) {
super(GridUtils.getTileEntityType(type));
@@ -98,18 +106,13 @@ public class GridTile extends NetworkNodeTile<GridNetworkNode> {
return new GridNetworkNode(world, pos, type);
}
/* TODO
@Nonnull
@Override
public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable Direction side) {
return (getNode().getGridType() == GridType.PATTERN && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) || super.hasCapability(capability, side);
}
@Override
public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable Direction side) {
if (getNode().getGridType() == GridType.PATTERN && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(getNode().getPatterns());
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction direction) {
if (cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && type == GridType.PATTERN) {
return diskCapability.cast();
}
return super.getCapability(capability, side);
}*/
return super.getCapability(cap, direction);
}
}