diff options
Diffstat (limited to 'src/main/java/gregtech/common')
6 files changed, 32 insertions, 28 deletions
diff --git a/src/main/java/gregtech/common/GTProxy.java b/src/main/java/gregtech/common/GTProxy.java index 221fcd6f1f..b5854ea2eb 100644 --- a/src/main/java/gregtech/common/GTProxy.java +++ b/src/main/java/gregtech/common/GTProxy.java @@ -136,7 +136,6 @@ import gregtech.api.interfaces.IBlockOnWalkOver; import gregtech.api.interfaces.IProjectileItem; import gregtech.api.interfaces.IToolStats; import gregtech.api.interfaces.internal.IGTMod; -import gregtech.api.interfaces.internal.IThaumcraftCompat; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.items.MetaGeneratedItem; import gregtech.api.items.MetaGeneratedTool; @@ -796,8 +795,9 @@ public abstract class GTProxy implements IGTMod, IFuelHandler { FMLCommonHandler.instance() .bus() .register(this); - GregTechAPI.sThaumcraftCompat = (IThaumcraftCompat) GTUtility - .callConstructor("gregtech.common.GTThaumcraftCompat", 0, null, GTValues.D1, new Object[0]); + if (Thaumcraft.isModLoaded()) { + GregTechAPI.sThaumcraftCompat = new GTThaumcraftCompat(); + } for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry .getRegisteredFluidContainerData()) { onFluidContainerRegistration(new FluidContainerRegistry.FluidContainerRegisterEvent(tData)); diff --git a/src/main/java/gregtech/common/GTThaumcraftCompat.java b/src/main/java/gregtech/common/GTThaumcraftCompat.java index 7f8c6dd8c7..aa52d9a292 100644 --- a/src/main/java/gregtech/common/GTThaumcraftCompat.java +++ b/src/main/java/gregtech/common/GTThaumcraftCompat.java @@ -193,7 +193,7 @@ public class GTThaumcraftCompat implements IThaumcraftCompat { if (aParentResearches != null) { ArrayList<String> tParentResearches = new ArrayList<>(); Collections.addAll(tParentResearches, aParentResearches); - if (tParentResearches.size() > 0) { + if (!tParentResearches.isEmpty()) { rResearch.setParents(tParentResearches.toArray(new String[0])); rResearch.setConcealed(); } diff --git a/src/main/java/gregtech/common/items/ItemAdvancedSensorCard.java b/src/main/java/gregtech/common/items/ItemAdvancedSensorCard.java index 8c68951bb7..8e588b4960 100644 --- a/src/main/java/gregtech/common/items/ItemAdvancedSensorCard.java +++ b/src/main/java/gregtech/common/items/ItemAdvancedSensorCard.java @@ -33,6 +33,7 @@ import com.google.common.collect.ImmutableList; 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 gregtech.common.misc.GlobalMetricsCoverDatabase; import gregtech.common.misc.GlobalMetricsCoverDatabase.State; import shedar.mods.ic2.nuclearcontrol.api.CardState; @@ -41,7 +42,9 @@ import shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource; import shedar.mods.ic2.nuclearcontrol.api.PanelSetting; import shedar.mods.ic2.nuclearcontrol.api.PanelString; -@SuppressWarnings("unused") +@cpw.mods.fml.common.Optional.Interface( + iface = "shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource", + modid = Mods.Names.I_C2_NUCLEAR_CONTROL) public class ItemAdvancedSensorCard extends Item implements IPanelDataSource { public static final UUID CARD_TYPE_ID = UUID.fromString("ff952e84-7608-4c4a-85af-dd6e1aa27fc7"); diff --git a/src/main/java/gregtech/common/items/ItemSensorCard.java b/src/main/java/gregtech/common/items/ItemSensorCard.java index 39e3d48081..c3f0ef7061 100644 --- a/src/main/java/gregtech/common/items/ItemSensorCard.java +++ b/src/main/java/gregtech/common/items/ItemSensorCard.java @@ -14,8 +14,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.Mods; import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation; import gregtech.api.items.GTGenericItem; import gregtech.api.util.GTLanguageManager; @@ -26,6 +28,14 @@ import shedar.mods.ic2.nuclearcontrol.api.IRemoteSensor; import shedar.mods.ic2.nuclearcontrol.api.PanelSetting; import shedar.mods.ic2.nuclearcontrol.api.PanelString; +@Optional.InterfaceList( + value = { + @Optional.Interface( + iface = "shedar.mods.ic2.nuclearcontrol.api.IRemoteSensor", + modid = Mods.Names.I_C2_NUCLEAR_CONTROL), + @Optional.Interface( + iface = "shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource", + modid = Mods.Names.I_C2_NUCLEAR_CONTROL) }) public class ItemSensorCard extends GTGenericItem implements IRemoteSensor, IPanelDataSource { private static final UUID CARD_TYPE = new UUID(0L, 41L); diff --git a/src/main/java/gregtech/common/render/GTCapeRenderer.java b/src/main/java/gregtech/common/render/GTCapeRenderer.java index ea8e0a37cd..43fda419e4 100644 --- a/src/main/java/gregtech/common/render/GTCapeRenderer.java +++ b/src/main/java/gregtech/common/render/GTCapeRenderer.java @@ -6,7 +6,6 @@ import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderPlayer; -import net.minecraft.potion.Potion; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderPlayerEvent; @@ -19,14 +18,19 @@ import gregtech.api.util.GTUtility; public class GTCapeRenderer extends RenderPlayer { - private final ResourceLocation[] mCapes = { new ResourceLocation("gregtech:textures/BrainTechCape.png"), + // spotless:off + private final ResourceLocation[] mCapes = { + new ResourceLocation("gregtech:textures/BrainTechCape.png"), new ResourceLocation("gregtech:textures/GregTechCape.png"), new ResourceLocation("gregtech:textures/MrBrainCape.png"), new ResourceLocation("gregtech:textures/GregoriusCape.png"), - new ResourceLocation("gregtech:textures/DonorCape.png"), new ResourceLocation("gregtech:textures/DevCape.png"), - new ResourceLocation("gregtech:textures/Steam.png"), new ResourceLocation("gregtech:textures/Titanium.png"), + new ResourceLocation("gregtech:textures/DonorCape.png"), + new ResourceLocation("gregtech:textures/DevCape.png"), + new ResourceLocation("gregtech:textures/Steam.png"), + new ResourceLocation("gregtech:textures/Titanium.png"), new ResourceLocation("gregtech:textures/Neutronium.png"), new ResourceLocation("gregtech:textures/Stargate.png") }; + // spotless:on private final Collection<String> mCapeList; public GTCapeRenderer(Collection<String> aCapeList) { @@ -40,13 +44,9 @@ public class GTCapeRenderer extends RenderPlayer { aEvent.setCanceled(true); return; } - float aPartialTicks = aEvent.partialRenderTick; if (aPlayer.isInvisible()) { return; } - if (GTUtility.getPotion(aPlayer, Potion.invisibility.id)) { - return; - } try { ResourceLocation tResource = aPlayer.getLocationCape(); if (aPlayer.getDisplayName() @@ -101,6 +101,7 @@ public class GTCapeRenderer extends RenderPlayer { bindTexture(tResource); GL11.glPushMatrix(); GL11.glTranslatef(0.0F, 0.0F, 0.125F); + float aPartialTicks = aEvent.partialRenderTick; double d0 = aPlayer.field_71091_bM + (aPlayer.field_71094_bP - aPlayer.field_71091_bM) * aPartialTicks - (aPlayer.prevPosX + (aPlayer.posX - aPlayer.prevPosX) * aPartialTicks); double d1 = aPlayer.field_71096_bN + (aPlayer.field_71095_bQ - aPlayer.field_71096_bN) * aPartialTicks diff --git a/src/main/java/gregtech/common/tools/ToolPlunger.java b/src/main/java/gregtech/common/tools/ToolPlunger.java index 3ba428e707..5cb9bcff48 100644 --- a/src/main/java/gregtech/common/tools/ToolPlunger.java +++ b/src/main/java/gregtech/common/tools/ToolPlunger.java @@ -7,14 +7,13 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; +import gregtech.api.enums.Mods; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; -import gregtech.api.interfaces.IItemBehaviour; -import gregtech.api.items.MetaBaseItem; import gregtech.api.items.MetaGeneratedTool; import gregtech.api.util.GTToolHarvestHelper; -import gregtech.api.util.GTUtility; +import gregtech.common.items.behaviors.BehaviourPlungerEssentia; import gregtech.common.items.behaviors.BehaviourPlungerFluid; import gregtech.common.items.behaviors.BehaviourPlungerItem; @@ -62,21 +61,12 @@ public class ToolPlunger extends GTTool { } @Override - @SuppressWarnings("unchecked") // the IItemBehaviour cast cannot be expressed strictly via generics public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) { aItem.addItemBehavior(aID, new BehaviourPlungerItem(getToolDamagePerDropConversion())); aItem.addItemBehavior(aID, new BehaviourPlungerFluid(getToolDamagePerDropConversion())); - try { - Object tObject = GTUtility.callConstructor( - "gregtech.common.items.behaviors.BehaviourPlungerEssentia", - 0, - null, - false, - getToolDamagePerDropConversion()); - if ((tObject instanceof IItemBehaviour)) { - aItem.addItemBehavior(aID, (IItemBehaviour<MetaBaseItem>) tObject); - } - } catch (Throwable ignored) {} + if (Mods.Thaumcraft.isModLoaded()) { + aItem.addItemBehavior(aID, new BehaviourPlungerEssentia(getToolDamagePerDropConversion())); + } } @Override |