From 8c4eff0d810bec80f6feebba7739d8b039dc3fe6 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Thu, 23 Jun 2016 21:43:27 -0400 Subject: [PATCH] Formatting! --- .../WayofTime/bloodmagic/ConfigHandler.java | 4 +- .../WayofTime/bloodmagic/annot/Handler.java | 3 +- .../bloodmagic/api/BloodMagicAPI.java | 12 +-- .../bloodmagic/api/event/TeleposeEvent.java | 10 ++- .../api/iface/IDocumentedBlock.java | 23 ++--- .../bloodmagic/api/ritual/EnumRuneType.java | 3 +- .../bloodmagic/block/BlockPhantom.java | 3 +- .../bloodmagic/block/BlockSpectral.java | 3 +- .../bloodmagic/client/hud/HUDElement.java | 23 +++-- .../client/hud/HUDElementHolding.java | 12 ++- .../client/render/LayerBloodElytra.java | 18 ++-- .../bloodmagic/client/render/RenderAltar.java | 36 ++++---- .../command/sub/SubCommandNetwork.java | 33 ++++--- .../compat/guideapi/book/CategoryAlchemy.java | 2 - .../compat/guideapi/book/CategorySpell.java | 2 - .../compat/guideapi/entry/EntryText.java | 15 ++-- .../recipeRenderer/OrbRecipeRenderer.java | 78 ++++++++++------ .../provider/DataProviderBloodAltar.java | 6 +- .../bloodmagic/item/ItemBoundShovel.java | 1 - .../bloodmagic/item/ItemRitualDiviner.java | 8 +- .../item/armour/ItemLivingArmour.java | 3 +- .../item/inventory/ContainerHolding.java | 12 +-- .../item/sigil/ItemSigilHolding.java | 9 +- .../bloodmagic/proxy/ClientProxy.java | 42 ++++----- .../java/WayofTime/bloodmagic/util/Utils.java | 90 ++++++++++--------- .../bloodmagic/util/handler/IMCHandler.java | 3 +- .../util/handler/event/ClientHandler.java | 45 +++++----- .../util/handler/event/CraftingHandler.java | 15 ++-- .../handler/event/LivingArmourHandler.java | 3 +- .../event/MigrateNetworkDataHandler.java | 9 +- 30 files changed, 301 insertions(+), 225 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index c3c08abc..5d213c2e 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -169,7 +169,7 @@ public class ConfigHandler config.addCustomCategoryComment(category, "Block blacklisting"); teleposerBlacklisting = config.getStringList("teleposerBlacklist", category, new String[] { "minecraft:bedrock", "minecraft:mob_spawner" }, "Stops specified blocks from being teleposed. Put entries on new lines. Valid syntax is:\nmodid:blockname:meta"); buildBlacklist(teleposerBlacklisting, teleposerBlacklist); - teleposerBlacklistEntity = Arrays.asList(config.getStringList("teleposerBlacklistEntity", category, new String[]{}, "Entity class names listed here will not be able to be teleposed.")); + teleposerBlacklistEntity = Arrays.asList(config.getStringList("teleposerBlacklistEntity", category, new String[] {}, "Entity class names listed here will not be able to be teleposed.")); category = "Transposition Sigil Blacklist"; config.addCustomCategoryComment(category, "Block blacklisting"); @@ -291,7 +291,7 @@ public class ConfigHandler config.addCustomCategoryComment(category, "Client only settings"); alwaysRenderRoutingLines = config.getBoolean("alwaysRenderRoutingLines", category, false, "Always renders the beams between routing nodes. If false, only renders while a Node Router is being held."); invisibleSpectralBlocks = config.get(category, "invisibleSpectralBlocks", true, "Spectral Blocks (Used by the Suppression Sigil to store fluids) will not render at all. If false, a see through texture will render. [default: true]").setRequiresMcRestart(true).getBoolean(); - sigilHoldingSkipsEmptySlots = config.getBoolean( "sigilHoldingSkipsEmptySlots", category, false, "The Sigil of Holding will skip empty sigil slots if set to true."); + sigilHoldingSkipsEmptySlots = config.getBoolean("sigilHoldingSkipsEmptySlots", category, false, "The Sigil of Holding will skip empty sigil slots if set to true."); category = "Compatibility"; config.addCustomCategoryComment(category, "Compatibility settings"); diff --git a/src/main/java/WayofTime/bloodmagic/annot/Handler.java b/src/main/java/WayofTime/bloodmagic/annot/Handler.java index 0e972824..7ac96732 100644 --- a/src/main/java/WayofTime/bloodmagic/annot/Handler.java +++ b/src/main/java/WayofTime/bloodmagic/annot/Handler.java @@ -11,5 +11,6 @@ import java.lang.annotation.Target; */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) -public @interface Handler { +public @interface Handler +{ } diff --git a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java index 1323545c..edfa8e02 100644 --- a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java @@ -151,14 +151,14 @@ public class BloodMagicAPI } /** - * Used to add a {@link BlockStack} to the Transposition blacklist that cannot - * be changed via Configuration files. - * + * Used to add a {@link BlockStack} to the Transposition blacklist that + * cannot be changed via Configuration files. + * * IMC: * {@code FMLInterModComs.sendMessage("BloodMagic", "transpositionBlacklist", ItemStack)} * Example: * {@code FMLInterModComs.sendMessage("BloodMagic", "transpositionBlacklist", new ItemStack(Blocks.bedrock))} - * + * * @param blockStack * - The BlockStack to blacklist. */ @@ -170,7 +170,7 @@ public class BloodMagicAPI /** * @see #addToTranspositionBlacklist(BlockStack) - * + * * @param block * - The block to blacklist * @param meta @@ -183,7 +183,7 @@ public class BloodMagicAPI /** * @see #addToTranspositionBlacklist(BlockStack) - * + * * @param block * - The block to blacklist */ diff --git a/src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java index 7d07c921..eb9e3833 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java +++ b/src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java @@ -46,8 +46,8 @@ public class TeleposeEvent extends Event } /** - * Fired when a Teleposer attempts to move an Entity between locations. Can be cancelled to - * stop transposition. + * Fired when a Teleposer attempts to move an Entity between locations. Can + * be cancelled to stop transposition. */ @Cancelable public static class Ent extends TeleposeEvent @@ -76,9 +76,11 @@ public class TeleposeEvent extends Event /** * Called after the entity has been transposed. */ - public static class Post extends Ent { + public static class Post extends Ent + { - public Post(Entity entity, World initialWorld, BlockPos initialBlockPos, World finalWorld, BlockPos finalBlockPos) { + public Post(Entity entity, World initialWorld, BlockPos initialBlockPos, World finalWorld, BlockPos finalBlockPos) + { super(entity, initialWorld, initialBlockPos, finalWorld, finalBlockPos); } } diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IDocumentedBlock.java b/src/main/java/WayofTime/bloodmagic/api/iface/IDocumentedBlock.java index 794a3315..4c8430fe 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IDocumentedBlock.java +++ b/src/main/java/WayofTime/bloodmagic/api/iface/IDocumentedBlock.java @@ -11,24 +11,27 @@ import java.util.List; /** * Marks blocks as one that is documented. - * - * This documentation can be read by an {@link WayofTime.bloodmagic.item.ItemSanguineBook} (or child) + * + * This documentation can be read by an + * {@link WayofTime.bloodmagic.item.ItemSanguineBook} (or child) */ public interface IDocumentedBlock { /** - * Provides the documentation to provide to the player. Usually a short'n'sweet description about basic usage. - * + * Provides the documentation to provide to the player. Usually a + * short'n'sweet description about basic usage. + * * @param player - * - The EntityPlayer attempting to view the Documentation. + * - The EntityPlayer attempting to view the Documentation. * @param world - * - The World interaction is happening in. + * - The World interaction is happening in. * @param pos - * - The BlockPos being interacted at. + * - The BlockPos being interacted at. * @param state - * - The IBlockState of the interacted Block. - * - * @return - A list of formatted ITextComponent to provide to the player. Provide an empty list if there is no available documentation. + * - The IBlockState of the interacted Block. + * + * @return - A list of formatted ITextComponent to provide to the player. + * Provide an empty list if there is no available documentation. */ @Nonnull List getDocumentation(EntityPlayer player, World world, BlockPos pos, IBlockState state); diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java index f3e63ebf..9be20395 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java @@ -19,7 +19,8 @@ public enum EnumRuneType implements IStringSerializable public final TextFormatting colorCode; - EnumRuneType(TextFormatting colorCode) { + EnumRuneType(TextFormatting colorCode) + { this.colorCode = colorCode; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java index 3051f901..3dde1786 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java @@ -74,7 +74,8 @@ public class BlockPhantom extends BlockContainer implements IVariantProvider @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) + { return world.getBlockState(pos.offset(side)) != state || state.getBlock() != this && super.shouldSideBeRendered(state, world, pos, side); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java index bd5cffe5..357c1a99 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java @@ -83,7 +83,8 @@ public class BlockSpectral extends BlockContainer implements IVariantProvider @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) + { return world.getBlockState(pos.offset(side)) != state || state.getBlock() != this && super.shouldSideBeRendered(state, world, pos, side); } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java index 4a576f2c..cb815f47 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java @@ -12,7 +12,8 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent; @Getter @Setter -public abstract class HUDElement { +public abstract class HUDElement +{ private int xOffset; private int yOffset; @@ -20,7 +21,8 @@ public abstract class HUDElement { private final int yOffsetDefault; private final RenderGameOverlayEvent.ElementType elementType; - public HUDElement(int xOffset, int yOffset, RenderGameOverlayEvent.ElementType elementType) { + public HUDElement(int xOffset, int yOffset, RenderGameOverlayEvent.ElementType elementType) + { this.xOffset = xOffset; this.xOffsetDefault = xOffset; this.yOffset = yOffset; @@ -34,25 +36,28 @@ public abstract class HUDElement { public abstract boolean shouldRender(Minecraft minecraft); - public void onPositionChanged() { + public void onPositionChanged() + { } - public void resetToDefault() { + public void resetToDefault() + { this.xOffset = xOffsetDefault; this.yOffset = yOffsetDefault; } - public void drawTexturedModalRect(int x, int y, int textureX, int textureY, int width, int height) { + public void drawTexturedModalRect(int x, int y, int textureX, int textureY, int width, int height) + { float f = 0.00390625F; float f1 = 0.00390625F; Tessellator tessellator = Tessellator.getInstance(); VertexBuffer vertexbuffer = tessellator.getBuffer(); vertexbuffer.begin(7, DefaultVertexFormats.POSITION_TEX); - vertexbuffer.pos((double)(x + 0), (double)(y + height), 0).tex((double)((float)(textureX + 0) * f), (double)((float)(textureY + height) * f1)).endVertex(); - vertexbuffer.pos((double)(x + width), (double)(y + height), 0).tex((double)((float)(textureX + width) * f), (double)((float)(textureY + height) * f1)).endVertex(); - vertexbuffer.pos((double)(x + width), (double)(y + 0), 0).tex((double)((float)(textureX + width) * f), (double)((float)(textureY + 0) * f1)).endVertex(); - vertexbuffer.pos((double)(x + 0), (double)(y + 0), 0).tex((double)((float)(textureX + 0) * f), (double)((float)(textureY + 0) * f1)).endVertex(); + vertexbuffer.pos((double) (x + 0), (double) (y + height), 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + height) * f1)).endVertex(); + vertexbuffer.pos((double) (x + width), (double) (y + height), 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + height) * f1)).endVertex(); + vertexbuffer.pos((double) (x + width), (double) (y + 0), 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + 0) * f1)).endVertex(); + vertexbuffer.pos((double) (x + 0), (double) (y + 0), 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + 0) * f1)).endVertex(); tessellator.draw(); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java index 93a6c965..66c840b5 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java @@ -14,14 +14,17 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent; import javax.annotation.Nullable; -public class HUDElementHolding extends HUDElement { +public class HUDElementHolding extends HUDElement +{ - public HUDElementHolding() { + public HUDElementHolding() + { super(0, 0, RenderGameOverlayEvent.ElementType.HOTBAR); } @Override - public void render(Minecraft minecraft, ScaledResolution resolution, float partialTicks) { + public void render(Minecraft minecraft, ScaledResolution resolution, float partialTicks) + { ItemStack sigilHolding = minecraft.thePlayer.getHeldItemMainhand(); // TODO - Clean this mess // Check mainhand for Sigil of Holding @@ -59,7 +62,8 @@ public class HUDElementHolding extends HUDElement { } @Override - public boolean shouldRender(Minecraft minecraft) { + public boolean shouldRender(Minecraft minecraft) + { return true; } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java b/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java index 54dffb91..a6c6ab6f 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java @@ -13,21 +13,26 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -public class LayerBloodElytra implements LayerRenderer { +public class LayerBloodElytra implements LayerRenderer +{ private static final ResourceLocation TEXTURE_BLOOD_ELYTRA = new ResourceLocation("bloodmagic", "textures/entities/bloodElytra.png"); private final RenderPlayer renderPlayer; private final ModelElytra modelElytra = new ModelElytra(); - public LayerBloodElytra(RenderPlayer renderPlayer) { + public LayerBloodElytra(RenderPlayer renderPlayer) + { this.renderPlayer = renderPlayer; } @Override - public void doRenderLayer(AbstractClientPlayer clientPlayer, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - if (LivingArmour.hasFullSet(clientPlayer)) { + public void doRenderLayer(AbstractClientPlayer clientPlayer, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) + { + if (LivingArmour.hasFullSet(clientPlayer)) + { ItemStack chestStack = clientPlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST); - if (ItemLivingArmour.hasUpgrade(Constants.Mod.MODID + ".upgrade.elytra", chestStack)) { + if (ItemLivingArmour.hasUpgrade(Constants.Mod.MODID + ".upgrade.elytra", chestStack)) + { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.enableBlend(); @@ -47,7 +52,8 @@ public class LayerBloodElytra implements LayerRenderer { } @Override - public boolean shouldCombineTextures() { + public boolean shouldCombineTextures() + { return false; } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/RenderAltar.java index 20c3df96..62dffacb 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/RenderAltar.java @@ -153,24 +153,24 @@ public class RenderAltar extends TileEntitySpecialRenderer switch (altarComponent.getComponent()) { - case BLOODRUNE: - texture = ClientHandler.blankBloodRune; - break; - case NOTAIR: - texture = ClientHandler.stoneBrick; - break; - case GLOWSTONE: - texture = ClientHandler.glowstone; - break; - case BLOODSTONE: - texture = ClientHandler.bloodStoneBrick; - break; - case BEACON: - texture = ClientHandler.beacon; - break; - case CRYSTAL: - texture = ClientHandler.crystalCluster; - break; + case BLOODRUNE: + texture = ClientHandler.blankBloodRune; + break; + case NOTAIR: + texture = ClientHandler.stoneBrick; + break; + case GLOWSTONE: + texture = ClientHandler.glowstone; + break; + case BLOODSTONE: + texture = ClientHandler.bloodStoneBrick; + break; + case BEACON: + texture = ClientHandler.beacon; + break; + case CRYSTAL: + texture = ClientHandler.crystalCluster; + break; } RenderFakeBlocks.drawFakeBlock(texture, minX, minY, minZ, world); diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java index a1a1a340..6297dbaf 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java @@ -50,24 +50,28 @@ public class SubCommandNetwork extends SubCommandBase { EntityPlayer player = CommandBase.getPlayer(server, commandSender, args[1]); - try { + try + { ValidCommands command = ValidCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH)); command.run(player, commandSender, isBounded(0, 2, args.length), args); - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException e) + { } } catch (PlayerNotFoundException e) { displayErrorString(commandSender, e.getLocalizedMessage()); } - } else { + } else + { displayErrorString(commandSender, "commands.error.arg.missing"); } } private enum ValidCommands { - SYPHON("commands.network.syphon.help") { + SYPHON("commands.network.syphon.help") + { @Override public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { @@ -94,7 +98,8 @@ public class SubCommandNetwork extends SubCommandBase } } }, - ADD("commands.network.add.help") { + ADD("commands.network.add.help") + { @Override public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { @@ -123,7 +128,8 @@ public class SubCommandNetwork extends SubCommandBase } } }, - SET("commands.network.set.help") { + SET("commands.network.set.help") + { @Override public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { @@ -152,7 +158,8 @@ public class SubCommandNetwork extends SubCommandBase } } }, - GET("commands.network.get.help") { + GET("commands.network.get.help") + { @Override public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { @@ -169,9 +176,11 @@ public class SubCommandNetwork extends SubCommandBase } }, - FILL("commands.network.fill.help") { + FILL("commands.network.fill.help") + { @Override - public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { + public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) + { if (displayHelp) { displayHelpString(sender, this.help, Integer.MAX_VALUE); @@ -187,9 +196,11 @@ public class SubCommandNetwork extends SubCommandBase } } }, - CAP("commands.network.cap.help") { + CAP("commands.network.cap.help") + { @Override - public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { + public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) + { if (displayHelp) { displayHelpString(sender, this.help); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java index db84a523..0089c181 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java @@ -14,8 +14,6 @@ public class CategoryAlchemy Map entries = new LinkedHashMap(); String keyBase = Constants.Mod.DOMAIN + "alchemy_"; - - return entries; } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java index 1abc04b8..52aaa64d 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java @@ -15,8 +15,6 @@ public class CategorySpell Map entries = new LinkedHashMap(); String keyBase = Constants.Mod.DOMAIN + "spell_"; - - return entries; } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java index ee14c113..f14b372f 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java @@ -16,19 +16,23 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Collections; import java.util.List; -public class EntryText extends EntryResourceLocation { +public class EntryText extends EntryResourceLocation +{ - public EntryText(List pageList, String unlocEntryName, boolean unicode) { + public EntryText(List pageList, String unlocEntryName, boolean unicode) + { super(pageList, unlocEntryName, new ResourceLocation("bloodmagicguide", "textures/gui/bullet_point.png"), unicode); } - public EntryText(List pageList, String unlocEntryName) { + public EntryText(List pageList, String unlocEntryName) + { this(pageList, unlocEntryName, false); } @Override @SideOnly(Side.CLIENT) - public void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + public void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) + { Minecraft.getMinecraft().getTextureManager().bindTexture(image); GuiHelper.drawSizedIconWithoutColor(entryX + 4, entryY + 2, 8, 8, 1F); @@ -42,7 +46,8 @@ public class EntryText extends EntryResourceLocation { if (strWidth > guiBase.xSize - 80 && strWidth > fontRendererObj.getStringWidth("...")) cutString = true; - if (GuiHelper.isMouseBetween(mouseX, mouseY, entryX, entryY, entryWidth, entryHeight) && cutString) { + if (GuiHelper.isMouseBetween(mouseX, mouseY, entryX, entryY, entryWidth, entryHeight) && cutString) + { guiBase.drawHoveringText(Collections.singletonList(getLocalizedName()), entryX, entryY + 12); fontRendererObj.setUnicodeFlag(unicode); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/OrbRecipeRenderer.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/OrbRecipeRenderer.java index 5f57509d..b8f54259 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/OrbRecipeRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/OrbRecipeRenderer.java @@ -31,21 +31,24 @@ public class OrbRecipeRenderer implements IRecipeRenderer } @Override - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) + { Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("gudieapi", "textures/gui/recipe_elements.png")); guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 0, 105, 65); guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.recipe.shapedOrb"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); - if(recipe instanceof ShapelessBloodOrbRecipe) + if (recipe instanceof ShapelessBloodOrbRecipe) { ShapelessBloodOrbRecipe shapelessBloodOrbRecipe = (ShapelessBloodOrbRecipe) recipe; List list = shapelessBloodOrbRecipe.getInput(); int width = 3; int height = 3; - for (int y = 0; y < height; y++) { - for (int x = 0; x < width; x++) { - if(list.size() - 1 < y * width + x) + for (int y = 0; y < height; y++) + { + for (int x = 0; x < width; x++) + { + if (list.size() - 1 < y * width + x) { continue; } @@ -54,21 +57,29 @@ public class OrbRecipeRenderer implements IRecipeRenderer int stackY = (y + 1) * 18 + (guiTop + guiBase.ySize / 5); Object component = list.get(y * width + x); - if (component != null) { - if (component instanceof ItemStack) { + if (component != null) + { + if (component instanceof ItemStack) + { GuiHelper.drawItemStack((ItemStack) component, stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { + if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) + { guiBase.renderToolTip((ItemStack) component, stackX, stackY); } - } else if (component instanceof Integer) { + } else if (component instanceof Integer) + { GuiHelper.drawItemStack(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { + if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) + { guiBase.renderToolTip(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY); } - } else { - if (((ArrayList) component).isEmpty()) return; + } else + { + if (((ArrayList) component).isEmpty()) + return; GuiHelper.drawItemStack(((ArrayList) component).get(0), stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { + if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) + { guiBase.renderToolTip(((ArrayList) component).get(0), stackX, stackY); } } @@ -78,34 +89,45 @@ public class OrbRecipeRenderer implements IRecipeRenderer int outputX = (5 * 18) + (guiLeft + guiBase.xSize / 7); int outputY = (2 * 18) + (guiTop + guiBase.xSize / 5); GuiHelper.drawItemStack(shapelessBloodOrbRecipe.getRecipeOutput(), outputX, outputY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) { + if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) + { guiBase.renderToolTip(shapelessBloodOrbRecipe.getRecipeOutput(), outputX, outputY); } - }else if (recipe instanceof ShapedBloodOrbRecipe) + } else if (recipe instanceof ShapedBloodOrbRecipe) { ShapedBloodOrbRecipe shapedBloodOrbRecipe = (ShapedBloodOrbRecipe) recipe; int width = ReflectionHelper.getPrivateValue(ShapedBloodOrbRecipe.class, shapedBloodOrbRecipe, 4); int height = ReflectionHelper.getPrivateValue(ShapedBloodOrbRecipe.class, shapedBloodOrbRecipe, 5); - for (int y = 0; y < height; y++) { - for (int x = 0; x < width; x++) { + for (int y = 0; y < height; y++) + { + for (int x = 0; x < width; x++) + { int stackX = (x + 1) * 18 + (guiLeft + guiBase.xSize / 7); int stackY = (y + 1) * 18 + (guiTop + guiBase.ySize / 5); Object component = shapedBloodOrbRecipe.getInput()[y * width + x]; - if (component != null) { - if (component instanceof ItemStack) { + if (component != null) + { + if (component instanceof ItemStack) + { GuiHelper.drawItemStack((ItemStack) component, stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { + if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) + { guiBase.renderToolTip((ItemStack) component, stackX, stackY); } - } else if (component instanceof Integer) { + } else if (component instanceof Integer) + { GuiHelper.drawItemStack(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { + if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) + { guiBase.renderToolTip(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY); } - } else { - if (((ArrayList) component).isEmpty()) return; + } else + { + if (((ArrayList) component).isEmpty()) + return; GuiHelper.drawItemStack(((ArrayList) component).get(0), stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { + if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) + { guiBase.renderToolTip(((ArrayList) component).get(0), stackX, stackY); } } @@ -115,14 +137,16 @@ public class OrbRecipeRenderer implements IRecipeRenderer int outputX = (5 * 18) + (guiLeft + guiBase.xSize / 7); int outputY = (2 * 18) + (guiTop + guiBase.xSize / 5); GuiHelper.drawItemStack(shapedBloodOrbRecipe.getRecipeOutput(), outputX, outputY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) { + if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) + { guiBase.renderToolTip(shapedBloodOrbRecipe.getRecipeOutput(), outputX, outputY); } } } @Override - public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { + public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) + { } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java index 38d7dd1e..fd387b5f 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java @@ -120,7 +120,8 @@ public class DataProviderBloodAltar implements IWailaDataProvider return false; } - private static boolean holdingSeerSigil(EntityPlayer player) { + private static boolean holdingSeerSigil(EntityPlayer player) + { if (player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() instanceof ItemSigilSeer) return true; @@ -130,7 +131,8 @@ public class DataProviderBloodAltar implements IWailaDataProvider return false; } - private static boolean holdingDivinationSigil(EntityPlayer player) { + private static boolean holdingDivinationSigil(EntityPlayer player) + { if (player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() instanceof ItemSigilDivination) return true; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index 67b359d7..929ebc93 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -92,7 +92,6 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) continue; - if (blockStack.getBlock() != null && blockStack.getBlock().getBlockHardness(blockStack.getState(), world, blockPos) != -1) { float strengthVsBlock = getStrVsBlock(stack, blockStack.getState()); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index b6c956c1..8a2d2a81 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -90,7 +90,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider /** * Adds a single rune to the ritual. - * + * * @param stack * - The Ritual Diviner stack * @param world @@ -99,7 +99,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider * - Block Position of the MRS. * @param player * - The Player attempting to place the ritual - * + * * @return - True if a rune was successfully added */ public boolean addRuneToRitual(ItemStack stack, World world, BlockPos pos, EntityPlayer player) @@ -413,7 +413,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider /** * Cycles the selected ritual to the next available ritual that is enabled. - * + * * @param stack * - The ItemStack of the ritual diviner * @param player @@ -466,7 +466,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider /** * Does the same as cycleRitual but instead cycles backwards. - * + * * @param stack * @param player */ diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index 67278d64..fd9e181c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -477,7 +477,8 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP return null; } - public static boolean hasUpgrade(String id, ItemStack stack) { + public static boolean hasUpgrade(String id, ItemStack stack) + { if (!armourMap.containsKey(stack)) armourMap.put(stack, getLivingArmour(stack)); diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java b/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java index e728bfac..c95f2497 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java @@ -41,8 +41,7 @@ public class ContainerHolding extends Container if (actionBarIndex == currentSlotHeldIn) { this.addSlotToContainer(new SlotDisabled(player.inventory, actionBarIndex, 8 + actionBarIndex * 18, 99)); - } - else + } else { this.addSlotToContainer(new Slot(player.inventory, actionBarIndex, 8 + actionBarIndex * 18, 99)); } @@ -97,13 +96,11 @@ public class ContainerHolding extends Container { return null; } - } - else if (!this.mergeItemStack(stackInSlot, 0, ItemSigilHolding.inventorySize, false)) + } else if (!this.mergeItemStack(stackInSlot, 0, ItemSigilHolding.inventorySize, false)) { return null; } - } - else if (stack.getItem() instanceof ItemSigilHolding) + } else if (stack.getItem() instanceof ItemSigilHolding) { if (slotIndex < ItemSigilHolding.inventorySize + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS)) { @@ -111,8 +108,7 @@ public class ContainerHolding extends Container { return null; } - } - else if (!this.mergeItemStack(stackInSlot, ItemSigilHolding.inventorySize, ItemSigilHolding.inventorySize + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS), false)) + } else if (!this.mergeItemStack(stackInSlot, ItemSigilHolding.inventorySize, ItemSigilHolding.inventorySize + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS), false)) { return null; } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index b4de8aa2..457b9cf1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -226,7 +226,8 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl ItemStack[] itemStacks = getInternalInventory(itemStack); if (itemStacks != null) return itemStacks[slot == 5 ? 4 : slot]; - else return null; + else + return null; } return null; @@ -301,8 +302,7 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl index = next(index); currentItemStack = getItemStackInSlot(itemStack, index); } - } - else + } else { index = prev(currentIndex); currentItemStack = getItemStackInSlot(itemStack, index); @@ -320,7 +320,8 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl } @Override - public List> getVariants() { + public List> getVariants() + { return Collections.emptyList(); } } diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 7e41df18..67ebd01a 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -90,24 +90,23 @@ public class ClientProxy extends CommonProxy @Override public void init() { - Minecraft.getMinecraft().getItemColors().registerItemColorHandler( - new IItemColor() + Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor() + { + @Override + public int getColorFromItemstack(ItemStack stack, int tintIndex) + { + try { - @Override - public int getColorFromItemstack(ItemStack stack, int tintIndex) - { - try { - if (stack.hasTagCompound() && stack.getTagCompound().hasKey(Constants.NBT.COLOR)) - if (tintIndex == 1) - return Color.decode(stack.getTagCompound().getString(Constants.NBT.COLOR)).getRGB(); - } catch (NumberFormatException e) { - return -1; - } - return -1; - } - }, - ModItems.sigilHolding - ); + if (stack.hasTagCompound() && stack.getTagCompound().hasKey(Constants.NBT.COLOR)) + if (tintIndex == 1) + return Color.decode(stack.getTagCompound().getString(Constants.NBT.COLOR)).getRGB(); + } catch (NumberFormatException e) + { + return -1; + } + return -1; + } + }, ModItems.sigilHolding); addElytraLayer(); } @@ -149,13 +148,16 @@ public class ClientProxy extends CommonProxy } } - private void addElytraLayer() { + private void addElytraLayer() + { RenderManager renderManager = Minecraft.getMinecraft().getRenderManager(); - try { + try + { RenderPlayer renderPlayer = ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, renderManager, "playerRenderer", "field_178637_m"); renderPlayer.addLayer(new LayerBloodElytra(renderPlayer)); BloodMagic.instance.getLogger().info("Elytra layer added"); - } catch (Exception e) { + } catch (Exception e) + { BloodMagic.instance.getLogger().error("Failed to set custom Elytra Layer for Elytra Living Armour Upgrade."); BloodMagic.instance.getLogger().error(e.getLocalizedMessage()); } diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index bb5bb57e..f07a7e09 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -93,7 +93,8 @@ public class Utils return true; } - public static String toFancyCasing(String input) { + public static String toFancyCasing(String input) + { return String.valueOf(input.charAt(0)).toUpperCase(Locale.ENGLISH) + input.substring(1); } @@ -731,43 +732,44 @@ public class Utils { spawnPos.offset(pushDirection); - switch (pushDirection) { - case DOWN: - { - entityItem.motionY = -velocity; - entityItem.setPosition(spawnPos.getX() + 0.5D, spawnPos.getY() - 1.0D, spawnPos.getZ() + 0.5D); - break; - } - case UP: - { - entityItem.motionY = velocity; - entityItem.setPosition(spawnPos.getX() + 0.5D, spawnPos.getY() + 1.0D, spawnPos.getZ() + 0.5D); - break; - } - case NORTH: - { - entityItem.motionZ = -velocity; - entityItem.setPosition(spawnPos.getX() + 0.5D, spawnPos.getY() + 0.5D, spawnPos.getZ() - 1.0D); - break; - } - case SOUTH: - { - entityItem.motionZ = velocity; - entityItem.setPosition(spawnPos.getX() + 0.5D, spawnPos.getY() + 0.5D, spawnPos.getZ() + 1.0D); - break; - } - case WEST: - { - entityItem.motionX = -velocity; - entityItem.setPosition(spawnPos.getX() - 1.0D, spawnPos.getY() + 0.5D, spawnPos.getZ() + 0.5D); - break; - } - case EAST: - { - entityItem.motionX = velocity; - entityItem.setPosition(spawnPos.getX() + 1.0D, spawnPos.getY() + 0.5D, spawnPos.getZ() + 0.5D); - break; - } + switch (pushDirection) + { + case DOWN: + { + entityItem.motionY = -velocity; + entityItem.setPosition(spawnPos.getX() + 0.5D, spawnPos.getY() - 1.0D, spawnPos.getZ() + 0.5D); + break; + } + case UP: + { + entityItem.motionY = velocity; + entityItem.setPosition(spawnPos.getX() + 0.5D, spawnPos.getY() + 1.0D, spawnPos.getZ() + 0.5D); + break; + } + case NORTH: + { + entityItem.motionZ = -velocity; + entityItem.setPosition(spawnPos.getX() + 0.5D, spawnPos.getY() + 0.5D, spawnPos.getZ() - 1.0D); + break; + } + case SOUTH: + { + entityItem.motionZ = velocity; + entityItem.setPosition(spawnPos.getX() + 0.5D, spawnPos.getY() + 0.5D, spawnPos.getZ() + 1.0D); + break; + } + case WEST: + { + entityItem.motionX = -velocity; + entityItem.setPosition(spawnPos.getX() - 1.0D, spawnPos.getY() + 0.5D, spawnPos.getZ() + 0.5D); + break; + } + case EAST: + { + entityItem.motionX = velocity; + entityItem.setPosition(spawnPos.getX() + 1.0D, spawnPos.getY() + 0.5D, spawnPos.getZ() + 0.5D); + break; + } } } @@ -918,14 +920,18 @@ public class Utils return largerStack ? stack : null; } - public static void registerHandlers(Set eventHandlers) { - for (ASMDataTable.ASMData data : eventHandlers) { - try { + public static void registerHandlers(Set eventHandlers) + { + for (ASMDataTable.ASMData data : eventHandlers) + { + try + { Class handlerClass = Class.forName(data.getClassName()); Object handlerImpl = handlerClass.newInstance(); MinecraftForge.EVENT_BUS.register(handlerImpl); BloodMagic.instance.getLogger().debug("Registering event handler for class {}", data.getClassName()); - } catch (Exception e) { + } catch (Exception e) + { // No-op } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java index ca3ef747..5f0dccf6 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java @@ -30,7 +30,8 @@ public class IMCHandler if (message.key.equals("transpositionBlacklist") && message.isItemStackMessage()) { ItemStack stack = message.getItemStackValue(); - if (stack.getItem() instanceof ItemBlock) { + if (stack.getItem() instanceof ItemBlock) + { Block block = Block.getBlockFromItem(stack.getItem()); BloodMagicAPI.addToTranspositionBlacklist(block, stack.getItemDamage()); } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 68758ad2..bb4ef43a 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -138,8 +138,7 @@ public class ClientHandler renderRitualStones(mrsHoloTile, event.getPartialTicks()); else ClientHandler.setRitualHolo(null, null, EnumFacing.NORTH, false); - } - else + } else { ClientHandler.setRitualHolo(null, null, EnumFacing.NORTH, false); } @@ -335,27 +334,27 @@ public class ClientHandler switch (ritualComponent.getRuneType()) { - case BLANK: - texture = ritualStoneBlank; - break; - case WATER: - texture = ritualStoneWater; - break; - case FIRE: - texture = ritualStoneFire; - break; - case EARTH: - texture = ritualStoneEarth; - break; - case AIR: - texture = ritualStoneAir; - break; - case DAWN: - texture = ritualStoneDawn; - break; - case DUSK: - texture = ritualStoneDusk; - break; + case BLANK: + texture = ritualStoneBlank; + break; + case WATER: + texture = ritualStoneWater; + break; + case FIRE: + texture = ritualStoneFire; + break; + case EARTH: + texture = ritualStoneEarth; + break; + case AIR: + texture = ritualStoneAir; + break; + case DAWN: + texture = ritualStoneDawn; + break; + case DUSK: + texture = ritualStoneDusk; + break; } RenderFakeBlocks.drawFakeBlock(texture, minX, minY, minZ, world); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index 880b103d..55bdae94 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -25,7 +25,8 @@ import java.util.ArrayList; import java.util.List; @Handler -public class CraftingHandler { +public class CraftingHandler +{ // Sets the uses of crafted Inscription Tools to 10 @SubscribeEvent @@ -42,7 +43,8 @@ public class CraftingHandler { event.getOutput().getTagCompound().setInteger(Constants.NBT.USES, 10); } - if (event.getOutput().getItem() == ForgeModContainer.getInstance().universalBucket && event.getAltarRecipe().getSyphon() == 1000) { + if (event.getOutput().getItem() == ForgeModContainer.getInstance().universalBucket && event.getAltarRecipe().getSyphon() == 1000) + { NBTTagCompound bucketTags = UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, BloodMagicAPI.getLifeEssence()).getTagCompound(); event.getOutput().setTagCompound(bucketTags); } @@ -68,8 +70,10 @@ public class CraftingHandler { } } - if (event.getLeft().getItem() == ModItems.sigilHolding) { - if (event.getRight().getItem() == Items.NAME_TAG) { + if (event.getLeft().getItem() == ModItems.sigilHolding) + { + if (event.getRight().getItem() == Items.NAME_TAG) + { ItemStack output = event.getLeft().copy(); if (!output.hasTagCompound()) output.setTagCompound(new NBTTagCompound()); @@ -81,7 +85,8 @@ public class CraftingHandler { return; } - if (event.getRight().getItem() == Items.DYE) { + if (event.getRight().getItem() == Items.DYE) + { EnumDyeColor dyeColor = ItemBanner.getBaseColor(event.getRight()); ItemStack output = event.getLeft().copy(); if (!output.hasTagCompound()) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index c18aae56..17775430 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -27,7 +27,8 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Handler -public class LivingArmourHandler { +public class LivingArmourHandler +{ // Applies: Grim Reaper @SubscribeEvent(priority = EventPriority.HIGHEST) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/MigrateNetworkDataHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/MigrateNetworkDataHandler.java index e7076590..b06b7bf8 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/MigrateNetworkDataHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/MigrateNetworkDataHandler.java @@ -17,11 +17,14 @@ import java.util.UUID; // Migrates from the old data storage system to the cleaner new one @Handler -public class MigrateNetworkDataHandler { +public class MigrateNetworkDataHandler +{ @SubscribeEvent - public void playerJoin(EntityJoinWorldEvent event) { - if (!event.getWorld().isRemote && event.getEntity() instanceof EntityPlayer) { + public void playerJoin(EntityJoinWorldEvent event) + { + if (!event.getWorld().isRemote && event.getEntity() instanceof EntityPlayer) + { EntityPlayer player = (EntityPlayer) event.getEntity(); UUID playerId = PlayerHelper.getUUIDFromPlayer(player); Stopwatch stopwatch = Stopwatch.createStarted();