mirror of
https://github.com/GTNewHorizons/Tainted-Magic.git
synced 2026-11-21 04:22:21 +00:00
[ci skip] spotlessApply with the new settings
This commit is contained in:
1 parent
1eaf9b7991
commit
62390a0d0f
79 files changed
+3118
-1929
No files matched your search
@@ -3,22 +3,23 @@ package taintedmagic.client.handler;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraftforge.client.event.RenderPlayerEvent;
|
||||
import taintedmagic.api.IRenderInventoryItem;
|
||||
|
||||
@SideOnly (Side.CLIENT)
|
||||
import taintedmagic.api.IRenderInventoryItem;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ClientHandler {
|
||||
|
||||
@SubscribeEvent
|
||||
public void tickEnd (final TickEvent event) {
|
||||
public void tickEnd(final TickEvent event) {
|
||||
if (event.phase == TickEvent.Phase.END) {
|
||||
HUDHandler.updateTicks();
|
||||
}
|
||||
@@ -28,15 +29,15 @@ public class ClientHandler {
|
||||
* Render items implementing IRenderInventoryItem
|
||||
*/
|
||||
@SubscribeEvent
|
||||
public void onPlayerRender (final RenderPlayerEvent.Specials.Post event) {
|
||||
public void onPlayerRender(final RenderPlayerEvent.Specials.Post event) {
|
||||
final EntityPlayer player = event.entityPlayer;
|
||||
if (player.getActivePotionEffect(Potion.invisibility) != null)
|
||||
return;
|
||||
if (player.getActivePotionEffect(Potion.invisibility) != null) return;
|
||||
|
||||
final ItemStack[] inv = player.inventory.mainInventory;
|
||||
final List<Item> rendering = new ArrayList<>();
|
||||
for (final ItemStack stack : inv) {
|
||||
if (stack != null && stack.getItem() instanceof IRenderInventoryItem && !rendering.contains(stack.getItem())) {
|
||||
if (stack != null && stack.getItem() instanceof IRenderInventoryItem
|
||||
&& !rendering.contains(stack.getItem())) {
|
||||
((IRenderInventoryItem) stack.getItem()).render(player, stack, event.partialRenderTick);
|
||||
rendering.add(stack.getItem());
|
||||
}
|
||||
|
||||
@@ -2,11 +2,6 @@ package taintedmagic.client.handler;
|
||||
|
||||
import java.awt.Color;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
@@ -15,14 +10,20 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraftforge.client.event.RenderGameOverlayEvent;
|
||||
import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import taintedmagic.api.IHeldItemHUD;
|
||||
import taintedmagic.common.TaintedMagic;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public final class HUDHandler {
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly (Side.CLIENT)
|
||||
public void renderGameOverlayEvent (final RenderGameOverlayEvent.Post event) {
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void renderGameOverlayEvent(final RenderGameOverlayEvent.Post event) {
|
||||
if (event.type == ElementType.ALL) {
|
||||
renderHeldItemHUD(event.partialTicks);
|
||||
renderString();
|
||||
@@ -33,8 +34,8 @@ public final class HUDHandler {
|
||||
private static ItemStack stack = null;
|
||||
private static ItemStack last = null;
|
||||
|
||||
@SideOnly (Side.CLIENT)
|
||||
private void renderHeldItemHUD (final float partialTicks) {
|
||||
@SideOnly(Side.CLIENT)
|
||||
private void renderHeldItemHUD(final float partialTicks) {
|
||||
final EntityPlayer player = TaintedMagic.proxy.getClientPlayer();
|
||||
final Minecraft mc = Minecraft.getMinecraft();
|
||||
final ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
|
||||
@@ -47,16 +48,14 @@ public final class HUDHandler {
|
||||
boolean b = false;
|
||||
if (stack != null && stack.getItem() instanceof IHeldItemHUD) {
|
||||
b = true;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
b = false;
|
||||
}
|
||||
|
||||
final float time = 30.0F;
|
||||
if (b) {
|
||||
ticksEquipped = Math.min(time, ticksEquipped + partialTicks);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
ticksEquipped = Math.max(0F, ticksEquipped - partialTicks);
|
||||
}
|
||||
|
||||
@@ -64,8 +63,7 @@ public final class HUDHandler {
|
||||
|
||||
if (b) {
|
||||
((IHeldItemHUD) stack.getItem()).renderHUD(res, player, stack, partialTicks, fract);
|
||||
}
|
||||
else if (!b && ticksEquipped != 0) {
|
||||
} else if (!b && ticksEquipped != 0) {
|
||||
((IHeldItemHUD) last.getItem()).renderHUD(res, player, last, partialTicks, fract);
|
||||
}
|
||||
}
|
||||
@@ -78,25 +76,25 @@ public final class HUDHandler {
|
||||
/**
|
||||
* Displays text above the health bar for a specified duration.
|
||||
*
|
||||
* @param text The string to display.
|
||||
* @param text The string to display.
|
||||
* @param duration The duration to display for (in ticks).
|
||||
* @param rainbow Display the string in rainbow.
|
||||
* @param rainbow Display the string in rainbow.
|
||||
*/
|
||||
public static void displayString (final String text, final int duration, final boolean rainbow) {
|
||||
public static void displayString(final String text, final int duration, final boolean rainbow) {
|
||||
currentText = text;
|
||||
ticks = time = duration;
|
||||
isRainbow = rainbow;
|
||||
}
|
||||
|
||||
@SideOnly (Side.CLIENT)
|
||||
public static void updateTicks () {
|
||||
@SideOnly(Side.CLIENT)
|
||||
public static void updateTicks() {
|
||||
if (ticks > 0) {
|
||||
ticks--;
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly (Side.CLIENT)
|
||||
private void renderString () {
|
||||
@SideOnly(Side.CLIENT)
|
||||
private void renderString() {
|
||||
if (ticks > 0 && !MathHelper.stringNullOrLengthZero(currentText)) {
|
||||
final Minecraft mc = Minecraft.getMinecraft();
|
||||
final ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
|
||||
|
||||
@@ -8,13 +8,17 @@ public class SashClientHandler {
|
||||
private static boolean sashEnabled = true;
|
||||
|
||||
public static void toggle() {
|
||||
sashEnabled = !sashEnabled;
|
||||
sashEnabled = !sashEnabled;
|
||||
if (sashEnabled) {
|
||||
HUDHandler.displayString(EnumChatFormatting.GREEN + StatCollector.translateToLocal("text.sash.speed.on"),
|
||||
300, false);
|
||||
HUDHandler.displayString(
|
||||
EnumChatFormatting.GREEN + StatCollector.translateToLocal("text.sash.speed.on"),
|
||||
300,
|
||||
false);
|
||||
} else {
|
||||
HUDHandler.displayString(EnumChatFormatting.RED + StatCollector.translateToLocal("text.sash.speed.off"),
|
||||
300, false);
|
||||
HUDHandler.displayString(
|
||||
EnumChatFormatting.RED + StatCollector.translateToLocal("text.sash.speed.off"),
|
||||
300,
|
||||
false);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
package taintedmagic.client.handler;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.settings.KeyBinding;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import taintedmagic.common.items.equipment.ItemVoidwalkerSash;
|
||||
import taintedmagic.common.network.PacketHandler;
|
||||
import taintedmagic.common.network.PacketSashToggle;
|
||||
import baubles.common.lib.PlayerHandler;
|
||||
import cpw.mods.fml.client.registry.ClientRegistry;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
@@ -7,18 +16,14 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.InputEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.settings.KeyBinding;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
import taintedmagic.common.items.equipment.ItemVoidwalkerSash;
|
||||
import taintedmagic.common.network.PacketHandler;
|
||||
import taintedmagic.common.network.PacketSashToggle;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class SashKeyListener {
|
||||
|
||||
private static final KeyBinding toggleSash = new KeyBinding("tmisc.toggleSash", Keyboard.CHAR_NONE, "tmisc.keyCategory");
|
||||
private static final KeyBinding toggleSash = new KeyBinding(
|
||||
"tmisc.toggleSash",
|
||||
Keyboard.CHAR_NONE,
|
||||
"tmisc.keyCategory");
|
||||
|
||||
public SashKeyListener() {
|
||||
FMLCommonHandler.instance().bus().register(this);
|
||||
|
||||
@@ -2,6 +2,7 @@ package taintedmagic.client.handler;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import taintedmagic.common.TaintedMagic;
|
||||
|
||||
public final class SashServerHandler {
|
||||
@@ -11,8 +12,7 @@ public final class SashServerHandler {
|
||||
|
||||
private static NBTTagCompound getCompound(EntityPlayer player) {
|
||||
NBTTagCompound cmp = player.getEntityData();
|
||||
if (!cmp.hasKey(COMPOUND))
|
||||
cmp.setTag(COMPOUND, new NBTTagCompound());
|
||||
if (!cmp.hasKey(COMPOUND)) cmp.setTag(COMPOUND, new NBTTagCompound());
|
||||
|
||||
return cmp.getCompoundTag(COMPOUND);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user