diff --git a/src/main/java/gregtechmod/api/events/GT_ScannerEvent.java b/src/main/java/gregtechmod/api/events/GT_ScannerEvent.java index 03d83fd..cc04bc6 100644 --- a/src/main/java/gregtechmod/api/events/GT_ScannerEvent.java +++ b/src/main/java/gregtechmod/api/events/GT_ScannerEvent.java @@ -2,11 +2,11 @@ package gregtechmod.api.events; import java.util.ArrayList; +import cpw.mods.fml.common.eventhandler.Cancelable; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.world.WorldEvent; @Cancelable diff --git a/src/main/java/gregtechmod/api/gui/GT_Container.java b/src/main/java/gregtechmod/api/gui/GT_Container.java index 69f9ff6..61a8f27 100644 --- a/src/main/java/gregtechmod/api/gui/GT_Container.java +++ b/src/main/java/gregtechmod/api/gui/GT_Container.java @@ -105,7 +105,7 @@ public class GT_Container extends Container { if (!(inventorySlots.get(aSlotIndex) instanceof GT_Slot_Armor)) if (aSlotIndex < getAllSlotCount()) if (aSlotIndex < getSlotStartIndex() || aSlotIndex >= getSlotStartIndex() + getSlotCount()) return null; } - try {return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);} catch (Throwable e) {e.printStackTrace(GT_Log.err);} + try {return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);} catch (Throwable e) {GT_Log.log.catching(e);} ItemStack rStack = null; InventoryPlayer aPlayerInventory = aPlayer.inventory; @@ -371,7 +371,7 @@ public class GT_Container extends Container { try { return super.addSlotToContainer(par1Slot); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } return par1Slot; } @@ -381,7 +381,7 @@ public class GT_Container extends Container { try { super.addCraftingToCrafters(par1ICrafting); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } } @@ -390,7 +390,7 @@ public class GT_Container extends Container { try { return super.getInventory(); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } return null; } @@ -400,7 +400,7 @@ public class GT_Container extends Container { try { super.removeCraftingFromCrafters(par1ICrafting); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } } @@ -409,7 +409,7 @@ public class GT_Container extends Container { try { super.detectAndSendChanges(); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } } @@ -418,7 +418,7 @@ public class GT_Container extends Container { try { return super.enchantItem(par1EntityPlayer, par2); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } return false; } @@ -428,7 +428,7 @@ public class GT_Container extends Container { try { return super.getSlotFromInventory(par1IInventory, par2); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } return null; } @@ -438,7 +438,7 @@ public class GT_Container extends Container { try { return super.getSlot(par1); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } return null; } @@ -448,7 +448,7 @@ public class GT_Container extends Container { try { return super.func_94530_a(par1ItemStack, par2Slot); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } return true; } @@ -458,7 +458,7 @@ public class GT_Container extends Container { try { super.retrySlotClick(par1, par2, par3, par4EntityPlayer); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } } @@ -467,7 +467,7 @@ public class GT_Container extends Container { try { super.onContainerClosed(par1EntityPlayer); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } } @@ -476,7 +476,7 @@ public class GT_Container extends Container { try { super.onCraftMatrixChanged(par1IInventory); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } } @@ -485,7 +485,7 @@ public class GT_Container extends Container { try { super.putStackInSlot(par1, par2ItemStack); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } } @@ -494,7 +494,7 @@ public class GT_Container extends Container { try { super.putStacksInSlots(par1ArrayOfItemStack); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } } @@ -503,7 +503,7 @@ public class GT_Container extends Container { try { super.updateProgressBar(par1, par2); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } } @@ -512,7 +512,7 @@ public class GT_Container extends Container { try { return super.getNextTransactionID(par1InventoryPlayer); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } return 0; } @@ -522,7 +522,7 @@ public class GT_Container extends Container { try { return super.isPlayerNotUsingContainer(par1EntityPlayer); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } return true; } @@ -532,7 +532,7 @@ public class GT_Container extends Container { try { super.setPlayerIsPresent(par1EntityPlayer, par2); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } } @@ -541,7 +541,7 @@ public class GT_Container extends Container { try { super.func_94533_d(); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } } @@ -550,7 +550,7 @@ public class GT_Container extends Container { try { return super.canDragIntoSlot(par1Slot); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } return true; }