Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 08:48:34 +01:00
Code Issues Projects Releases Wiki Activity

Closes #911

Browse source
This commit is contained in:
Shadows_of_Fire 2017-08-27 21:12:18 -04:00
parent 228cd55387
commit 1abb89c512
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java
View file

@ -43,6 +43,7 @@ public class BlockGreenhouseGlass extends BlockContainerBase{
} }
@Override @Override
@Deprecated
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side){ public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side){
IBlockState otherState = world.getBlockState(pos.offset(side)); IBlockState otherState = world.getBlockState(pos.offset(side));

12
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java
View file

@ -60,16 +60,16 @@ public class ItemChestToCrateUpgrade extends ItemBase{
ItemStack[] stacks = new ItemStack[chest.getSlots()]; ItemStack[] stacks = new ItemStack[chest.getSlots()];
for(int i = 0; i < stacks.length; i++){ for(int i = 0; i < stacks.length; i++){
ItemStack aStack = chest.getStackInSlot(i); ItemStack aStack = chest.getStackInSlot(i);
if(StackUtil.isValid(aStack)){
stacks[i] = aStack.copy(); stacks[i] = aStack.copy();
} }
}
//Set New Block //Set New Block
world.playEvent(2001, pos, Block.getStateId(world.getBlockState(pos))); world.playEvent(2001, pos, Block.getStateId(world.getBlockState(pos)));
world.removeTileEntity(pos); world.removeTileEntity(pos);
world.setBlockState(pos, this.end, 2); world.setBlockState(pos, this.end, 2);
if(!player.capabilities.isCreativeMode)
heldStack.shrink(1);
//Copy Items into new Chest //Copy Items into new Chest
TileEntity newTileHit = world.getTileEntity(pos); TileEntity newTileHit = world.getTileEntity(pos);
@ -84,17 +84,13 @@ public class ItemChestToCrateUpgrade extends ItemBase{
} }
} }
} }
if(!player.capabilities.isCreativeMode){
player.setHeldItem(hand, StackUtil.addStackSize(heldStack, -1));
} }
} }
} return EnumActionResult.SUCCESS;
return world.isRemote ? EnumActionResult.PASS : EnumActionResult.SUCCESS;
} }
} }
return super.onItemUseFirst(player, world, pos, side, hitX, hitY, hitZ, hand); return EnumActionResult.PASS;
} }
@Override @Override

2
src/main/java/de/ellpeck/actuallyadditions/mod/util/AwfulUtil.java
View file

@ -101,7 +101,7 @@ public final class AwfulUtil{
int i = 0; int i = 0;
String error = "Actually Additions: Something is incredibly wrong. I don't know what you did, or how this method got called. But something is just completely wrong. This method was provided with "; String error = "Actually Additions: Something is incredibly wrong. I don't know what you did, or how this method got called. But something is just completely wrong. This method was provided with ";
for(Object k : stuff) { for(Object k : stuff) {
error += ("\n" + i++ + ":" + (k == null ? "null" : (k.getClass() + "<- CLASS | INSTANCE ->" + k.toString() + ", "))); error += ("\n" + i++ + ": " + (k == null ? "null" : (k.getClass().getSimpleName() + " <- CLASS | INSTANCE -> " + k.toString() + ", ")));
} }
error += "\n" + "The current side is: " + FMLCommonHandler.instance().getEffectiveSide(); error += "\n" + "The current side is: " + FMLCommonHandler.instance().getEffectiveSide();
throw new IllegalStateException(error); throw new IllegalStateException(error);