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

Fix wireless grid RF

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-04-01 17:06:44 +02:00
parent eafcce4b6a
commit ef79be6f3f
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/refinedstorage/item/ItemWirelessGrid.java
View File

@@ -29,6 +29,10 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
public static final String NBT_SORTING_DIRECTION = "SortingDirection";
public static final String NBT_SEARCH_BOX_MODE = "SearchBoxMode";
public static final int USAGE_OPEN = 30;
public static final int USAGE_PULL = 3;
public static final int USAGE_PUSH = 3;
public ItemWirelessGrid() {
super(3200);
@@ -49,7 +53,7 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
@Override
public double getDurabilityForDisplay(ItemStack stack) {
return 1 - (getEnergyStored(stack) / getMaxEnergyStored(stack));
return 1d - ((double) getEnergyStored(stack) / (double) getMaxEnergyStored(stack));
}
@Override
@@ -64,6 +68,8 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) {
list.add(I18n.translateToLocalFormatted("misc.refinedstorage:energy_stored", getEnergyStored(stack), getMaxEnergyStored(stack)));
if (isValid(stack)) {
list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip.0", getX(stack)));
list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip.1", getY(stack)));

3
src/main/java/refinedstorage/network/MessageStoragePull.java
View File

@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import refinedstorage.item.ItemWirelessGrid;
import refinedstorage.storage.StorageItem;
import refinedstorage.tile.TileController;
@@ -101,7 +102,7 @@ public class MessageStoragePull extends MessageHandlerPlayerToServer<MessageStor
player.updateHeldItem();
}
controller.drainEnergyFromWirelessGrid(player, 300);
controller.drainEnergyFromWirelessGrid(player, ItemWirelessGrid.USAGE_PULL);
}
}
}

3
src/main/java/refinedstorage/network/MessageStoragePush.java
View File

@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import refinedstorage.item.ItemWirelessGrid;
import refinedstorage.tile.TileController;
public class MessageStoragePush extends MessageHandlerPlayerToServer<MessageStoragePush> implements IMessage {
@@ -83,6 +84,8 @@ public class MessageStoragePush extends MessageHandlerPlayerToServer<MessageStor
player.inventory.setInventorySlotContents(message.slot, null);
}
}
controller.drainEnergyFromWirelessGrid(player, ItemWirelessGrid.USAGE_PUSH);
}
}
}

4
src/main/java/refinedstorage/tile/TileController.java
View File

@@ -273,8 +273,10 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
public void onOpenWirelessGrid(EntityPlayer player, EnumHand hand) {
wirelessGridConsumers.add(new WirelessGridConsumer(player, hand, player.getHeldItem(hand)));
player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_GRID, worldObj, HandUtils.getIdFromHand(hand), 0, 0);
drainEnergyFromWirelessGrid(player, 100);
drainEnergyFromWirelessGrid(player, ItemWirelessGrid.USAGE_OPEN);
}
public void onCloseWirelessGrid(EntityPlayer player) {