diff options
Diffstat (limited to 'src/main/java/gtPlusPlus')
15 files changed, 108 insertions, 335 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; } diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java index d7f0815368..50a7cd547a 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java @@ -296,9 +296,9 @@ public class WorldGen_GT_Base implements IWorldGenerator { + (WorldGen_GT_Ore_Layer.sWeight > 0)); Logger.INFO( "[World Generation Debug] WorldGen_GT_Ore_Layer.sList.size() > 0? " - + (WorldGen_GT_Ore_Layer.sList.size() > 0)); + + (!WorldGen_GT_Ore_Layer.sList.isEmpty())); if ((oreveinPercentageRoll < oreveinPercentage) && (WorldGen_GT_Ore_Layer.sWeight > 0) - && (WorldGen_GT_Ore_Layer.sList.size() > 0)) { + && (!WorldGen_GT_Ore_Layer.sList.isEmpty())) { int placementAttempts = 0; boolean oreveinFound = false; int i; diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java index 06372740e4..dc033514f1 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java @@ -8,7 +8,7 @@ import net.minecraft.launchwrapper.IClassTransformer; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; -import gtPlusPlus.core.util.reflect.ReflectionUtils; +import gregtech.asm.GTCorePlugin; import gtPlusPlus.preloader.PreloaderCore; import gtPlusPlus.preloader.PreloaderLogger; import gtPlusPlus.preloader.asm.AsmConfig; @@ -48,9 +48,8 @@ public class Preloader_Transformer_Handler implements IClassTransformer { // Fix LWJGL index array out of bounds on keybinding IDs if ((transformedName.equals(LWJGL_KEYBOARD) || transformedName.equals(MINECRAFT_GAMESETTINGS)) && AsmConfig.enabledLwjglKeybindingFix - // Do not transform if using lwjgl3 - && !ReflectionUtils.doesClassExist("org.lwjgl.system.Platform")) { - boolean isClientSettingsClass = !transformedName.equals("org.lwjgl.input.Keyboard"); + && !GTCorePlugin.islwjgl3Present()) { + boolean isClientSettingsClass = !transformedName.equals(LWJGL_KEYBOARD); PreloaderLogger.INFO("LWJGL Keybinding index out of bounds fix", "Transforming " + transformedName); return new ClassTransformer_LWJGL_Keyboard(basicClass, isClientSettingsClass).getWriter() .toByteArray(); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java index 7f7553bf1d..6b9c5ae8f2 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java @@ -1,13 +1,11 @@ package gtPlusPlus.xmod.forestry.bees.custom; -import java.lang.reflect.Field; import java.util.Arrays; import java.util.Locale; import net.minecraft.item.ItemStack; import net.minecraftforge.common.BiomeDictionary.Type; -import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.commons.lang3.text.WordUtils; import forestry.api.apiculture.BeeManager; @@ -28,14 +26,14 @@ import forestry.apiculture.genetics.BeeVariation; import forestry.apiculture.genetics.IBeeDefinition; import forestry.core.genetics.alleles.AlleleHelper; import gregtech.loaders.misc.GTBeeDefinition; +import gregtech.loaders.misc.GTBranchDefinition; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; public enum GTPPBeeDefinition implements IBeeDefinition { - SILICON(GTPPBranchDefinition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75), + SILICON(GTBranchDefinition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)) { @Override @@ -54,13 +52,13 @@ public enum GTPPBeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation( - getGregtechBeeType("SLIMEBALL"), - getGregtechBeeType("STICKYRESIN"), + GTBeeDefinition.SLIMEBALL.getSpecies(), + GTBeeDefinition.STICKYRESIN.getSpecies(), 10); } }, - RUBBER(GTPPBranchDefinition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55), + RUBBER(GTBranchDefinition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55), Utils.rgbtoHexValue(75, 75, 75)) { @Override @@ -79,13 +77,13 @@ public enum GTPPBeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation( - getGregtechBeeType("SLIMEBALL"), - getGregtechBeeType("STICKYRESIN"), + GTBeeDefinition.SLIMEBALL.getSpecies(), + GTBeeDefinition.STICKYRESIN.getSpecies(), 10); } }, - PLASTIC(GTPPBranchDefinition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245), + PLASTIC(GTBranchDefinition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245), Utils.rgbtoHexValue(175, 175, 175)) { @Override @@ -103,11 +101,14 @@ public enum GTPPBeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(RUBBER.species, getGregtechBeeType("OIL"), 10); + IBeeMutationCustom tMutation = registerMutation( + GTPPBeeDefinition.RUBBER.species, + GTBeeDefinition.OIL.getSpecies(), + 10); } }, - PTFE(GTPPBranchDefinition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150), + PTFE(GTBranchDefinition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150), Utils.rgbtoHexValue(75, 75, 75)) { @Override @@ -129,7 +130,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition { } }, - PBS(GTPPBranchDefinition.ORGANIC, "Pbs", true, Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)) { + PBS(GTBranchDefinition.ORGANIC, "Pbs", true, Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { @@ -153,7 +154,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition { /** * Fuels */ - BIOMASS(GTPPBranchDefinition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24), + BIOMASS(GTBranchDefinition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24), Utils.rgbtoHexValue(23, 175, 14)) { @Override @@ -176,7 +177,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition { } }, - ETHANOL(GTPPBranchDefinition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0), + ETHANOL(GTBranchDefinition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0), Utils.rgbtoHexValue(220, 156, 32)) { @Override @@ -202,7 +203,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition { /** * Materials */ - FLUORINE(GTPPBranchDefinition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230), + FLUORINE(GTBranchDefinition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230), Utils.rgbtoHexValue(10, 150, 150)) { @Override @@ -221,8 +222,8 @@ public enum GTPPBeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation( - getGregtechBeeType("LAPIS"), - getGregtechBeeType("SAPPHIRE"), + GTBeeDefinition.LAPIS.getSpecies(), + GTBeeDefinition.SAPPHIRE.getSpecies(), 5); tMutation.restrictBiomeType(Type.COLD); } @@ -231,7 +232,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition { // Coke // Force - FORCE(GTPPBranchDefinition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20), + FORCE(GTBranchDefinition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5)) { @Override @@ -252,15 +253,15 @@ public enum GTPPBeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation( - getGregtechBeeType("STEEL"), - getGregtechBeeType("GOLD"), + GTBeeDefinition.STEEL.getSpecies(), + GTBeeDefinition.GOLD.getSpecies(), 10); tMutation.restrictBiomeType(Type.HOT); } }, // Nikolite - NIKOLITE(GTPPBranchDefinition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200), + NIKOLITE(GTBranchDefinition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200), Utils.rgbtoHexValue(40, 150, 170)) { @Override @@ -279,8 +280,8 @@ public enum GTPPBeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation( - getGregtechBeeType("ALUMINIUM"), - getGregtechBeeType("SILVER"), + GTBeeDefinition.ALUMINIUM.getSpecies(), + GTBeeDefinition.SILVER.getSpecies(), 8); tMutation.restrictBiomeType(Type.HOT); } @@ -476,13 +477,13 @@ public enum GTPPBeeDefinition implements IBeeDefinition { ; - private final GTPPBranchDefinition branch; + private final GTBranchDefinition branch; private final IAlleleBeeSpeciesCustom species; private IAllele[] template; private IBeeGenome genome; - GTPPBeeDefinition(GTPPBranchDefinition branch, String binomial, boolean dominant, int primary, int secondary) { + GTPPBeeDefinition(GTBranchDefinition branch, String binomial, boolean dominant, int primary, int secondary) { String lowercaseName = this.toString() .toLowerCase(Locale.ENGLISH); String species = "species" + WordUtils.capitalize(lowercaseName); @@ -587,18 +588,4 @@ public enum GTPPBeeDefinition implements IBeeDefinition { } return result; } - - public static IAlleleBeeSpecies getGregtechBeeType(String name) { - try { - Enum<GTBeeDefinition> gtBeeEnumObject = Enum.valueOf(GTBeeDefinition.class, name); - Field gtBeesField = FieldUtils.getDeclaredField(GTBeeDefinition.class, "species", true); - gtBeesField.setAccessible(true); - ReflectionUtils.makeFieldAccessible(gtBeesField); - Object beeType = gtBeesField.get(gtBeeEnumObject); - return (IAlleleBeeSpecies) beeType; - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - return null; - } } diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java index f0cd284bdf..583e66d2c6 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java @@ -5,19 +5,14 @@ import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.reflect.FieldUtils; - -import gregtech.GTMod; import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; +import gregtech.common.items.CombType; +import gregtech.loaders.misc.GTBees; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.base.ingots.BaseItemIngotOld; import gtPlusPlus.core.item.base.misc.BaseItemMisc; @@ -25,7 +20,6 @@ import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; public class GTPPBees { @@ -39,11 +33,9 @@ public class GTPPBees { // Base Comb Item public static ItemCustomComb combs; - // Combs obtained via reflection public static ItemStack Comb_Slag; public static ItemStack Comb_Stone; - // Materials obtained via reflection public static Materials PTFE; public static Materials PBS; @@ -52,7 +44,6 @@ public class GTPPBees { public GTPPBees() { if (Forestry.isModLoaded()) { - // Set Materials and Comb stacks from GT via Reflection setMaterials(); setCustomItems(); @@ -99,67 +90,19 @@ public class GTPPBees { .addTo(fluidExtractionRecipes); } - private static boolean tryGetBeesBoolean() { - try { - Class<?> mProxy = Class.forName("gregtech.GTMod.gregtechproxy"); - Field mNerf = FieldUtils.getDeclaredField(mProxy, "mGTBees", true); - boolean returnValue = (boolean) mNerf.get(GTMod.gregtechproxy); - return returnValue; - } catch (ClassNotFoundException | IllegalArgumentException | IllegalAccessException e) { - return false; - } - } - private void setMaterials() { - try { - - Class<?> gtBees = Class.forName("gregtech.loaders.misc.GTBees"); - Class<?> gtCombItemClass = Class.forName("gregtech.common.items.ItemComb"); - Class gtCombEnumClass = Class.forName("gregtech.common.items.CombType"); - Field gtCombs = FieldUtils.getDeclaredField(gtBees, "combs", true); - gtCombs.setAccessible(true); - ReflectionUtils.makeFieldAccessible(gtCombs); - Enum gtCombTypeSlag = Enum.valueOf(gtCombEnumClass, "SLAG"); - Enum gtCombTypeStone = Enum.valueOf(gtCombEnumClass, "STONE"); - Object oCombObject = gtCombs.get(null); - - Logger.DEBUG_BEES("Field getModifiers: " + gtCombs.getModifiers()); - Logger.DEBUG_BEES("Field toGenericString: " + gtCombs.toGenericString()); - Logger.DEBUG_BEES("Field getClass: " + gtCombs.getClass()); - Logger.DEBUG_BEES("Field isEnumConstant: " + gtCombs.isEnumConstant()); - Logger.DEBUG_BEES("Field isSynthetic: " + gtCombs.isSynthetic()); - Logger.DEBUG_BEES("Field get(gtBees) != null: " + (gtCombs.get(gtBees) != null)); - Logger.DEBUG_BEES("Field isAccessible: " + gtCombs.isAccessible()); - - Logger.BEES("gtBees: " + (gtBees != null)); - Logger.BEES("gtCombItemClass: " + (gtCombItemClass != null)); - Logger.BEES("gtCombEnumClass: " + (gtCombEnumClass != null)); - Logger.BEES("gtCombs: " + (gtCombs != null)); - Logger.BEES("gtCombTypeSlag: " + (gtCombTypeSlag != null)); - Logger.BEES("gtCombTypeStone: " + (gtCombTypeStone != null)); - Logger.BEES("oCombObject: " + (oCombObject != null)); - - // if (gtCombItemClass.isInstance(oCombObject)){ - Method getStackForType; - getStackForType = gtCombItemClass.getDeclaredMethod("getStackForType", gtCombEnumClass); - - if (getStackForType != null) { - Logger.BEES("Found Method: getStackForType"); - } - if (Comb_Slag == null) { - Comb_Slag = (ItemStack) getStackForType.invoke(gtBees, gtCombTypeSlag); - } - if (Comb_Stone == null) { - Comb_Stone = (ItemStack) getStackForType.invoke(gtBees, gtCombTypeStone); - } - - } catch (NullPointerException | ClassNotFoundException | IllegalArgumentException | IllegalAccessException - | NoSuchMethodException | SecurityException | InvocationTargetException e) { - Logger.BEES("Bad Reflection. setMaterials()"); + if (Comb_Slag == null) { + Comb_Slag = GTBees.combs.getStackForType(CombType.SLAG); + } + if (Comb_Stone == null) { + Comb_Stone = GTBees.combs.getStackForType(CombType.STONE); + } + if (PTFE == null) { + PTFE = trySetValue("Polytetrafluoroethylene"); + } + if (PBS == null) { + PBS = trySetValue("StyreneButadieneRubber"); } - - PTFE = trySetValue("Polytetrafluoroethylene"); - PBS = trySetValue("StyreneButadieneRubber"); } private Materials trySetValue(String material) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java deleted file mode 100644 index ca35849172..0000000000 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java +++ /dev/null @@ -1,76 +0,0 @@ -package gtPlusPlus.xmod.forestry.bees.custom; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IClassification; -import gtPlusPlus.api.objects.Logger; - -public enum GTPPBranchDefinition { - - ORGANIC("ORGANIC"), - GEM("GEM"), - METAL("METAL"), - RAREMETAL("RAREMETAL"), - RADIOACTIVE("RADIOACTIVE"); - - final String mFieldName; - final Enum mActualValues; - - GTPPBranchDefinition(String mValue) { - this.mFieldName = mValue; - this.mActualValues = setEnumVar(mValue); - } - - public final IAllele[] getTemplate() { - Class gtBranchDefClass; - try { - gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition"); - Enum enumA = mActualValues; - Method methodMyMethod = gtBranchDefClass.getMethod("getTemplate"); - - Logger.INFO("[Bees] gtBranchDefClass: " + (gtBranchDefClass != null)); - Logger.INFO("[Bees] enumA: " + (enumA != null)); - Logger.INFO("[Bees] methodMyMethod: " + (methodMyMethod != null)); - - return (IAllele[]) methodMyMethod.invoke(enumA); - } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException - | IllegalArgumentException | InvocationTargetException e) { - Logger.INFO("[Bees] Bad Reflection. getTemplate()"); - e.printStackTrace(); - // gregtech.loaders.misc.GT_BranchDefinition.getTemplate() - return null; - } - } - - public final IClassification getBranch() { - Class gtBranchDefClass; - try { - gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition"); - Enum enum_MY_SAMPLE_ENUM = mActualValues; - Method methodMyMethod = gtBranchDefClass.getMethod("getBranch"); - - Logger.INFO("[Bees] gtBranchDefClass: " + (gtBranchDefClass != null)); - Logger.INFO("[Bees] enum_MY_SAMPLE_ENUM: " + (enum_MY_SAMPLE_ENUM != null)); - Logger.INFO("[Bees] methodMyMethod: " + (methodMyMethod != null)); - - return (IClassification) methodMyMethod.invoke(enum_MY_SAMPLE_ENUM); - } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException - | IllegalArgumentException | InvocationTargetException e) { - Logger.INFO("[Bees] Bad Reflection. getBranch()"); - e.printStackTrace(); - return null; - } - } - - private Enum setEnumVar(String value) { - try { - Class gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition"); - Enum branchDef = Enum.valueOf(gtBranchDefClass, value); - return branchDef; - } catch (ClassNotFoundException e) { - return null; - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java index dad53f54f6..738afb0d90 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java @@ -634,10 +634,10 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas // Handle Custom Hatches if (aMetaTileEntity instanceof MTEHatchInputBattery) { - log("Found GT_MetaTileEntity_Hatch_InputBattery"); + log("Found MTEHatchInputBattery"); aDidAdd = addToMachineListInternal(mChargeHatches, aMetaTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof MTEHatchOutputBattery) { - log("Found GT_MetaTileEntity_Hatch_OutputBattery"); + log("Found MTEHatchOutputBattery"); aDidAdd = addToMachineListInternal(mDischargeHatches, aMetaTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof METHatchAirIntake) { aDidAdd = addToMachineListInternal(mAirIntakes, aMetaTileEntity, aBaseCasingIndex) @@ -1020,7 +1020,7 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas if (tCurrentItem != null) { // Logger.INFO("Holding Item."); if (tCurrentItem.getItem() instanceof MetaGeneratedTool) { - // Logger.INFO("Is GT_MetaGenerated_Tool."); + // Logger.INFO("Is MetaGeneratedTool."); int[] aOreID = OreDictionary.getOreIDs(tCurrentItem); for (int id : aOreID) { // Plunger diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java index d1a6ac34f0..063b5747b9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java @@ -201,7 +201,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase<MTEIsaMill> implements ISurvi return false; } if (aMetaTileEntity instanceof MTEHatchMillingBalls) { - log("Found GT_MetaTileEntity_Hatch_MillingBalls"); + log("Found MTEHatchMillingBalls"); return addToMachineListInternal(mMillingBallBuses, aMetaTileEntity, aBaseCasingIndex); } return super.addToMachineList(aTileEntity, aBaseCasingIndex); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java index 2046de6c1c..5de235982f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java @@ -508,7 +508,7 @@ public class MTEChemicalPlant extends GTPPMultiBlockBase<MTEChemicalPlant> imple return false; } if (aMetaTileEntity instanceof MTEHatchCatalysts) { - log("Found GT_MetaTileEntity_Hatch_Catalysts"); + log("Found MTEHatchCatalysts"); return addToMachineListInternal(mCatalystBuses, aMetaTileEntity, aBaseCasingIndex); } return super.addToMachineList(aTileEntity, aBaseCasingIndex); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java index 69e3580f11..0bd1397137 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java @@ -267,7 +267,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT return false; } if (aMetaTileEntity instanceof MTEHatchTurbine aTurbineHatch) { - log("Found GT_MetaTileEntity_Hatch_Turbine"); + log("Found MTEHatchTurbine"); updateTexture(aTileEntity, aBaseCasingIndex); IGregTechTileEntity g = this.getBaseMetaTileEntity(); if (aTurbineHatch.setController(new BlockPos(g.getXCoord(), g.getYCoord(), g.getZCoord(), g.getWorld()))) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index f08457f807..9f66dc394f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -700,8 +700,8 @@ public class GregtechConduits { OrePrefixes.pipeMedium.get(material), new MTEFluid( startID + 2, - "GT_Pipe_" + material.mDefaultLocalName + "", - "" + material.mDefaultLocalName + " Fluid Pipe", + "GT_Pipe_" + material.mDefaultLocalName, + material.mDefaultLocalName + " Fluid Pipe", 0.5F, material, transferRatePerTick * 12, @@ -761,8 +761,8 @@ public class GregtechConduits { OrePrefixes.pipeMedium.get(material), new GTPPMTEFluid( startID + 2, - "GT_Pipe_" + material.mDefaultLocalName + "", - "" + material.mDefaultLocalName + " Fluid Pipe", + "GT_Pipe_" + material.mDefaultLocalName, + material.mDefaultLocalName + " Fluid Pipe", 0.5F, material, transferRatePerTick * 12, |