From 0669f5eb9d5029a8b94ec552171b0837605f7747 Mon Sep 17 00:00:00 2001 From: draknyte1 Date: Fri, 4 Nov 2016 15:23:26 +1000 Subject: $ Cleaned up the entire project. > Much neat, very nices. --- .../core/handler/events/LoginEventHandler.java | 127 +++++++-------- .../events/PickaxeBlockBreakEventHandler.java | 63 ++++---- .../handler/events/UnbreakableBlockManager.java | 175 ++++++++++----------- 3 files changed, 183 insertions(+), 182 deletions(-) (limited to 'src/Java/gtPlusPlus/core/handler/events') diff --git a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java index 90f231faf4..0e38e91ddb 100644 --- a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java +++ b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java @@ -13,12 +13,12 @@ import net.minecraft.entity.player.EntityPlayerMP; public class LoginEventHandler { - public String localPlayersName; - public UUID localPlayersUUID; - private EntityPlayer localPlayerRef; + public String localPlayersName; + public UUID localPlayersUUID; + private EntityPlayer localPlayerRef; @SubscribeEvent - public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) { + public void onPlayerLogin(final PlayerEvent.PlayerLoggedInEvent event) { this.localPlayerRef = event.player; this.localPlayersName = event.player.getDisplayName(); @@ -26,68 +26,71 @@ public class LoginEventHandler { try { + if (this.localPlayerRef instanceof EntityPlayerMP && this.localPlayerRef != null) { - if (localPlayerRef instanceof EntityPlayerMP && localPlayerRef != null){ - - //Populates player cache - if (!localPlayerRef.worldObj.isRemote){ - PlayerCache.appendParamChanges(localPlayersName, localPlayersUUID.toString()); - - if (!CORE.isModUpToDate){ - Utils.LOG_INFO("You're not using the latest recommended version of GT++, consider updating."); - Utils.LOG_INFO("Latest version is: "+CORE.MASTER_VERSION); - Utils.LOG_INFO("You currently have: "+CORE.VERSION); - PlayerUtils.messagePlayer(localPlayerRef, "You're not using the latest recommended version of GT++, consider updating."); - } - else { - Utils.LOG_INFO("You're using the latest recommended version of GT++."); - } - - } - - - /*if (localPlayerRef.getCommandSenderName().toLowerCase().equalsIgnoreCase("ImQ009") || localPlayerRef.getCommandSenderName().toLowerCase().contains("player")){ - Utils.LOG_INFO("Spawning a new Santa Thread."); - Thread t = new Thread() { - UUID threadHandlerIDthing = localPlayersUUID; - @Override - public void run() { - while(true && Minecraft.getMinecraft().getIntegratedServer() != null) { - try { - if(localPlayerRef == null){ - localPlayerRef = Utils.getPlayerOnServerFromUUID(threadHandlerIDthing); - } - - - //ImQ009 is a legend. - if (localPlayerRef.getCommandSenderName().toLowerCase().equalsIgnoreCase("ImQ009")){ - Utils.messagePlayer(localPlayerRef, "Enjoy some complimentary Raisin Bread."); - localPlayerRef.inventory.addItemStackToInventory(UtilsItems.getSimpleStack(ModItems.itemIngotRaisinBread, MathUtils.randInt(1, 5))); - } + // Populates player cache + if (!this.localPlayerRef.worldObj.isRemote) { + PlayerCache.appendParamChanges(this.localPlayersName, this.localPlayersUUID.toString()); + if (!CORE.isModUpToDate) { + Utils.LOG_INFO("You're not using the latest recommended version of GT++, consider updating."); + Utils.LOG_INFO("Latest version is: " + CORE.MASTER_VERSION); + Utils.LOG_INFO("You currently have: " + CORE.VERSION); + PlayerUtils.messagePlayer(this.localPlayerRef, + "You're not using the latest recommended version of GT++, consider updating."); + } + else { + Utils.LOG_INFO("You're using the latest recommended version of GT++."); + } - if (localPlayerRef.getCommandSenderName().toLowerCase().contains("player")){ - Utils.messagePlayer(localPlayerRef, "Enjoy some complimentary Raisin Bread."); - localPlayerRef.inventory.addItemStackToInventory(UtilsItems.getSimpleStack(ModItems.itemIngotRaisinBread, MathUtils.randInt(1, 5))); - } - Thread.sleep(1000*60*MathUtils.randInt(15, 90)); - } catch (InterruptedException ie) { - Utils.LOG_INFO("Santa Mode Disabled."); - } - } - - Utils.LOG_INFO("Thread Stopped. Handler Closed."); - - } - }; - //t.start(); - - - }*/ - + } - } - } catch (Throwable errr){ + /* + * if (localPlayerRef.getCommandSenderName().toLowerCase(). + * equalsIgnoreCase("ImQ009") || + * localPlayerRef.getCommandSenderName().toLowerCase().contains( + * "player")){ Utils.LOG_INFO("Spawning a new Santa Thread."); + * Thread t = new Thread() { UUID threadHandlerIDthing = + * localPlayersUUID; + * + * @Override public void run() { while(true && + * Minecraft.getMinecraft().getIntegratedServer() != null) { try + * { if(localPlayerRef == null){ localPlayerRef = + * Utils.getPlayerOnServerFromUUID(threadHandlerIDthing); } + * + * + * //ImQ009 is a legend. if + * (localPlayerRef.getCommandSenderName().toLowerCase(). + * equalsIgnoreCase("ImQ009")){ + * Utils.messagePlayer(localPlayerRef, + * "Enjoy some complimentary Raisin Bread."); + * localPlayerRef.inventory.addItemStackToInventory(UtilsItems. + * getSimpleStack(ModItems.itemIngotRaisinBread, + * MathUtils.randInt(1, 5))); } + * + * + * if + * (localPlayerRef.getCommandSenderName().toLowerCase().contains + * ("player")){ Utils.messagePlayer(localPlayerRef, + * "Enjoy some complimentary Raisin Bread."); + * localPlayerRef.inventory.addItemStackToInventory(UtilsItems. + * getSimpleStack(ModItems.itemIngotRaisinBread, + * MathUtils.randInt(1, 5))); } + * Thread.sleep(1000*60*MathUtils.randInt(15, 90)); } catch + * (InterruptedException ie) { Utils.LOG_INFO( + * "Santa Mode Disabled."); } } + * + * Utils.LOG_INFO("Thread Stopped. Handler Closed."); + * + * } }; //t.start(); + * + * + * } + */ + + } + } + catch (final Throwable errr) { Utils.LOG_INFO("Login Handler encountered an error."); } diff --git a/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java index 1bbfd13123..5c962a5d2f 100644 --- a/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java +++ b/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java @@ -16,36 +16,38 @@ import net.minecraftforge.event.world.BlockEvent.BreakEvent; public class PickaxeBlockBreakEventHandler { @SubscribeEvent - public void onBreakBlock(BreakEvent event) { - try{ - TileEntity entity = event.world.getTileEntity(event.x, event.y, event.z); - if (entity != null && !entity.equals(null)){ - EntityPlayer playerInternal = event.getPlayer(); + public void onBreakBlock(final BreakEvent event) { + try { + final TileEntity entity = event.world.getTileEntity(event.x, event.y, event.z); + if (entity != null && !entity.equals(null)) { + final EntityPlayer playerInternal = event.getPlayer(); Utils.LOG_WARNING(entity.getClass().getSimpleName()); - if (entity.getClass().getSimpleName().equals("")){ + if (entity.getClass().getSimpleName().equals("")) { } - if (entity instanceof BaseTileEntity && !(entity instanceof BaseMetaPipeEntity)){ - IMetaTileEntity X = ((BaseMetaTileEntity)entity).getMetaTileEntity(); - Block ThisBlock = X.getBaseMetaTileEntity().getBlock(event.x, event.y, event.z); - if (X instanceof GregtechMetaSafeBlockBase){ + if (entity instanceof BaseTileEntity && !(entity instanceof BaseMetaPipeEntity)) { + final IMetaTileEntity X = ((BaseMetaTileEntity) entity).getMetaTileEntity(); + final Block ThisBlock = X.getBaseMetaTileEntity().getBlock(event.x, event.y, event.z); + if (X instanceof GregtechMetaSafeBlockBase) { - UUID ownerUUID = ((GregtechMetaSafeBlockBase)X).ownerUUID; - UUID accessorUUID = playerInternal.getUniqueID(); - Utils.LOG_WARNING("Owner UUID: "+ownerUUID); - Utils.LOG_WARNING("Accessor UUID: "+accessorUUID); + final UUID ownerUUID = ((GregtechMetaSafeBlockBase) X).ownerUUID; + final UUID accessorUUID = playerInternal.getUniqueID(); + Utils.LOG_WARNING("Owner UUID: " + ownerUUID); + Utils.LOG_WARNING("Accessor UUID: " + accessorUUID); - if (((GregtechMetaSafeBlockBase)X).bUnbreakable){ - - Utils.LOG_INFO("UUID info. Accessor: "+accessorUUID + " | Owner: "+ownerUUID); - - if (accessorUUID == ownerUUID){ - PlayerUtils.messagePlayer(playerInternal, "Since you own this block, it has been destroyed."); + if (((GregtechMetaSafeBlockBase) X).bUnbreakable) { + + Utils.LOG_INFO("UUID info. Accessor: " + accessorUUID + " | Owner: " + ownerUUID); + + if (accessorUUID == ownerUUID) { + PlayerUtils.messagePlayer(playerInternal, + "Since you own this block, it has been destroyed."); event.setCanceled(false); } else { event.setCanceled(true); - PlayerUtils.messagePlayer(playerInternal, "Since you do not own this block, it has not been destroyed."); + PlayerUtils.messagePlayer(playerInternal, + "Since you do not own this block, it has not been destroyed."); } // } @@ -54,16 +56,17 @@ public class PickaxeBlockBreakEventHandler { } } - catch (NullPointerException e) { - System.out.print("Caught a NullPointerException involving Safe Blocks. Cause: "+e.getCause()); + catch (final NullPointerException e) { + System.out.print("Caught a NullPointerException involving Safe Blocks. Cause: " + e.getCause()); } } - - + @SubscribeEvent - public void onPlayerInteraction(PlayerInteractEvent aEvent) { - if (aEvent.entityPlayer != null && aEvent.entityPlayer.worldObj != null && aEvent.action != null && aEvent.world.provider != null && !aEvent.entityPlayer.worldObj.isRemote && aEvent.action != null && aEvent.action != PlayerInteractEvent.Action.RIGHT_CLICK_AIR) { - //Utils.LOG_ERROR("Test"); - } - } + public void onPlayerInteraction(final PlayerInteractEvent aEvent) { + if (aEvent.entityPlayer != null && aEvent.entityPlayer.worldObj != null && aEvent.action != null + && aEvent.world.provider != null && !aEvent.entityPlayer.worldObj.isRemote && aEvent.action != null + && aEvent.action != PlayerInteractEvent.Action.RIGHT_CLICK_AIR) { + // Utils.LOG_ERROR("Test"); + } + } } diff --git a/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java b/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java index 4abffed1bc..a7c25266ff 100644 --- a/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java +++ b/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java @@ -8,128 +8,123 @@ import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -public class UnbreakableBlockManager{ +public class UnbreakableBlockManager { private static boolean hasRun = false; - public final BaseMetaTileEntity getmTileEntity() { - return mTileEntity; - } - - - public final void setmTileEntity(BaseMetaTileEntity mTileEntity/*, EntityPlayer aPlayer*/) { - UnbreakableBlockManager.mTileEntity = mTileEntity; - if (!hasRun){ - hasRun = true; - makeIndestructible(/*aPlayer*/); - } - else { - Utils.LOG_WARNING("Why do you run twice?"); - } - } - - - //BaseMetaTileEntity - //GregtechMetaSafeBlock + // BaseMetaTileEntity + // GregtechMetaSafeBlock private static BaseMetaTileEntity mTileEntity = null; + private static void innerInvincible(final GregtechMetaSafeBlock MetaSafeBlock, final TileEntity entity, + final World TE_WORLD, /* EntityPlayer aPlayer, */ final int X, final int Y, final int Z) { + if (entity != null && !entity.equals(null)) { + Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); + Utils.LOG_WARNING("Grabbed TE: " + entity.toString()); - private void makeIndestructible(/*EntityPlayer aPlayer*/){ - - - Utils.LOG_WARNING("Initializing the code to set this TE to -1 hardness and make it indestructible."); - int X = ((BaseMetaTileEntity)mTileEntity).xCoord; //(GregtechMetaSafeBlock) this.mTileEntity.getXCoord(); - int Y = ((BaseMetaTileEntity)mTileEntity).yCoord; - int Z = ((BaseMetaTileEntity)mTileEntity).zCoord; - Utils.LOG_WARNING("Grabbing TileEntity @ [x,y,z] |"+X+"|"+Y+"|"+Z+"|"); - - - - try{ - GregtechMetaSafeBlock MetaSafeBlock = ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()); - TileEntity BaseMetaTileEntity = ((BaseMetaTileEntity)mTileEntity).getTileEntity(X, Y, Z); - //MetaSafeBlockBase. - World TE_WORLD = MetaSafeBlock.getBaseMetaTileEntity().getWorld(); - Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); - TileEntity entity = BaseMetaTileEntity; - innerInvincible(MetaSafeBlock, entity, TE_WORLD, /*aPlayer,*/ X, Y, Z); - } - catch (NullPointerException e) { - System.out.print("Caught a NullPointerException involving Safe Blocks. Cause: "); - e.printStackTrace(); - } - } - - - private static void innerInvincible(GregtechMetaSafeBlock MetaSafeBlock, TileEntity entity, World TE_WORLD, /*EntityPlayer aPlayer,*/ int X, int Y, int Z){ - if (entity != null && !entity.equals(null)){ - Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); - Utils.LOG_WARNING("Grabbed TE: "+entity.toString()); - - - - - if (entity instanceof BaseTileEntity && !(entity instanceof BaseMetaPipeEntity)){ - IMetaTileEntity I = ((BaseMetaTileEntity)entity).getMetaTileEntity(); - Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); - Utils.LOG_WARNING("I Details: "+I.getMetaName()+" | "+I.getTileEntityBaseType()+" | "+I.toString()); - + if (entity instanceof BaseTileEntity && !(entity instanceof BaseMetaPipeEntity)) { + final IMetaTileEntity I = ((BaseMetaTileEntity) entity).getMetaTileEntity(); + Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); + Utils.LOG_WARNING( + "I Details: " + I.getMetaName() + " | " + I.getTileEntityBaseType() + " | " + I.toString()); + if (I instanceof GregtechMetaSafeBlock) { + Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); + final Block ThisBlock = I.getBaseMetaTileEntity().getBlock(X, Y, Z); + Utils.LOG_WARNING("Block Details: " + ThisBlock.toString()); - - if (I instanceof GregtechMetaSafeBlock){ - Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); - - Block ThisBlock = I.getBaseMetaTileEntity().getBlock(X, Y, Z); - Utils.LOG_WARNING("Block Details: "+ThisBlock.toString()); - - - if (((GregtechMetaSafeBlock)I).bUnbreakable){ + if (((GregtechMetaSafeBlock) I).bUnbreakable) { ThisBlock.setHardness(Integer.MAX_VALUE); - //ThisBlock.setResistance(18000000.0F); + // ThisBlock.setResistance(18000000.0F); ThisBlock.setResistance(-1); ThisBlock.setBlockUnbreakable(); - Utils.LOG_WARNING("Changing State of Flag. Old Value="+MetaSafeBlock.bUnbreakable+" Expected Value=true"); + Utils.LOG_WARNING("Changing State of Flag. Old Value=" + MetaSafeBlock.bUnbreakable + + " Expected Value=true"); MetaSafeBlock.bUnbreakable = true; - //entity.markDirty(); - Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); + // entity.markDirty(); + Utils.LOG_WARNING( + "Checking new State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); Utils.LOG_ERROR("New Indestructible Flag enabled."); - //GT_Utility.sendChatToPlayer(aPlayer, "Block is now unbreakable."); + // GT_Utility.sendChatToPlayer(aPlayer, "Block is now + // unbreakable."); } - - - else { ThisBlock.setHardness(1); ThisBlock.setResistance(1.0F); - Utils.LOG_WARNING("Changing State of Flag. Old Value="+MetaSafeBlock.bUnbreakable+" Expected Value=false"); + Utils.LOG_WARNING("Changing State of Flag. Old Value=" + MetaSafeBlock.bUnbreakable + + " Expected Value=false"); MetaSafeBlock.bUnbreakable = false; - //entity.markDirty(); - Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); + // entity.markDirty(); + Utils.LOG_WARNING( + "Checking new State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); Utils.LOG_ERROR("New Indestructible Flag disabled."); - //GT_Utility.sendChatToPlayer(aPlayer, "Block is now breakable."); + // GT_Utility.sendChatToPlayer(aPlayer, "Block is now + // breakable."); } - //entity.markDirty(); + // entity.markDirty(); - Utils.LOG_WARNING("Block Hardness: "+ThisBlock.getBlockHardness(TE_WORLD, X, Y, Z)); - Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); - hasRun = false; + Utils.LOG_WARNING("Block Hardness: " + ThisBlock.getBlockHardness(TE_WORLD, X, Y, Z)); + Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); + UnbreakableBlockManager.hasRun = false; } else { Utils.LOG_WARNING("I is not an instanceof MetaSafeBlockBase"); - Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); + Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); } - } else { + } + else { Utils.LOG_WARNING("TE is not an instanceof BaseTileEntity or may be a pipe."); - Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); + Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); } - }else { + } + else { Utils.LOG_WARNING("Did not grab a TE instance to make a block instance from."); - Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); + Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); + } + } + + public final BaseMetaTileEntity getmTileEntity() { + return UnbreakableBlockManager.mTileEntity; + } + + private void makeIndestructible(/* EntityPlayer aPlayer */) { + + Utils.LOG_WARNING("Initializing the code to set this TE to -1 hardness and make it indestructible."); + final int X = UnbreakableBlockManager.mTileEntity.xCoord; // (GregtechMetaSafeBlock) + // this.mTileEntity.getXCoord(); + final int Y = UnbreakableBlockManager.mTileEntity.yCoord; + final int Z = UnbreakableBlockManager.mTileEntity.zCoord; + Utils.LOG_WARNING("Grabbing TileEntity @ [x,y,z] |" + X + "|" + Y + "|" + Z + "|"); + + try { + final GregtechMetaSafeBlock MetaSafeBlock = (GregtechMetaSafeBlock) UnbreakableBlockManager.mTileEntity + .getMetaTileEntity(); + final TileEntity BaseMetaTileEntity = UnbreakableBlockManager.mTileEntity.getTileEntity(X, Y, Z); + // MetaSafeBlockBase. + final World TE_WORLD = MetaSafeBlock.getBaseMetaTileEntity().getWorld(); + Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); + final TileEntity entity = BaseMetaTileEntity; + UnbreakableBlockManager.innerInvincible(MetaSafeBlock, entity, TE_WORLD, /* aPlayer, */ X, Y, Z); + } + catch (final NullPointerException e) { + System.out.print("Caught a NullPointerException involving Safe Blocks. Cause: "); + e.printStackTrace(); + } + } + + public final void setmTileEntity( + final BaseMetaTileEntity mTileEntity/* , EntityPlayer aPlayer */) { + UnbreakableBlockManager.mTileEntity = mTileEntity; + if (!UnbreakableBlockManager.hasRun) { + UnbreakableBlockManager.hasRun = true; + this.makeIndestructible(/* aPlayer */); + } + else { + Utils.LOG_WARNING("Why do you run twice?"); } } -- cgit