SpotlessApply

GTNewHorizons · Jan 24, 2023 · be56bf2 · be56bf2
1 parent bd8e2d9
commit be56bf2
Show file tree

Hide file tree

Showing 305 changed files with 6,792 additions and 4,122 deletions.
diff --git a/src/main/java/thaumic/tinkerer/api/INoRemoveEnchant.java b/src/main/java/thaumic/tinkerer/api/INoRemoveEnchant.java
@@ -14,6 +14,4 @@
  */
 package thaumic.tinkerer.api;
 
-public interface INoRemoveEnchant {
-
-}
+public interface INoRemoveEnchant {}
diff --git a/src/main/java/thaumic/tinkerer/client/core/handler/ClientTickHandler.java b/src/main/java/thaumic/tinkerer/client/core/handler/ClientTickHandler.java
@@ -33,9 +33,13 @@ public class ClientTickHandler {
     public void tickEnd(TickEvent event) {
         if (event.phase == TickEvent.Phase.END) {
             Minecraft mc = ClientHelper.minecraft();
-            if (mc.currentScreen != null && mc.currentScreen instanceof GuiResearchRecipe && !(mc.currentScreen instanceof GuiResearchPeripheral)) {
-                ResearchItem research = ReflectionHelper.getPrivateValue(GuiResearchRecipe.class, (GuiResearchRecipe) mc.currentScreen, 9);
-                if (research.key.equals(LibResearch.KEY_PERIPHERALS) || research.key.equals(LibResearch.KEY_GOLEMCONNECTOR))
+            if (mc.currentScreen != null
+                    && mc.currentScreen instanceof GuiResearchRecipe
+                    && !(mc.currentScreen instanceof GuiResearchPeripheral)) {
+                ResearchItem research = ReflectionHelper.getPrivateValue(
+                        GuiResearchRecipe.class, (GuiResearchRecipe) mc.currentScreen, 9);
+                if (research.key.equals(LibResearch.KEY_PERIPHERALS)
+                        || research.key.equals(LibResearch.KEY_GOLEMCONNECTOR))
                     mc.displayGuiScreen(new GuiResearchPeripheral(research));
             }
 
@@ -44,5 +48,4 @@ public void tickEnd(TickEvent event) {
             ++elapsedTicks;
         }
     }
-
 }
diff --git a/src/main/java/thaumic/tinkerer/client/core/handler/GemArmorKeyHandler.java b/src/main/java/thaumic/tinkerer/client/core/handler/GemArmorKeyHandler.java
@@ -29,10 +29,33 @@ public GemArmorKeyHandler() {
     @SubscribeEvent
     public void keyUp(InputEvent.KeyInputEvent event) {
         if (SpecialAbility.isPressed()) {
-            if ((Minecraft.getMinecraft().thePlayer.getCurrentArmor(0) != null && Minecraft.getMinecraft().thePlayer.getCurrentArmor(0).getItem() instanceof ItemIchorclothArmorAdv) || (Minecraft.getMinecraft().thePlayer.getCurrentArmor(1) != null && Minecraft.getMinecraft().thePlayer.getCurrentArmor(1).getItem() instanceof ItemIchorclothArmorAdv) || (Minecraft.getMinecraft().thePlayer.getCurrentArmor(2) != null && Minecraft.getMinecraft().thePlayer.getCurrentArmor(2).getItem() instanceof ItemIchorclothArmorAdv) || (Minecraft.getMinecraft().thePlayer.getCurrentArmor(3) != null && Minecraft.getMinecraft().thePlayer.getCurrentArmor(3).getItem() instanceof ItemIchorclothArmorAdv)) {
-                KamiArmorClientHandler.SetStatus(!ThaumicTinkerer.proxy.armorStatus(ThaumicTinkerer.proxy.getClientPlayer()));
+            if ((Minecraft.getMinecraft().thePlayer.getCurrentArmor(0) != null
+                            && Minecraft.getMinecraft()
+                                            .thePlayer
+                                            .getCurrentArmor(0)
+                                            .getItem()
+                                    instanceof ItemIchorclothArmorAdv)
+                    || (Minecraft.getMinecraft().thePlayer.getCurrentArmor(1) != null
+                            && Minecraft.getMinecraft()
+                                            .thePlayer
+                                            .getCurrentArmor(1)
+                                            .getItem()
+                                    instanceof ItemIchorclothArmorAdv)
+                    || (Minecraft.getMinecraft().thePlayer.getCurrentArmor(2) != null
+                            && Minecraft.getMinecraft()
+                                            .thePlayer
+                                            .getCurrentArmor(2)
+                                            .getItem()
+                                    instanceof ItemIchorclothArmorAdv)
+                    || (Minecraft.getMinecraft().thePlayer.getCurrentArmor(3) != null
+                            && Minecraft.getMinecraft()
+                                            .thePlayer
+                                            .getCurrentArmor(3)
+                                            .getItem()
+                                    instanceof ItemIchorclothArmorAdv)) {
+                KamiArmorClientHandler.SetStatus(
+                        !ThaumicTinkerer.proxy.armorStatus(ThaumicTinkerer.proxy.getClientPlayer()));
             }
         }
     }
-
 }
diff --git a/src/main/java/thaumic/tinkerer/client/core/handler/HUDHandler.java b/src/main/java/thaumic/tinkerer/client/core/handler/HUDHandler.java
@@ -73,16 +73,25 @@ public void drawDislocationFocusHUD(RenderGameOverlayEvent.Post event) {
                         }
 
                         if (new ItemStack(((ItemBlock) pickedBlock.getItem()).field_150939_a).getItem() != null)
-                            renderItem.renderItemIntoGUI(font, ClientHelper.minecraft().renderEngine, new ItemStack(((ItemBlock) pickedBlock.getItem()).field_150939_a), xpos, ypos);
+                            renderItem.renderItemIntoGUI(
+                                    font,
+                                    ClientHelper.minecraft().renderEngine,
+                                    new ItemStack(((ItemBlock) pickedBlock.getItem()).field_150939_a),
+                                    xpos,
+                                    ypos);
                         else {
                             if (((ItemBlock) pickedBlock.getItem()).field_150939_a == Blocks.reeds)
-                                renderItem.renderItemIntoGUI(font, ClientHelper.minecraft().renderEngine, new ItemStack(Items.reeds), xpos, ypos);
+                                renderItem.renderItemIntoGUI(
+                                        font,
+                                        ClientHelper.minecraft().renderEngine,
+                                        new ItemStack(Items.reeds),
+                                        xpos,
+                                        ypos);
                         }
                         font.setUnicodeFlag(unicode);
                     }
                 }
             }
         }
     }
-
 }
diff --git a/src/main/java/thaumic/tinkerer/client/core/handler/kami/KamiArmorClientHandler.java b/src/main/java/thaumic/tinkerer/client/core/handler/kami/KamiArmorClientHandler.java
@@ -14,10 +14,8 @@ public class KamiArmorClientHandler {
 
     public static void SetStatus(boolean status) {
         if (FMLClientHandler.instance().getClient().currentScreen == null) {
-            if (status)
-                ToolModeHUDHandler.setTooltip(StatCollector.translateToLocal("ttmisc.enableAllArmor"));
-            else
-                ToolModeHUDHandler.setTooltip(StatCollector.translateToLocal("ttmisc.disableAllArmor"));
+            if (status) ToolModeHUDHandler.setTooltip(StatCollector.translateToLocal("ttmisc.enableAllArmor"));
+            else ToolModeHUDHandler.setTooltip(StatCollector.translateToLocal("ttmisc.disableAllArmor"));
             ArmorEnabled = status;
             ThaumicTinkerer.netHandler.sendToServer(new PacketToggleArmor(status));
         }

diff --git a/...ain/java/thaumic/tinkerer/client/core/handler/kami/PlacementMirrorPredictionRenderer.java b/...ain/java/thaumic/tinkerer/client/core/handler/kami/PlacementMirrorPredictionRenderer.java
@@ -1,6 +1,7 @@
 package thaumic.tinkerer.client.core.handler.kami;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderBlocks;
@@ -16,8 +17,6 @@
 import thaumic.tinkerer.common.ThaumicTinkerer;
 import thaumic.tinkerer.common.item.kami.ItemPlacementMirror;
 
-import java.util.List;
-
 public final class PlacementMirrorPredictionRenderer {
 
     RenderBlocks blockRender = new RenderBlocks();
@@ -29,7 +28,10 @@ public void onWorldRenderLast(RenderWorldLastEvent event) {
         List<EntityPlayer> playerEntities = world.playerEntities;
         for (EntityPlayer player : playerEntities) {
             ItemStack currentStack = player.getCurrentEquippedItem();
-            if (currentStack != null && currentStack.getItem() == ThaumicTinkerer.registry.getFirstItemFromClass(ItemPlacementMirror.class) && ItemPlacementMirror.getBlock(currentStack) != Blocks.air) {
+            if (currentStack != null
+                    && currentStack.getItem()
+                            == ThaumicTinkerer.registry.getFirstItemFromClass(ItemPlacementMirror.class)
+                    && ItemPlacementMirror.getBlock(currentStack) != Blocks.air) {
                 renderPlayerLook(player, currentStack);
             }
         }
@@ -38,7 +40,8 @@ public void onWorldRenderLast(RenderWorldLastEvent event) {
     private void renderPlayerLook(EntityPlayer player, ItemStack stack) {
         ChunkCoordinates[] coords = ItemPlacementMirror.getBlocksToPlace(stack, player);
         if (ItemPlacementMirror.hasBlocks(stack, player, coords)) {
-            ItemStack block = new ItemStack(ItemPlacementMirror.getBlock(stack), 1, ItemPlacementMirror.getBlockMeta(stack));
+            ItemStack block =
+                    new ItemStack(ItemPlacementMirror.getBlock(stack), 1, ItemPlacementMirror.getBlockMeta(stack));
             ChunkCoordinates lastCoords = new ChunkCoordinates(0, 0, 0);
 
             GL11.glPushMatrix();
@@ -54,10 +57,12 @@ private void renderPlayerLook(EntityPlayer player, ItemStack stack) {
     }
 
     private void renderBlockAt(ItemStack block, ChunkCoordinates pos, ChunkCoordinates last) {
-        if (block.getItem() == null)
-            return;
+        if (block.getItem() == null) return;
         GL11.glPushMatrix();
-        GL11.glTranslated(pos.posX + 0.5 - RenderManager.renderPosX, pos.posY + 0.5 - RenderManager.renderPosY, pos.posZ + 0.5 - RenderManager.renderPosZ);
+        GL11.glTranslated(
+                pos.posX + 0.5 - RenderManager.renderPosX,
+                pos.posY + 0.5 - RenderManager.renderPosY,
+                pos.posZ + 0.5 - RenderManager.renderPosZ);
 
         GL11.glColor4f(1F, 1F, 1F, 0.6F);
         Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
@@ -66,5 +71,4 @@ private void renderBlockAt(ItemStack block, ChunkCoordinates pos, ChunkCoordinat
 
         GL11.glPopMatrix();
     }
-
 }
diff --git a/src/main/java/thaumic/tinkerer/client/core/handler/kami/SoulHeartClientHandler.java b/src/main/java/thaumic/tinkerer/client/core/handler/kami/SoulHeartClientHandler.java
@@ -14,6 +14,10 @@
  */
 package thaumic.tinkerer.client.core.handler.kami;
 
+import cpw.mods.fml.common.eventhandler.EventPriority;
+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.Gui;
 import net.minecraft.client.gui.ScaledResolution;
@@ -24,10 +28,6 @@
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import thaumic.tinkerer.client.lib.LibResources;
 import thaumic.tinkerer.common.core.handler.ConfigHandler;
-import cpw.mods.fml.common.eventhandler.EventPriority;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public final class SoulHeartClientHandler {
 
@@ -86,30 +86,27 @@ public void renderHealthBar(RenderGameOverlayEvent event) {
         //if (event.type == ElementType.AIR && event instanceof RenderGameOverlayEvent.Post && clientPlayerHP > 0)
             //GL11.glTranslatef(0F, 10F, 0F);
     }*/
-
-    @SubscribeEvent(priority=EventPriority.HIGHEST)
-    public void onDrawScreenPre(RenderGameOverlayEvent.Pre event)
-    {
-      Minecraft mc = Minecraft.getMinecraft();
-      if (event.type == RenderGameOverlayEvent.ElementType.HEALTH)
-      {
-        renderHUD(event.resolution, mc.thePlayer, null);
-      }
+
+    @SubscribeEvent(priority = EventPriority.HIGHEST)
+    public void onDrawScreenPre(RenderGameOverlayEvent.Pre event) {
+        Minecraft mc = Minecraft.getMinecraft();
+        if (event.type == RenderGameOverlayEvent.ElementType.HEALTH) {
+            renderHUD(event.resolution, mc.thePlayer, null);
+        }
     }
-    
+
     @SideOnly(Side.CLIENT)
-    public static void renderHUD(ScaledResolution resolution, EntityPlayer player, ItemStack stack)
-    {
-
-    	Minecraft mc = Minecraft.getMinecraft();
-    	mc.renderEngine.bindTexture(heartsResource);
-    	int x = resolution.getScaledWidth() / 2 + 10;
-    	int y = resolution.getScaledHeight() - ConfigHandler.soulHeartHeight;
-    	if (player.getAir() < 300) {
-    		y = resolution.getScaledHeight() - (ConfigHandler.soulHeartHeight + 10);
-    	}
-
-    	mc.renderEngine.bindTexture(heartsResource);
+    public static void renderHUD(ScaledResolution resolution, EntityPlayer player, ItemStack stack) {
+
+        Minecraft mc = Minecraft.getMinecraft();
+        mc.renderEngine.bindTexture(heartsResource);
+        int x = resolution.getScaledWidth() / 2 + 10;
+        int y = resolution.getScaledHeight() - ConfigHandler.soulHeartHeight;
+        if (player.getAir() < 300) {
+            y = resolution.getScaledHeight() - (ConfigHandler.soulHeartHeight + 10);
+        }
+
+        mc.renderEngine.bindTexture(heartsResource);
         int it = 0;
         for (int i = 0; i < clientPlayerHP; i++) {
             boolean half = i == clientPlayerHP - 1 && clientPlayerHP % 2 != 0;
@@ -119,9 +116,8 @@ public static void renderHUD(ScaledResolution resolution, EntityPlayer player, I
             }
         }
 
-    	//GL11.glEnable(3008);
-    	//GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-    	mc.renderEngine.bindTexture(Gui.icons);
-	}
-
-}
+        // GL11.glEnable(3008);
+        // GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        mc.renderEngine.bindTexture(Gui.icons);
+    }
+}
diff --git a/src/main/java/thaumic/tinkerer/client/core/handler/kami/ToolModeHUDHandler.java b/src/main/java/thaumic/tinkerer/client/core/handler/kami/ToolModeHUDHandler.java
@@ -17,6 +17,7 @@
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import java.awt.*;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.ScaledResolution;
@@ -26,8 +27,6 @@
 import org.lwjgl.opengl.GL11;
 import thaumic.tinkerer.client.core.handler.ClientTickHandler;
 
-import java.awt.*;
-
 public final class ToolModeHUDHandler {
 
     private static String currentTooltip;
@@ -42,14 +41,15 @@ public static void setTooltip(String tooltip) {
 
     @SideOnly(Side.CLIENT)
     public static void clientTick() {
-        if (tooltipDisplayTicks > 0)
-            --tooltipDisplayTicks;
+        if (tooltipDisplayTicks > 0) --tooltipDisplayTicks;
     }
 
     @SubscribeEvent
     @SideOnly(Side.CLIENT)
     public void drawDislocationFocusHUD(RenderGameOverlayEvent.Post event) {
-        if (event.type == ElementType.ALL && tooltipDisplayTicks > 0 && !MathHelper.stringNullOrLengthZero(currentTooltip)) {
+        if (event.type == ElementType.ALL
+                && tooltipDisplayTicks > 0
+                && !MathHelper.stringNullOrLengthZero(currentTooltip)) {
             Minecraft mc = Minecraft.getMinecraft();
             ScaledResolution var5 = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
             int var6 = var5.getScaledWidth();
@@ -61,19 +61,18 @@ public void drawDislocationFocusHUD(RenderGameOverlayEvent.Post event) {
 
             int opacity = (int) (tooltipDisplayTicks * 256.0F / 10.0F);
 
-            if (opacity > 160)
-                opacity = 160;
+            if (opacity > 160) opacity = 160;
 
             if (opacity > 0) {
                 GL11.glPushMatrix();
                 GL11.glEnable(GL11.GL_BLEND);
                 GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-                int color = Color.getHSBColor((float) Math.cos(ClientTickHandler.elapsedTicks / 250D), 0.6F, 1F).getRGB();
+                int color = Color.getHSBColor((float) Math.cos(ClientTickHandler.elapsedTicks / 250D), 0.6F, 1F)
+                        .getRGB();
                 var8.drawStringWithShadow(currentTooltip, tooltipStartX, tooltipStartY, color + (opacity << 24));
                 GL11.glDisable(GL11.GL_BLEND);
                 GL11.glPopMatrix();
             }
         }
     }
-
 }
diff --git a/src/main/java/thaumic/tinkerer/client/core/helper/ClientHelper.java b/src/main/java/thaumic/tinkerer/client/core/helper/ClientHelper.java
@@ -14,15 +14,14 @@
  */
 package thaumic.tinkerer.client.core.helper;
 
+import java.util.List;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.Tessellator;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import java.util.List;
-
 public final class ClientHelper {
 
     public static Minecraft minecraft() {
@@ -53,14 +52,12 @@ public static void renderTooltip(int x, int y, List<String> tooltipData) {
             FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
             for (var6 = 0; var6 < tooltipData.size(); ++var6) {
                 var7 = fontRenderer.getStringWidth(tooltipData.get(var6));
-                if (var7 > var5)
-                    var5 = var7;
+                if (var7 > var5) var5 = var7;
             }
             var6 = x + 12;
             var7 = y - 12;
             int var9 = 8;
-            if (tooltipData.size() > 1)
-                var9 += 2 + (tooltipData.size() - 1) * 10;
+            if (tooltipData.size() > 1) var9 += 2 + (tooltipData.size() - 1) * 10;
             float z = 300.0F;
             drawGradientRect(var6 - 3, var7 - 4, z, var6 + var5 + 3, var7 - 3, color2, color2);
             drawGradientRect(var6 - 3, var7 + var9 + 3, z, var6 + var5 + 3, var7 + var9 + 4, color2, color2);
@@ -75,8 +72,7 @@ public static void renderTooltip(int x, int y, List<String> tooltipData) {
             for (int var13 = 0; var13 < tooltipData.size(); ++var13) {
                 String var14 = tooltipData.get(var13);
                 fontRenderer.drawStringWithShadow(var14, var6, var7, -1);
-                if (var13 == 0)
-                    var7 += 2;
+                if (var13 == 0) var7 += 2;
                 var7 += 10;
             }
         }
@@ -110,5 +106,4 @@ public static void drawGradientRect(int par1, int par2, float z, int par3, int p
         GL11.glEnable(GL11.GL_ALPHA_TEST);
         GL11.glEnable(GL11.GL_TEXTURE_2D);
     }
-
 }
diff --git a/src/main/java/thaumic/tinkerer/client/core/helper/IconHelper.java b/src/main/java/thaumic/tinkerer/client/core/helper/IconHelper.java
@@ -55,5 +55,4 @@ public static IIcon forItem(IIconRegister ir, Item item, int i) {
     public static IIcon forItem(IIconRegister ir, Item item, String s) {
         return forName(ir, item.getUnlocalizedName().replaceAll("item.", "") + s);
     }
-
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         public static IIcon forItem(IIconRegister ir, Item item, String s) {
             return forName(ir, item.getUnlocalizedName().replaceAll("item.", "") + s);
         }
     }