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

Fix bug

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-04-11 22:05:44 +02:00
parent 6afa1c3b24
commit 89f1a84a04
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ import net.minecraft.item.IItemPropertyGetter;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.*;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextComponentString;
@@ -133,12 +134,16 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) {
if (!world.isRemote && getDimensionId(stack) == player.dimension) {
TileController tile = (TileController) world.getTileEntity(new BlockPos(getX(stack), getY(stack), getZ(stack)));
TileEntity tile = world.getTileEntity(new BlockPos(getX(stack), getY(stack), getZ(stack)));
if (tile.onOpenWirelessGrid(player, hand)) {
return new ActionResult(EnumActionResult.SUCCESS, stack);
if (tile instanceof TileController) {
if (((TileController) tile).onOpenWirelessGrid(player, hand)) {
return new ActionResult(EnumActionResult.SUCCESS, stack);
} else {
player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.out_of_range")));
}
} else {
player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.out_of_range")));
player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_found")));
}
}

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

@@ -567,7 +567,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
}
public void handleStoragePull(int id, int flags, EntityPlayerMP player) {
if (id < 0 || id >= itemGroups.size() - 1) {
if (id < 0 || id > itemGroups.size() - 1) {
return;
}

1
src/main/resources/assets/refinedstorage/lang/en_US.lang
View File

@@ -37,6 +37,7 @@ misc.refinedstorage:wireless_grid.tooltip.0=X: %d
misc.refinedstorage:wireless_grid.tooltip.1=Y: %d
misc.refinedstorage:wireless_grid.tooltip.2=Z: %d
misc.refinedstorage:wireless_grid.out_of_range=Controller out of range.
misc.refinedstorage:wireless_grid.not_found=Controller not found.
misc.refinedstorage:yes=Yes
misc.refinedstorage:no=No

1
src/main/resources/assets/refinedstorage/lang/nl_NL.lang
View File

@@ -37,6 +37,7 @@ misc.refinedstorage:wireless_grid.tooltip.0=X: %d
misc.refinedstorage:wireless_grid.tooltip.1=Y: %d
misc.refinedstorage:wireless_grid.tooltip.2=Z: %d
misc.refinedstorage:wireless_grid.out_of_range=Controller buiten bereik.
misc.refinedstorage:wireless_grid.not_found=Controller niet gevonden.
misc.refinedstorage:yes=Ja
misc.refinedstorage:no=Nee