Compare commits

...
4 Commits
5 changed files with 14 additions and 21 deletions

No files matched your search

+1 -1
View File
@@ -7,4 +7,4 @@ ic2_version=2.5.5-ex19
version_major=5
version_minor=0
version_patch=14
version_patch=15
@@ -119,7 +119,7 @@ public final class CommandSaveStats extends SubCommand {
}
}
File file = new File(Proxies.common.getForestryRoot(), "config/" + Constants.MOD_ID + "/stats/" + player.getDisplayName() + '-' + saveHelper.getFileSuffix() + ".log");
File file = new File(Proxies.common.getForestryRoot(), "config/" + Constants.MOD_ID + "/stats/" + player.getDisplayNameString() + '-' + saveHelper.getFileSuffix() + ".log");
try {
File folder = file.getParentFile();
if (folder != null && !folder.exists()) {
@@ -154,27 +154,21 @@ public class InventoryAdapter implements IInventoryAdapter, IStreamable {
}
/* ISIDEDINVENTORY */
private int[][] slotMap;
private int[] slotMap;
@Override
public int[] getSlotsForFace(EnumFacing side) {
if (allowAutomation) {
return slotMap[side.ordinal()];
return slotMap;
}
return Constants.SLOTS_NONE;
}
private void configureSided() {
slotMap = new int[6][0];
int count = getSizeInventory();
int[] slots = new int[count];
slotMap = new int[count];
for (int i = 0; i < count; i++) {
slots[i] = i;
}
for (EnumFacing side : EnumFacing.VALUES) {
slotMap[side.getIndex()] = slots;
slotMap[i] = i;
}
}
@@ -27,10 +27,10 @@ public class ItemWrench extends ItemForestry {//implements IToolWrench {
}
@Override
public EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) {
Block block = world.getBlockState(pos).getBlock();
if (block.rotateBlock(world, pos, side)) {
player.swingArm(hand);
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
Block block = worldIn.getBlockState(pos).getBlock();
if (block.rotateBlock(worldIn, pos, facing)) {
playerIn.swingArm(hand);
return EnumActionResult.SUCCESS;
}
return EnumActionResult.FAIL;
@@ -97,11 +97,10 @@ public class ItemBackpack extends ItemWithGui implements IColoredItem {
@Override
public EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) {
// We only do this when shift is clicked
if (!player.isSneaking()) {
return EnumActionResult.FAIL;
if (player.isSneaking()) {
return evaluateTileHit(stack, player, world, pos, side) ? EnumActionResult.PASS : EnumActionResult.FAIL;
}
return evaluateTileHit(stack, player, world, pos, side) ? EnumActionResult.PASS : EnumActionResult.FAIL;
return super.onItemUseFirst(stack, player, world, pos, side, hitX, hitY, hitZ, hand);
}
public static void tryStowing(EntityPlayer player, ItemStack backpackStack, ItemStack stack) {
@@ -138,7 +137,7 @@ public class ItemBackpack extends ItemWithGui implements IColoredItem {
private static IItemHandler getInventoryHit(World world, BlockPos pos, EnumFacing side) {
TileEntity targeted = world.getTileEntity(pos);
return TileUtil.getInventoryFromTile(targeted, side);
return TileUtil.getInventoryFromTile(targeted, null);
}
private boolean evaluateTileHit(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side) {