diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
5 files changed, 53 insertions, 133 deletions
diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java index 1537aec736..195240958f 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java @@ -1,7 +1,5 @@ package gtPlusPlus.core.block.machine; -import static gregtech.api.enums.Mods.BuildCraftCore; -import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.GTPlusPlus; import net.minecraft.block.BlockContainer; @@ -27,7 +25,6 @@ import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import ic2.core.item.tool.ItemToolWrench; @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = Mods.Names.ENDER_I_O) @@ -121,40 +118,17 @@ public class BlockProjectTable extends BlockContainer implements ITileTooltip { if (item.getItem() instanceof ItemToolWrench) { return true; } - if (BuildCraftCore.isModLoaded()) { - return checkBuildcraftWrench(item); + if (Mods.BuildCraftCore.isModLoaded()) { + return item.getItem() instanceof buildcraft.api.tools.IToolWrench; } - if (EnderIO.isModLoaded()) { - return checkEnderIOWrench(item); - } - return false; - } - - private static boolean checkEnderIOWrench(final ItemStack item) { - if (ReflectionUtils.doesClassExist("crazypants.enderio.api.tool.ITool")) { - Class<?> wrenchClass; - wrenchClass = ReflectionUtils.getClass("crazypants.enderio.api.tool.ITool"); - if (wrenchClass.isInstance(item.getItem())) { - return true; - } - } - return false; - } - - private static boolean checkBuildcraftWrench(final ItemStack item) { - if (ReflectionUtils.doesClassExist("buildcraft.api.tools.IToolWrench")) { - Class<?> wrenchClass; - wrenchClass = ReflectionUtils.getClass("buildcraft.api.tools.IToolWrench"); - if (wrenchClass.isInstance(item.getItem())) { - return true; - } + if (Mods.EnderIO.isModLoaded()) { + return item.getItem() instanceof crazypants.enderio.api.tool.ITool; } return false; } @Override - public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int z) { + public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java index b358548e15..8de034148b 100644 --- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java @@ -18,6 +18,7 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.registry.GameRegistry; +import galaxyspace.core.entity.mob.EntityEvolvedColdBlaze; import gregtech.api.enums.Mods; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; @@ -42,7 +43,6 @@ import gtPlusPlus.core.tileentities.ModTileEntities; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.PreloaderCore; import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler; import gtPlusPlus.xmod.ic2.CustomInternalName; @@ -174,26 +174,27 @@ public class CommonProxy { } // GalaxySpace Support - if (ReflectionUtils.doesClassExist("galaxyspace.core.entity.mob.EntityEvolvedColdBlaze")) { - Class<?> aColdBlaze = ReflectionUtils.getClass("galaxyspace.core.entity.mob.EntityEvolvedColdBlaze"); - ItemStack aSmallBlizz, aTinyBlizz, aSmallCryo, aTinyCryo; - aSmallBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallBlizz", 1); - aTinyBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyBlizz", 1); - aSmallCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallCryotheum", 1); - aTinyCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCryotheum", 1); - EntityUtils - .registerDropsForMob(aColdBlaze, ItemUtils.getItemStackOfAmountFromOreDict("stickBlizz", 1), 2, 500); + if (Mods.GalaxySpace.isModLoaded()) { + ItemStack aSmallBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallBlizz", 1); + ItemStack aTinyBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyBlizz", 1); + ItemStack aSmallCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallCryotheum", 1); + ItemStack aTinyCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCryotheum", 1); + EntityUtils.registerDropsForMob( + EntityEvolvedColdBlaze.class, + ItemUtils.getItemStackOfAmountFromOreDict("stickBlizz", 1), + 2, + 500); if (aSmallBlizz != null) { - EntityUtils.registerDropsForMob(aColdBlaze, aSmallBlizz, 2, 750); + EntityUtils.registerDropsForMob(EntityEvolvedColdBlaze.class, aSmallBlizz, 2, 750); } if (aTinyBlizz != null) { - EntityUtils.registerDropsForMob(aColdBlaze, aTinyBlizz, 4, 1500); + EntityUtils.registerDropsForMob(EntityEvolvedColdBlaze.class, aTinyBlizz, 4, 1500); } if (aSmallCryo != null) { - EntityUtils.registerDropsForMob(aColdBlaze, aSmallCryo, 1, 50); + EntityUtils.registerDropsForMob(EntityEvolvedColdBlaze.class, aSmallCryo, 1, 50); } if (aTinyCryo != null) { - EntityUtils.registerDropsForMob(aColdBlaze, aTinyCryo, 2, 100); + EntityUtils.registerDropsForMob(EntityEvolvedColdBlaze.class, aTinyCryo, 2, 100); } } } diff --git a/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java b/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java index 87c5ab3e74..c245d78c9d 100644 --- a/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java +++ b/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java @@ -1,15 +1,9 @@ package gtPlusPlus.core.item.general.books; -import static gregtech.api.enums.Mods.GTPlusPlus; -import static gtPlusPlus.core.handler.BookHandler.mBookMap; -import static gtPlusPlus.core.util.Utils.addBookTitleLocalization; - -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.util.List; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.GuiScreenBook; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -21,18 +15,18 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.Mods; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.BookHandler; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.NBTUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; public class ItemBaseBook extends ItemWritableBook { public ItemBaseBook() { this.setCreativeTab(AddToCreativeTab.tabMisc); this.setMaxStackSize(1); - this.setTextureName(GTPlusPlus.ID + ":" + "itemBook"); + this.setTextureName(Mods.GTPlusPlus.ID + ":" + "itemBook"); this.setUnlocalizedName("itembookgt"); GameRegistry.registerItem(this, "bookGT"); } @@ -56,9 +50,9 @@ public class ItemBaseBook extends ItemWritableBook { public String getItemStackDisplayName(final ItemStack tItem) { if (NBTUtils.hasKey(tItem, "title")) { return NBTUtils.getString(tItem, "title"); - } else if (tItem.getItemDamage() > -1 && tItem.getItemDamage() <= mBookMap.size()) { - return EnumChatFormatting.ITALIC + "" - + addBookTitleLocalization(mBookMap.get(tItem.getItemDamage()).mTitle); + } else if (tItem.getItemDamage() > -1 && tItem.getItemDamage() <= BookHandler.mBookMap.size()) { + return EnumChatFormatting.ITALIC + + Utils.addBookTitleLocalization(BookHandler.mBookMap.get(tItem.getItemDamage()).mTitle); } // NBTUtils.tryIterateNBTData(tItem); return "GT++ Storybook"; @@ -69,13 +63,14 @@ public class ItemBaseBook extends ItemWritableBook { // TODO Auto-generated method stub if (NBTUtils.hasKey(tItem, "author")) { list.add(EnumChatFormatting.GRAY + "Author: " + NBTUtils.getString(tItem, "author")); - } else if (mBookMap.get(tItem.getItemDamage()).mAuthor != null) { - list.add(EnumChatFormatting.WHITE + "Author: " + mBookMap.get(tItem.getItemDamage()).mAuthor); + } else if (BookHandler.mBookMap.get(tItem.getItemDamage()).mAuthor != null) { + list.add(EnumChatFormatting.WHITE + "Author: " + BookHandler.mBookMap.get(tItem.getItemDamage()).mAuthor); } if (NBTUtils.hasKey(tItem, "title")) { list.add(EnumChatFormatting.GRAY + "Pages: " + NBTUtils.getString(tItem, "pages")); - } else if (mBookMap.get(tItem.getItemDamage()).mPages != null) { - list.add(EnumChatFormatting.WHITE + "Pages: " + mBookMap.get(tItem.getItemDamage()).mPages.length); + } else if (BookHandler.mBookMap.get(tItem.getItemDamage()).mPages != null) { + list.add( + EnumChatFormatting.WHITE + "Pages: " + BookHandler.mBookMap.get(tItem.getItemDamage()).mPages.length); } // super.addInformation(p_77624_1_, p_77624_2_, p_77624_3_, p_77624_4_); } @@ -90,32 +85,22 @@ public class ItemBaseBook extends ItemWritableBook { return false; } - @Override @SideOnly(Side.CLIENT) + @Override public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer player) { - // player.displayGUIBook(item); - int i = item.getItemDamage(); - ItemStack bookstack = Utils.getWrittenBook( - null, - mBookMap.get(i).mMeta, - mBookMap.get(i).mMapping, - mBookMap.get(i).mTitle, - mBookMap.get(i).mAuthor, - mBookMap.get(i).mPages); - if (player.worldObj.isRemote) { - try { - Class<?> clazz = ReflectionUtils.getClass("net.minecraft.client.gui.GuiScreenBook"); - Constructor<?> ctor = clazz.getConstructor(EntityPlayer.class, ItemStack.class, boolean.class); - Object object = ctor.newInstance(new Object[] { player, bookstack, false }); + int i = item.getItemDamage(); + ItemStack bookstack = Utils.getWrittenBook( + null, + BookHandler.mBookMap.get(i).mMeta, + BookHandler.mBookMap.get(i).mMapping, + BookHandler.mBookMap.get(i).mTitle, + BookHandler.mBookMap.get(i).mAuthor, + BookHandler.mBookMap.get(i).mPages); + if (bookstack != null) { Minecraft.getMinecraft() - .displayGuiScreen((GuiScreen) object); - } catch (InstantiationException | IllegalAccessException | IllegalArgumentException - | InvocationTargetException | NoSuchMethodException | SecurityException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + .displayGuiScreen(new GuiScreenBook(player, bookstack, false)); } - // Minecraft.getMinecraft().displayGuiScreen(new GuiScreenBook(player, bookstack, false)); } return item; } diff --git a/src/main/java/gtPlusPlus/core/lib/GTPPCore.java b/src/main/java/gtPlusPlus/core/lib/GTPPCore.java index 985e942f52..c78d734cb6 100644 --- a/src/main/java/gtPlusPlus/core/lib/GTPPCore.java +++ b/src/main/java/gtPlusPlus/core/lib/GTPPCore.java @@ -36,7 +36,7 @@ public class GTPPCore { public static final float PI = (float) Math.PI; public static volatile Random RANDOM = new XSTR(); - public static boolean DEVENV = false;; + public static boolean DEVENV = false; // Mod Variables public static final String name = "GT++"; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java index 5e29ddb53e..7ea6af4a23 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java @@ -75,63 +75,25 @@ public class PlayerUtils { } public static boolean isPlayerOP(final EntityPlayer player) { - if (player.canCommandSenderUseCommand(2, "")) { - return true; - } - return false; + return player.canCommandSenderUseCommand(2, ""); } // Not Clientside public static ItemStack getItemStackInPlayersHand(final World world, final String Name) { - final EntityPlayer thePlayer = getPlayer(Name); - ItemStack heldItem = null; - try { - heldItem = thePlayer.getHeldItem(); - } catch (final NullPointerException e) { - return null; - } - if (heldItem != null) { - return heldItem; - } - return null; + return PlayerUtils.getItemStackInPlayersHand(getPlayer(Name)); } @SideOnly(Side.CLIENT) public static ItemStack getItemStackInPlayersHand() { - final Minecraft mc = Minecraft.getMinecraft(); - ItemStack heldItem; - try { - heldItem = mc.thePlayer.getHeldItem(); - } catch (final NullPointerException e) { - return null; - } - if (heldItem != null) { - return heldItem; - } - return null; + return PlayerUtils.getItemStackInPlayersHand(Minecraft.getMinecraft().thePlayer); } public static ItemStack getItemStackInPlayersHand(final EntityPlayer player) { - ItemStack heldItem; - try { - heldItem = player.getHeldItem(); - } catch (final NullPointerException e) { - e.printStackTrace(); - return null; - } - if (heldItem != null) { - return heldItem; - } else { - if (Utils.isClient()) { - heldItem = player.getItemInUse(); - } else { - heldItem = player.getCurrentEquippedItem(); - } - } - return heldItem; + if (player == null) return null; + return player.getHeldItem(); } - public static final UUID getPlayersUUIDByName(final String aPlayerName) { + public static UUID getPlayersUUIDByName(final String aPlayerName) { final EntityPlayer player = PlayerUtils.getPlayer(aPlayerName); if (player != null) { return player.getUniqueID(); @@ -157,7 +119,7 @@ public class PlayerUtils { if (aPlayer instanceof FakePlayer || (mThaumcraftFakePlayer != null && mThaumcraftFakePlayer.isInstance(aPlayer)) || (aPlayer.getCommandSenderName() == null || aPlayer.getCommandSenderName() - .length() <= 0) + .isEmpty()) || (aPlayer.isEntityInvulnerable() && !aPlayer.canCommandSenderUseCommand(0, "") && (aChunkLocation == null) || (aChunkLocation.posX == 0 && aChunkLocation.posY == 0 && aChunkLocation.posZ == 0))) { mCachedFakePlayers.put( @@ -187,7 +149,7 @@ public class PlayerUtils { return false; } if (p.getCommandSenderName() - .length() <= 0) { + .isEmpty()) { cacheFakePlayer(p); return false; } @@ -196,11 +158,9 @@ public class PlayerUtils { cacheFakePlayer(p); return false; } - if (!isCachedFakePlayer( + return !isCachedFakePlayer( p.getUniqueID() - .toString())) { - return true; - } + .toString()); } return false; } |