From 65a5fc230c8453326e7b4332cf6675c97fa44d71 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 1 Aug 2018 12:38:02 +0200 Subject: [PATCH] Run code format --- .../mcp/MethodsReturnNonnullByDefault.java | 14 +-- .../voxelmodpack/hdskins/LiteModHDSkins.java | 2 +- .../hdskins/PreviewTextureManager.java | 31 +++---- .../voxelmodpack/hdskins/TextureLoader.java | 2 +- .../hdskins/ThreadDownloadImageETag.java | 3 +- .../com/voxelmodpack/hdskins/gui/CubeMap.java | 4 +- .../hdskins/gui/EntityPlayerModel.java | 3 +- .../hdskins/gui/FileDropListener.java | 2 +- .../voxelmodpack/hdskins/gui/GLWindow.java | 7 +- .../voxelmodpack/hdskins/gui/GuiSkins.java | 27 +++--- .../hdskins/gui/RenderPlayerModel.java | 2 +- .../hdskins/mixin/MixinSkullRenderer.java | 3 +- .../hdskins/resource/SkinData.java | 1 + .../hdskins/resource/SkinResourceManager.java | 4 +- .../hdskins/skins/LegacySkinServer.java | 2 +- .../voxelmodpack/hdskins/skins/NetClient.java | 2 +- .../hdskins/skins/TexturesPayloadBuilder.java | 6 +- .../hdskins/skins/ValhallaSkinServer.java | 7 +- .../upload/ThreadMultipartPostUpload.java | 6 +- .../hdskins/upload/awt/ThreadOpenFile.java | 3 +- .../hdskins/upload/awt/ThreadOpenFilePNG.java | 3 +- .../java/com/minelittlepony/ForgeProxy.java | 18 ++-- .../com/minelittlepony/MineLittlePony.java | 2 +- .../java/com/minelittlepony/PonyConfig.java | 41 +++++--- .../java/com/minelittlepony/PonyManager.java | 14 +-- .../com/minelittlepony/PonyRenderManager.java | 12 +-- .../com/minelittlepony/ducks/IPlayerInfo.java | 3 +- .../com/minelittlepony/gui/IGUIAction.java | 4 +- .../java/com/minelittlepony/gui/Slider.java | 6 +- .../mixin/MixinItemRenderer.java | 2 +- .../minelittlepony/model/ModelWrapper.java | 1 + .../java/com/minelittlepony/model/PMAPI.java | 2 +- .../model/PonyModelConstants.java | 93 +++++++++---------- .../model/capabilities/IModel.java | 9 +- .../model/capabilities/IModelPart.java | 1 + .../model/capabilities/IModelUnicorn.java | 1 + .../model/ponies/ModelVillagerPony.java | 4 +- .../pony/data/ITriggerPixelMapped.java | 9 +- .../com/minelittlepony/pony/data/Pony.java | 10 +- .../minelittlepony/pony/data/PonyData.java | 3 +- .../pony/data/TriggerPixels.java | 4 +- .../render/AbstractPonyRenderer.java | 24 ++--- .../render/LevitatingItemRenderer.java | 4 +- .../com/minelittlepony/render/PonySkull.java | 2 +- .../render/PonySkullRenderer.java | 4 +- .../minelittlepony/render/RenderPonyMob.java | 2 +- .../render/layer/AbstractPonyLayer.java | 9 +- .../layer/LayerEntityOnPonyShoulder.java | 2 +- .../render/layer/LayerHeldPonyItem.java | 2 +- .../render/layer/LayerOverlayBase.java | 2 +- .../render/layer/LayerPonyArmor.java | 6 +- .../render/layer/LayerPonyCape.java | 8 +- .../render/layer/LayerPonyCustomHead.java | 2 +- .../render/layer/LayerPonyElytra.java | 2 +- .../com/minelittlepony/render/plane/Face.java | 11 ++- .../render/player/RenderPonyPlayer.java | 2 +- .../render/ponies/MobRenderers.java | 2 +- .../ponies/RenderPonyZombieVillager.java | 2 +- .../settings/SensibleConfig.java | 3 +- .../transform/PostureFlight.java | 6 +- .../minelittlepony/util/coordinates/Box.java | 6 +- .../minelittlepony/util/coordinates/Quad.java | 2 +- 62 files changed, 248 insertions(+), 228 deletions(-) diff --git a/src/api/java/mcp/MethodsReturnNonnullByDefault.java b/src/api/java/mcp/MethodsReturnNonnullByDefault.java index fb02ffca..6f64c303 100644 --- a/src/api/java/mcp/MethodsReturnNonnullByDefault.java +++ b/src/api/java/mcp/MethodsReturnNonnullByDefault.java @@ -8,14 +8,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; /** - * This annotation can be applied to a package, class or method to indicate that - * the method in that element are nonnull by default unless there is: + * This annotation can be applied to a package, class or method to indicate that the method in that + * element are nonnull by default unless there is: * * */ @@ -23,4 +22,5 @@ import java.lang.annotation.RetentionPolicy; @Nonnull @TypeQualifierDefault(ElementType.METHOD) // Note: This is a copy of javax.annotation.ParametersAreNonnullByDefault with target changed to METHOD @Retention(RetentionPolicy.RUNTIME) -public @interface MethodsReturnNonnullByDefault {} +public @interface MethodsReturnNonnullByDefault { +} diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/LiteModHDSkins.java b/src/hdskins/java/com/voxelmodpack/hdskins/LiteModHDSkins.java index 2b9d17a3..5e674908 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/LiteModHDSkins.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/LiteModHDSkins.java @@ -49,7 +49,7 @@ public class LiteModHDSkins implements InitCompleteListener, ViewportListener, C // register config LiteLoader.getInstance().registerExposable(this, null); - IReloadableResourceManager irrm = (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager(); + IReloadableResourceManager irrm = (IReloadableResourceManager)Minecraft.getMinecraft().getResourceManager(); irrm.registerReloadListener(HDSkinManager.INSTANCE); } diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/PreviewTextureManager.java b/src/hdskins/java/com/voxelmodpack/hdskins/PreviewTextureManager.java index b480f51e..abcd31f5 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/PreviewTextureManager.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/PreviewTextureManager.java @@ -13,8 +13,8 @@ import java.util.Map; import javax.annotation.Nullable; /** - * Manager for fetching preview textures. This ensures that multiple calls - * to the skin server aren't done when fetching preview textures. + * Manager for fetching preview textures. This ensures that multiple calls to the skin server aren't + * done when fetching preview textures. */ public class PreviewTextureManager { @@ -25,8 +25,7 @@ public class PreviewTextureManager { } @Nullable - public PreviewTexture getPreviewTexture(ResourceLocation location, MinecraftProfileTexture.Type type, ResourceLocation def, - @Nullable SkinManager.SkinAvailableCallback callback) { + public PreviewTexture getPreviewTexture(ResourceLocation location, MinecraftProfileTexture.Type type, ResourceLocation def, @Nullable SkinManager.SkinAvailableCallback callback) { if (!textures.containsKey(type)) { return null; } @@ -34,19 +33,19 @@ public class PreviewTextureManager { IImageBuffer buffer = new ImageBufferDownloadHD(); PreviewTexture skinTexture = new PreviewTexture(texture.getMetadata("model"), texture.getUrl(), def, type == MinecraftProfileTexture.Type.SKIN ? new IImageBuffer() { - @Override - @Nullable - public BufferedImage parseUserSkin(BufferedImage image) { - return buffer.parseUserSkin(image); - } + @Override + @Nullable + public BufferedImage parseUserSkin(BufferedImage image) { + return buffer.parseUserSkin(image); + } - @Override - public void skinAvailable() { - if (callback != null) { - callback.skinAvailable(type, location, new MinecraftProfileTexture(texture.getUrl(), Maps.newHashMap())); - } - } - } : null); + @Override + public void skinAvailable() { + if (callback != null) { + callback.skinAvailable(type, location, new MinecraftProfileTexture(texture.getUrl(), Maps.newHashMap())); + } + } + } : null); Minecraft.getMinecraft().getTextureManager().loadTexture(location, skinTexture); return skinTexture; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/TextureLoader.java b/src/hdskins/java/com/voxelmodpack/hdskins/TextureLoader.java index 959e0131..c28cd908 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/TextureLoader.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/TextureLoader.java @@ -9,6 +9,6 @@ public class TextureLoader { private static Minecraft mc = Minecraft.getMinecraft(); public static void loadTexture(final ResourceLocation textureLocation, final ITextureObject textureObj) { - mc.addScheduledTask((Runnable) () -> mc.getTextureManager().loadTexture(textureLocation, textureObj)); + mc.addScheduledTask((Runnable)() -> mc.getTextureManager().loadTexture(textureLocation, textureObj)); } } diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/ThreadDownloadImageETag.java b/src/hdskins/java/com/voxelmodpack/hdskins/ThreadDownloadImageETag.java index 80e6c243..be6b4c0d 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/ThreadDownloadImageETag.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/ThreadDownloadImageETag.java @@ -130,8 +130,7 @@ public class ThreadDownloadImageETag extends SimpleTexture { // try to load from cache anyway setLocalCache(); return; - } catch (IOException ignored) { - } + } catch (IOException ignored) {} } LOGGER.error("Couldn't load skin {} ", imageUrl, e); } finally { diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/CubeMap.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/CubeMap.java index e230549a..783f8587 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/CubeMap.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/CubeMap.java @@ -123,8 +123,8 @@ public class CubeMap { for (int blendPass = 0; blendPass < blendIterations * blendIterations; ++blendPass) { pushMatrix(); - float offsetX = ((float) (blendPass % blendIterations) / (float) blendIterations - 0.5F) / 64; - float offsetY = ((float) (blendPass / blendIterations) / (float) blendIterations - 0.5F) / 64; + float offsetX = ((float)(blendPass % blendIterations) / (float)blendIterations - 0.5F) / 64; + float offsetY = ((float)(blendPass / blendIterations) / (float)blendIterations - 0.5F) / 64; translate(offsetX, offsetY, 0); rotate(MathHelper.sin(lastPartialTick / 400) * 25 + 20, 1, 0, 0); diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java index 99543afa..0c8788bc 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java @@ -38,8 +38,7 @@ public class EntityPlayerModel extends EntityLivingBase { EntityEquipmentSlot.CHEST, ItemStack.EMPTY, EntityEquipmentSlot.LEGS, ItemStack.EMPTY, EntityEquipmentSlot.FEET, ItemStack.EMPTY, - EntityEquipmentSlot.MAINHAND, ItemStack.EMPTY - )); + EntityEquipmentSlot.MAINHAND, ItemStack.EMPTY)); private PreviewTexture remoteSkinTexture; private ResourceLocation remoteSkinResource; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/FileDropListener.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/FileDropListener.java index 0aac1ef4..8ab1da92 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/FileDropListener.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/FileDropListener.java @@ -35,7 +35,7 @@ public interface FileDropListener extends DropTargetListener { default void drop(DropTargetDropEvent dtde) { dtde.acceptDrop(DnDConstants.ACTION_LINK); try { - onDrop((List) dtde.getTransferable().getTransferData(DataFlavor.javaFileListFlavor)); + onDrop((List)dtde.getTransferable().getTransferData(DataFlavor.javaFileListFlavor)); dtde.getDropTargetContext().dropComplete(true); } catch (UnsupportedFlavorException | IOException e) { e.printStackTrace(); diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GLWindow.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GLWindow.java index 59f554d3..d275cb9f 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GLWindow.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GLWindow.java @@ -206,12 +206,11 @@ public class GLWindow extends DropTarget { // LWJGL copies the initial byte streams and then reverses them. The result is a stream that's not // only already consumed, but somehow invalid when you try to parse it through ImageIO.read. // - DefaultResourcePack pack = (DefaultResourcePack) mc.getResourcePackRepository().rprDefaultResourcePack; + DefaultResourcePack pack = (DefaultResourcePack)mc.getResourcePackRepository().rprDefaultResourcePack; ArrayList images = Lists.newArrayList( ImageIO.read(pack.getInputStreamAssets(new ResourceLocation("icons/icon_16x16.png"))), - ImageIO.read(pack.getInputStreamAssets(new ResourceLocation("icons/icon_32x32.png"))) - ); + ImageIO.read(pack.getInputStreamAssets(new ResourceLocation("icons/icon_32x32.png")))); Frame[] frames = Frame.getFrames(); @@ -267,6 +266,6 @@ public class GLWindow extends DropTarget { frame.setDropTarget(this); addDropTargetListener(dtl); - } catch (TooManyListenersException ignored) { } + } catch (TooManyListenersException ignored) {} } } diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java index 18fe2c41..d13cef74 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java @@ -214,7 +214,7 @@ public class GuiSkins extends GuiScreen { } private void enableDnd() { - GLWindow.current().setDropTargetListener((FileDropListener) files -> { + GLWindow.current().setDropTargetListener((FileDropListener)files -> { files.stream().findFirst().ifPresent(instance::loadLocalFile); }); } @@ -241,7 +241,7 @@ public class GuiSkins extends GuiScreen { Minecraft.getMinecraft().addScheduledTask(localPlayer::releaseTextures); if (!skinFile.exists()) { skinMessage = I18n.format("hdskins.error.unreadable"); - } else if (!FilenameUtils.isExtension(skinFile.getName(), new String[]{"png", "PNG"})) { + } else if (!FilenameUtils.isExtension(skinFile.getName(), new String[] {"png", "PNG"})) { skinMessage = I18n.format("hdskins.error.ext"); } else { BufferedImage chosenImage; @@ -257,7 +257,7 @@ public class GuiSkins extends GuiScreen { skinMessage = I18n.format("hdskins.error.open"); } else if (isPowerOfTwo(chosenImage.getWidth()) && (chosenImage.getWidth() == chosenImage.getHeight() * 2 - || chosenImage.getWidth() == chosenImage.getHeight()) + || chosenImage.getWidth() == chosenImage.getHeight()) && chosenImage.getWidth() <= MAX_SKIN_DIMENSION && chosenImage.getHeight() <= MAX_SKIN_DIMENSION) { synchronized (skinLock) { @@ -435,7 +435,7 @@ public class GuiSkins extends GuiScreen { if (!localPlayer.isUsingLocalTexture()) { int opacity = fontRenderer.getStringWidth(skinMessage) / 2; Gui.drawRect(40, height / 2 - 12, width / 2 - 40, height / 2 + 12, 0xB0000000); - fontRenderer.drawStringWithShadow(skinMessage, (int) (xPos1 - opacity), height / 2 - 4, 0xffffff); + fontRenderer.drawStringWithShadow(skinMessage, (int)(xPos1 - opacity), height / 2 - 4, 0xffffff); } if (btnModeSkin.isMouseOver() || btnModeElytra.isMouseOver() || btnModeSkinnySkin.isMouseOver()) { int y = Math.max(mouseY, 16); @@ -462,15 +462,15 @@ public class GuiSkins extends GuiScreen { int stringWidth1 = fontRenderer.getStringWidth(opacity1) / 2; int stringWidth2 = fontRenderer.getStringWidth(stringWidth) / 2; - Gui.drawRect((int) (xPos2 - labelwidth), height / 2 - 16, width - 40, height / 2 + 16, 0xB0000000); + Gui.drawRect((int)(xPos2 - labelwidth), height / 2 - 16, width - 40, height / 2 + 16, 0xB0000000); - fontRenderer.drawStringWithShadow(opacity1, (int) (xPos2 - stringWidth1), height / 2 - 10, 0xffffff); - fontRenderer.drawStringWithShadow(stringWidth, (int) (xPos2 - stringWidth2), height / 2 + 2, 0xffffff); + fontRenderer.drawStringWithShadow(opacity1, (int)(xPos2 - stringWidth1), height / 2 - 10, 0xffffff); + fontRenderer.drawStringWithShadow(stringWidth, (int)(xPos2 - stringWidth2), height / 2 + 2, 0xffffff); } else { opacity1 = I18n.format("hdskins.fetch"); int stringWidth1 = fontRenderer.getStringWidth(opacity1) / 2; - Gui.drawRect((int) (xPos2 - labelwidth), height / 2 - 12, width - 40, height / 2 + 12, 0xB0000000); - fontRenderer.drawStringWithShadow(opacity1, (int) (xPos2 - stringWidth1), height / 2 - 4, 0xffffff); + Gui.drawRect((int)(xPos2 - labelwidth), height / 2 - 12, width - 40, height / 2 + 12, 0xB0000000); + fontRenderer.drawStringWithShadow(opacity1, (int)(xPos2 - stringWidth1), height / 2 - 4, 0xffffff); } } @@ -485,7 +485,7 @@ public class GuiSkins extends GuiScreen { uploadOpacity = 1; } - int opacity = Math.min(180, (int) (uploadOpacity * 180)) & 255; + int opacity = Math.min(180, (int)(uploadOpacity * 180)) & 255; if (uploadOpacity > 0) { Gui.drawRect(0, 0, width, height, opacity << 24); if (uploadingSkin) { @@ -504,8 +504,7 @@ public class GuiSkins extends GuiScreen { enableDepth(); } - private void renderPlayerModel(EntityPlayerModel thePlayer, float xPosition, float yPosition, float scale, float mouseY, float mouseX, - float partialTick) { + private void renderPlayerModel(EntityPlayerModel thePlayer, float xPosition, float yPosition, float scale, float mouseY, float mouseX, float partialTick) { enableColorMaterial(); pushMatrix(); translate(xPosition, yPosition, 300); @@ -523,9 +522,9 @@ public class GuiSkins extends GuiScreen { rotate(rot, 0, 1, 0); - thePlayer.rotationYawHead = (float) Math.atan(mouseX / 20) * 30; + thePlayer.rotationYawHead = (float)Math.atan(mouseX / 20) * 30; - thePlayer.rotationPitch = -((float) Math.atan(mouseY / 40)) * 20; + thePlayer.rotationPitch = -((float)Math.atan(mouseY / 40)) * 20; translate(0, thePlayer.getYOffset(), 0); RenderManager rm = Minecraft.getMinecraft().getRenderManager(); diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java index ac21a13d..4d696256 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java @@ -40,7 +40,7 @@ public class RenderPlayerModel extends RenderLiving return new LayerRenderer() { @Override public void doRenderLayer(EntityLivingBase entityBase, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - EntityPlayerModel entity = (EntityPlayerModel) entityBase; + EntityPlayerModel entity = (EntityPlayerModel)entityBase; ItemStack itemstack = entity.getItemStackFromSlot(EntityEquipmentSlot.CHEST); if (itemstack.getItem() == Items.ELYTRA) { diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinSkullRenderer.java b/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinSkullRenderer.java index 9f96b1c2..4c912b31 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinSkullRenderer.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinSkullRenderer.java @@ -24,8 +24,7 @@ public abstract class MixinSkullRenderer extends TileEntitySpecialRenderer skin = HDSkinManager.INSTANCE.getSkinLocation(profile, Type.SKIN, true); if (skin.isPresent()) { diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinData.java b/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinData.java index 59f46576..bccd5cad 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinData.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinData.java @@ -11,6 +11,7 @@ class SkinData { List skins; } + @SuppressWarnings("unused") class Skin { diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinResourceManager.java b/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinResourceManager.java index 2d91f64c..0c6462f2 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinResourceManager.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinResourceManager.java @@ -91,8 +91,8 @@ public class SkinResourceManager implements IResourceManagerReloadListener { /** * Convert older resources to a newer format. * - * @param res The skin resource to convert - * @return The converted resource + * @param res The skin resource to convert + * @return The converted resource */ @Nullable public ResourceLocation getConvertedResource(@Nullable ResourceLocation res) { diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java index bca30b67..fc235f40 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java @@ -63,7 +63,7 @@ public class LegacySkinServer implements SkinServer { String url = getPath(address, type, profile); try { - HttpURLConnection urlConnection = (HttpURLConnection) new URL(url).openConnection(); + HttpURLConnection urlConnection = (HttpURLConnection)new URL(url).openConnection(); if (urlConnection.getResponseCode() / 100 != 2) { throw new IOException("Bad response code: " + urlConnection.getResponseCode()); } diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/NetClient.java b/src/hdskins/java/com/voxelmodpack/hdskins/skins/NetClient.java index 0e91c50d..f9724be6 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/NetClient.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/skins/NetClient.java @@ -58,7 +58,7 @@ public class NetClient { response = HttpClients.createSystem().execute(request); return getResponseCode() == HttpStatus.SC_OK; - } catch (IOException e) { } + } catch (IOException e) {} return false; } diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/TexturesPayloadBuilder.java b/src/hdskins/java/com/voxelmodpack/hdskins/skins/TexturesPayloadBuilder.java index 2ef57ec8..d3598717 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/TexturesPayloadBuilder.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/skins/TexturesPayloadBuilder.java @@ -12,9 +12,9 @@ import java.util.Map; import java.util.UUID; /** - * Use this to build a {@link MinecraftTexturesPayload} object. This is - * required because it has no useful constructor. This uses reflection - * via Gson to create a new instance and populate the fields. + * Use this to build a {@link MinecraftTexturesPayload} object. This is required because it has no + * useful constructor. This uses reflection via Gson to create a new instance and populate the + * fields. */ @SuppressWarnings("unused") public class TexturesPayloadBuilder { diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java index 0b10823d..e20f5f7b 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java @@ -55,8 +55,7 @@ public class ValhallaSkinServer implements SkinServer { @Override public Optional loadProfileData(GameProfile profile) { - try (CloseableHttpClient client = HttpClients.createSystem(); - CloseableHttpResponse response = client.execute(new HttpGet(getTexturesURI(profile)))) { + try (CloseableHttpClient client = HttpClients.createSystem(); CloseableHttpResponse response = client.execute(new HttpGet(getTexturesURI(profile)))) { if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) { @@ -88,9 +87,7 @@ public class ValhallaSkinServer implements SkinServer { }, HDSkinManager.skinUploadExecutor); } - private SkinUploadResponse upload(CloseableHttpClient client, Session session, @Nullable URI image, - MinecraftProfileTexture.Type type, Map metadata) - throws IOException { + private SkinUploadResponse upload(CloseableHttpClient client, Session session, @Nullable URI image, MinecraftProfileTexture.Type type, Map metadata) throws IOException { GameProfile profile = session.getProfile(); if (image == null) { diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadMultipartPostUpload.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadMultipartPostUpload.java index d62ca3fa..6de50348 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadMultipartPostUpload.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadMultipartPostUpload.java @@ -20,7 +20,7 @@ import javax.annotation.Nullable; /** * Uploader for Multipart form data * - * @author Adam Mummery-Smith + * @author Adam Mummery-Smith * @deprecated Use httpmime multipart upload */ @Deprecated @@ -59,7 +59,7 @@ public class ThreadMultipartPostUpload { URL url = new URL(urlString); // Open a HTTP connection to the URL - httpClient = (HttpURLConnection) url.openConnection(); + httpClient = (HttpURLConnection)url.openConnection(); httpClient.setDoOutput(true); httpClient.setUseCaches(false); @@ -84,7 +84,7 @@ public class ThreadMultipartPostUpload { Object paramData = data.getValue(); if (paramData instanceof URI) { - Path uploadPath = Paths.get((URI) paramData); + Path uploadPath = Paths.get((URI)paramData); outputStream.writeBytes("Content-Disposition: form-data; name=\"" + paramName + "\"; filename=\"" + uploadPath.getFileName() + "\"" + CRLF); outputStream.writeBytes("Content-Type: image/png" + CRLF + CRLF); diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java index 42edb4e9..25433aa7 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java @@ -25,8 +25,7 @@ public abstract class ThreadOpenFile extends Thread { private static String lastChosenFile = null; - protected ThreadOpenFile(Minecraft minecraft, String dialogTitle, IOpenFileCallback callback) - throws IllegalStateException { + protected ThreadOpenFile(Minecraft minecraft, String dialogTitle, IOpenFileCallback callback) throws IllegalStateException { if (minecraft.isFullScreen()) { throw new IllegalStateException("Cannot open an awt window whilst minecraft is in full screen mode!"); } diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFilePNG.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFilePNG.java index 2f15a7c1..8c9d0ccb 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFilePNG.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFilePNG.java @@ -12,8 +12,7 @@ import java.io.File; */ public class ThreadOpenFilePNG extends ThreadOpenFile { - public ThreadOpenFilePNG(Minecraft minecraft, String dialogTitle, IOpenFileCallback callback) - throws IllegalStateException { + public ThreadOpenFilePNG(Minecraft minecraft, String dialogTitle, IOpenFileCallback callback) throws IllegalStateException { super(minecraft, dialogTitle, callback); } diff --git a/src/main/java/com/minelittlepony/ForgeProxy.java b/src/main/java/com/minelittlepony/ForgeProxy.java index 4ffc618a..4fefff2a 100644 --- a/src/main/java/com/minelittlepony/ForgeProxy.java +++ b/src/main/java/com/minelittlepony/ForgeProxy.java @@ -23,11 +23,11 @@ public class ForgeProxy { /** * Gets the mod armour texture for an associated item and slot. * - * @param entity The entity to get armour for. - * @param item The armour item - * @param def Default return value if no mods present - * @param slot The slot this armour piece is place in. - * @param type unknown + * @param entity The entity to get armour for. + * @param item The armour item + * @param def Default return value if no mods present + * @param slot The slot this armour piece is place in. + * @param type unknown * @return */ public static String getArmorTexture(Entity entity, ItemStack item, String def, EntityEquipmentSlot slot, @Nullable String type) { @@ -40,10 +40,10 @@ public class ForgeProxy { /** * Gets the mod armour model for an associated item and slot. * - * @param entity The entity to get armour for. - * @param item The armour item - * @param slot The slot this armour piece is place in. - * @param def Default return value if no mods present + * @param entity The entity to get armour for. + * @param item The armour item + * @param slot The slot this armour piece is place in. + * @param def Default return value if no mods present */ public static ModelBiped getArmorModel(EntityLivingBase entity, ItemStack item, EntityEquipmentSlot slot, ModelBiped def) { if (forgeLoaded) { diff --git a/src/main/java/com/minelittlepony/MineLittlePony.java b/src/main/java/com/minelittlepony/MineLittlePony.java index a73b972e..a3e742d2 100644 --- a/src/main/java/com/minelittlepony/MineLittlePony.java +++ b/src/main/java/com/minelittlepony/MineLittlePony.java @@ -54,7 +54,7 @@ public class MineLittlePony { LiteLoader.getInstance().registerExposable(config, null); - IReloadableResourceManager irrm = (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager(); + IReloadableResourceManager irrm = (IReloadableResourceManager)Minecraft.getMinecraft().getResourceManager(); irrm.registerReloadListener(ponyManager); MetadataSerializer ms = Minecraft.getMinecraft().getResourcePackRepository().rprMetadataSerializer; diff --git a/src/main/java/com/minelittlepony/PonyConfig.java b/src/main/java/com/minelittlepony/PonyConfig.java index 1cd5a732..d5e8f5c9 100644 --- a/src/main/java/com/minelittlepony/PonyConfig.java +++ b/src/main/java/com/minelittlepony/PonyConfig.java @@ -14,14 +14,21 @@ import com.mumfrey.liteloader.modconfig.ExposableOptions; @ExposableOptions(filename = "minelittlepony", strategy = ConfigStrategy.Unversioned) public class PonyConfig extends SensibleConfig implements Exposable { - @Expose private PonyLevel ponylevel = PonyLevel.PONIES; + @Expose + private PonyLevel ponylevel = PonyLevel.PONIES; - @Expose public boolean sizes = true; - @Expose public boolean snuzzles = true; - @Expose public boolean hd = true; - @Expose public boolean showscale = true; - @Expose public boolean fpsmagic = true; - @Expose public boolean ponyskulls = true; + @Expose + public boolean sizes = true; + @Expose + public boolean snuzzles = true; + @Expose + public boolean hd = true; + @Expose + public boolean showscale = true; + @Expose + public boolean fpsmagic = true; + @Expose + public boolean ponyskulls = true; public enum PonySettings implements Setting { SIZES, @@ -32,15 +39,22 @@ public class PonyConfig extends SensibleConfig implements Exposable { PONYSKULLS; } - @Expose public boolean villagers = true; - @Expose public boolean zombies = true; - @Expose public boolean pigzombies = true; - @Expose public boolean skeletons = true; - @Expose public boolean illagers = true; - @Expose public boolean guardians = true; + @Expose + public boolean villagers = true; + @Expose + public boolean zombies = true; + @Expose + public boolean pigzombies = true; + @Expose + public boolean skeletons = true; + @Expose + public boolean illagers = true; + @Expose + public boolean guardians = true; /** * Gets the current PonyLevel. That is the level of ponies you would like to see. + * * @param ignorePony true to ignore whatever value the setting has. */ public PonyLevel getEffectivePonyLevel(boolean ignorePony) { @@ -59,6 +73,7 @@ public class PonyConfig extends SensibleConfig implements Exposable { /** * Sets the pony level. Want MOAR PONEHS? Well here you go. + * * @param ponylevel */ public void setPonyLevel(PonyLevel ponylevel) { diff --git a/src/main/java/com/minelittlepony/PonyManager.java b/src/main/java/com/minelittlepony/PonyManager.java index 8cb118f8..b945a49b 100644 --- a/src/main/java/com/minelittlepony/PonyManager.java +++ b/src/main/java/com/minelittlepony/PonyManager.java @@ -28,7 +28,8 @@ import java.util.UUID; import java.util.stream.Collectors; /** - * The PonyManager is responsible for reading and recoding all the pony data associated with an entity of skin. + * The PonyManager is responsible for reading and recoding all the pony data associated with an + * entity of skin. * */ public class PonyManager implements IResourceManagerReloadListener, ISkinCacheClearListener { @@ -69,15 +70,15 @@ public class PonyManager implements IResourceManagerReloadListener, ISkinCacheCl if (pony.usesThinArms() != slim) { pony = new Pony(resource, slim); - poniesCache.put(resource, pony); + poniesCache.put(resource, pony); } return pony; } /** - * Gets or creates a pony for the given player. - * Delegates to the background-ponies registry if no pony skins were available and client settings allows it. + * Gets or creates a pony for the given player. Delegates to the background-ponies registry if no + * pony skins were available and client settings allows it. * * @param player the player */ @@ -111,10 +112,11 @@ public class PonyManager implements IResourceManagerReloadListener, ISkinCacheCl * * Whether is has slim arms is determined by the id. * - * Delegates to the background-ponies registry if no pony skins were available and client settings allows it. + * Delegates to the background-ponies registry if no pony skins were available and client settings + * allows it. * * @param resource A texture resource - * @param uuid id of a player or entity + * @param uuid id of a player or entity */ public Pony getPony(ResourceLocation resource, UUID uuid) { Pony pony = getPony(resource, isSlimSkin(uuid)); diff --git a/src/main/java/com/minelittlepony/PonyRenderManager.java b/src/main/java/com/minelittlepony/PonyRenderManager.java index 6b3fe77c..18212f5c 100644 --- a/src/main/java/com/minelittlepony/PonyRenderManager.java +++ b/src/main/java/com/minelittlepony/PonyRenderManager.java @@ -17,8 +17,8 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; /** - * Render manager responsible for replacing and restoring entity renderers when the client settings change. - * Old values are persisted internally. + * Render manager responsible for replacing and restoring entity renderers when the client settings + * change. Old values are persisted internally. */ public class PonyRenderManager { @@ -65,11 +65,11 @@ public class PonyRenderManager { * * Replaces an entity renderer depending on whether we want ponies or not. * - * @param state True if we want ponies (the original will be stored) - * @param manager The render manager - * @param type The type to replace + * @param state True if we want ponies (the original will be stored) + * @param manager The render manager + * @param type The type to replace * @param renderer The replacement value - * @param The entity type + * @param The entity type */ @SuppressWarnings("unchecked") public void switchRenderer(boolean state, RenderManager manager, Class type, Render renderer) { diff --git a/src/main/java/com/minelittlepony/ducks/IPlayerInfo.java b/src/main/java/com/minelittlepony/ducks/IPlayerInfo.java index bf7ef895..d974b195 100644 --- a/src/main/java/com/minelittlepony/ducks/IPlayerInfo.java +++ b/src/main/java/com/minelittlepony/ducks/IPlayerInfo.java @@ -4,7 +4,8 @@ import net.minecraft.client.network.NetworkPlayerInfo; public interface IPlayerInfo { /** - * Returns true if the vanilla skin (the one returned by NetworkPlayerInfo.getSkinLocation) uses the ALEX model type. + * Returns true if the vanilla skin (the one returned by NetworkPlayerInfo.getSkinLocation) uses the + * ALEX model type. */ boolean usesSlimArms(); diff --git a/src/main/java/com/minelittlepony/gui/IGUIAction.java b/src/main/java/com/minelittlepony/gui/IGUIAction.java index 48aa5efa..93a9accd 100644 --- a/src/main/java/com/minelittlepony/gui/IGUIAction.java +++ b/src/main/java/com/minelittlepony/gui/IGUIAction.java @@ -8,8 +8,8 @@ public interface IGUIAction { /** * Performs this action now. * - * @param value New Value of the field being changed - * @return Adjusted value the field must take on + * @param value New Value of the field being changed + * @return Adjusted value the field must take on */ T perform(T value); } diff --git a/src/main/java/com/minelittlepony/gui/Slider.java b/src/main/java/com/minelittlepony/gui/Slider.java index a5f4ac41..a5971028 100644 --- a/src/main/java/com/minelittlepony/gui/Slider.java +++ b/src/main/java/com/minelittlepony/gui/Slider.java @@ -24,7 +24,8 @@ public class Slider extends GuiSlider { } @Override - public void setEntryValue(int id, boolean value) { } + public void setEntryValue(int id, boolean value) { + } @Override public void setEntryValue(int id, float value) { @@ -32,7 +33,8 @@ public class Slider extends GuiSlider { } @Override - public void setEntryValue(int id, String value) { } + public void setEntryValue(int id, String value) { + } } } diff --git a/src/main/java/com/minelittlepony/mixin/MixinItemRenderer.java b/src/main/java/com/minelittlepony/mixin/MixinItemRenderer.java index 3a28d55a..162ef19f 100644 --- a/src/main/java/com/minelittlepony/mixin/MixinItemRenderer.java +++ b/src/main/java/com/minelittlepony/mixin/MixinItemRenderer.java @@ -25,7 +25,7 @@ public class MixinItemRenderer { //public void renderItemSide(EntityLivingBase entitylivingbaseIn, ItemStack heldStack, ItemCameraTransforms.TransformType transform, boolean leftHanded) @Redirect(method = "renderItemInFirstPerson(" + AbstractClientPlayer + "FF" + EnumHand + "F" + ItemStack + "F)V", at = @At(value = "INVOKE", - target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItemSide(" + EntityLivingBase + ItemStack + TransformType + "Z)V")) + target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItemSide(" + EntityLivingBase + ItemStack + TransformType + "Z)V")) private void redirectRenderItemSide(ItemRenderer self, EntityLivingBase entity, ItemStack stack, TransformType transform, boolean left) { MineLittlePony.getInstance().getRenderManager().getMagicRenderer().renderItemInFirstPerson(self, (AbstractClientPlayer)entity, stack, transform, left); } diff --git a/src/main/java/com/minelittlepony/model/ModelWrapper.java b/src/main/java/com/minelittlepony/model/ModelWrapper.java index 4c283808..0acff6d3 100644 --- a/src/main/java/com/minelittlepony/model/ModelWrapper.java +++ b/src/main/java/com/minelittlepony/model/ModelWrapper.java @@ -27,6 +27,7 @@ public class ModelWrapper implements IModelWrapper { /** * Returns the contained armour model. + * * @return */ public PonyArmor getArmor() { diff --git a/src/main/java/com/minelittlepony/model/PMAPI.java b/src/main/java/com/minelittlepony/model/PMAPI.java index a6f83c84..ad691124 100644 --- a/src/main/java/com/minelittlepony/model/PMAPI.java +++ b/src/main/java/com/minelittlepony/model/PMAPI.java @@ -47,7 +47,7 @@ public final class PMAPI { public static void init() { for (Field field : PMAPI.class.getFields()) { try { - ModelWrapper model = (ModelWrapper) field.get(null); + ModelWrapper model = (ModelWrapper)field.get(null); model.init(); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/minelittlepony/model/PonyModelConstants.java b/src/main/java/com/minelittlepony/model/PonyModelConstants.java index b34314d7..13e7d222 100644 --- a/src/main/java/com/minelittlepony/model/PonyModelConstants.java +++ b/src/main/java/com/minelittlepony/model/PonyModelConstants.java @@ -2,70 +2,69 @@ package com.minelittlepony.model; public final class PonyModelConstants { - public static final float - PI = (float)Math.PI, + public static final float PI = (float)Math.PI, - BODY_CENTRE_X = 0, - BODY_CENTRE_Y = 8, - BODY_CENTRE_Z = 6, + BODY_CENTRE_X = 0, + BODY_CENTRE_Y = 8, + BODY_CENTRE_Z = 6, - NECK_CENTRE_X = BODY_CENTRE_X - 2, - NECK_CENTRE_Y = BODY_CENTRE_Y - 6.8F, - NECK_CENTRE_Z = BODY_CENTRE_Z - 8.8F, + NECK_CENTRE_X = BODY_CENTRE_X - 2, + NECK_CENTRE_Y = BODY_CENTRE_Y - 6.8F, + NECK_CENTRE_Z = BODY_CENTRE_Z - 8.8F, - BODY_ROTATE_ANGLE_X_NOTSNEAK = 0, - BODY_ROTATE_ANGLE_X_SNEAK = 0.4F, - BODY_ROTATE_ANGLE_X_RIDING = PI * 3.8F, + BODY_ROTATE_ANGLE_X_NOTSNEAK = 0, + BODY_ROTATE_ANGLE_X_SNEAK = 0.4F, + BODY_ROTATE_ANGLE_X_RIDING = PI * 3.8F, - BODY_RP_Y_NOTSNEAK = 0, - BODY_RP_Y_SNEAK = 7, - BODY_RP_Y_RIDING = 1, + BODY_RP_Y_NOTSNEAK = 0, + BODY_RP_Y_SNEAK = 7, + BODY_RP_Y_RIDING = 1, - BODY_RP_Z_NOTSNEAK = 0, - BODY_RP_Z_SNEAK = -4, - BODY_RP_Z_RIDING = 4, + BODY_RP_Z_NOTSNEAK = 0, + BODY_RP_Z_SNEAK = -4, + BODY_RP_Z_RIDING = 4, - FRONT_LEG_RP_Y_NOTSNEAK = 8, - FRONT_LEG_RP_Y_SNEAK = 8, + FRONT_LEG_RP_Y_NOTSNEAK = 8, + FRONT_LEG_RP_Y_SNEAK = 8, - HEAD_CENTRE_X = 0, - HEAD_CENTRE_Y = -1, - HEAD_CENTRE_Z = -2, + HEAD_CENTRE_X = 0, + HEAD_CENTRE_Y = -1, + HEAD_CENTRE_Z = -2, - HEAD_RP_X = 0, - HEAD_RP_Y = 0, - HEAD_RP_Z = 0, + HEAD_RP_X = 0, + HEAD_RP_Y = 0, + HEAD_RP_Z = 0, - HORN_X = HEAD_CENTRE_X - 0.5F, - HORN_Y = HEAD_CENTRE_Y - 10, - HORN_Z = HEAD_CENTRE_Z - 1.5F, + HORN_X = HEAD_CENTRE_X - 0.5F, + HORN_Y = HEAD_CENTRE_Y - 10, + HORN_Z = HEAD_CENTRE_Z - 1.5F, - LEFT_WING_EXT_RP_X = 4.5F, - LEFT_WING_EXT_RP_Y = 5.3F, - LEFT_WING_EXT_RP_Z = 6, + LEFT_WING_EXT_RP_X = 4.5F, + LEFT_WING_EXT_RP_Y = 5.3F, + LEFT_WING_EXT_RP_Z = 6, - LEFT_WING_ROTATE_ANGLE_Z_SNEAK = 4, + LEFT_WING_ROTATE_ANGLE_Z_SNEAK = 4, - ROTATE_270 = 4.712F, - ROTATE_90 = 1.571F, + ROTATE_270 = 4.712F, + ROTATE_90 = 1.571F, - SNEAK_LEG_X_ROTATION_ADJUSTMENT = 0.4F, + SNEAK_LEG_X_ROTATION_ADJUSTMENT = 0.4F, - TAIL_RP_X = 0, - TAIL_RP_Y = 0, - TAIL_RP_Z = 0, + TAIL_RP_X = 0, + TAIL_RP_Y = 0, + TAIL_RP_Z = 0, - TAIL_RP_Z_NOTSNEAK = 14, - TAIL_RP_Z_SNEAK = 15, + TAIL_RP_Z_NOTSNEAK = 14, + TAIL_RP_Z_SNEAK = 15, - FIRSTP_ARM_CENTRE_X = -3, + FIRSTP_ARM_CENTRE_X = -3, - THIRDP_ARM_CENTRE_X = 0, - THIRDP_ARM_CENTRE_Y = 4, - THIRDP_ARM_CENTRE_Z = -1, + THIRDP_ARM_CENTRE_X = 0, + THIRDP_ARM_CENTRE_Y = 4, + THIRDP_ARM_CENTRE_Z = -1, - WING_FOLDED_RP_Y = 13, - WING_FOLDED_RP_Z = -3, + WING_FOLDED_RP_Y = 13, + WING_FOLDED_RP_Z = -3, - NECK_ROT_X = 0.166F; + NECK_ROT_X = 0.166F; } diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModel.java b/src/main/java/com/minelittlepony/model/capabilities/IModel.java index 5cc5348a..9a957c17 100644 --- a/src/main/java/com/minelittlepony/model/capabilities/IModel.java +++ b/src/main/java/com/minelittlepony/model/capabilities/IModel.java @@ -10,8 +10,9 @@ public interface IModel extends ICapitated { /** * Sets up this model's initial values, like a constructor... - * @param yOffset YPosition for this model. Always 0. - * @param stretch Scaling factor for this model. Ranges above or below 0 (no change). + * + * @param yOffset YPosition for this model. Always 0. + * @param stretch Scaling factor for this model. Ranges above or below 0 (no change). */ void init(float yOffset, float stretch); @@ -40,8 +41,8 @@ public interface IModel extends ICapitated { boolean isFlying(); /** - * Returns true if the model is elytra flying. Elytra flying is different - * from regular flying in that there are actual "wings" involved. + * Returns true if the model is elytra flying. Elytra flying is different from regular flying in + * that there are actual "wings" involved. */ boolean isElytraFlying(); diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModelPart.java b/src/main/java/com/minelittlepony/model/capabilities/IModelPart.java index 44fc636e..d08173b5 100644 --- a/src/main/java/com/minelittlepony/model/capabilities/IModelPart.java +++ b/src/main/java/com/minelittlepony/model/capabilities/IModelPart.java @@ -3,6 +3,7 @@ package com.minelittlepony.model.capabilities; public interface IModelPart { /** * Initialises all of the boxes in this modelpart. + * * @param yOffset * @param stretch */ diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModelUnicorn.java b/src/main/java/com/minelittlepony/model/capabilities/IModelUnicorn.java index 9381169e..0acac9f6 100644 --- a/src/main/java/com/minelittlepony/model/capabilities/IModelUnicorn.java +++ b/src/main/java/com/minelittlepony/model/capabilities/IModelUnicorn.java @@ -14,6 +14,7 @@ public interface IModelUnicorn extends IModel { /** * Returns true if this model is currently using magic (horn is lit). + * * @return */ boolean isCasting(); diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java b/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java index c655831e..f62702f2 100644 --- a/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java +++ b/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java @@ -55,10 +55,10 @@ public class ModelVillagerPony extends ModelAlicorn { protected int getProfession(Entity entity) { if (entity instanceof EntityVillager) { - return ((EntityVillager) entity).getProfession(); + return ((EntityVillager)entity).getProfession(); } if (entity instanceof EntityZombieVillager) { - return ((EntityZombieVillager) entity).getProfession(); + return ((EntityZombieVillager)entity).getProfession(); } return -1; } diff --git a/src/main/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java b/src/main/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java index 3af22148..10400f42 100644 --- a/src/main/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java +++ b/src/main/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java @@ -2,9 +2,10 @@ package com.minelittlepony.pony.data; /** * Interface for enums that can be parsed from an image trigger pixel value. + * * @author Chris Albers * - * @param + * @param */ public interface ITriggerPixelMapped & ITriggerPixelMapped> { /** @@ -13,10 +14,10 @@ public interface ITriggerPixelMapped & ITriggerPixelMapped> int getTriggerPixel(); /** - * Gets the enum value corresponding to the given enum type and pixel value. - * If none are found, the first parameter is returned as the default. + * Gets the enum value corresponding to the given enum type and pixel value. If none are found, the + * first parameter is returned as the default. * - * @param type Return type and default value. + * @param type Return type and default value. * @param pixelValue The pixel colour to search for. */ @SuppressWarnings("unchecked") diff --git a/src/main/java/com/minelittlepony/pony/data/Pony.java b/src/main/java/com/minelittlepony/pony/data/Pony.java index e783a0ff..5788db90 100644 --- a/src/main/java/com/minelittlepony/pony/data/Pony.java +++ b/src/main/java/com/minelittlepony/pony/data/Pony.java @@ -83,19 +83,19 @@ public class Pony { MineLittlePony.logger.debug("Obtained skin from resource location {}", resource); return skinImage; - } catch (IOException ignored) { } + } catch (IOException ignored) {} try { ITextureObject texture = Minecraft.getMinecraft().getTextureManager().getTexture(resource); if (texture instanceof MixinThreadDownloadImageData) { - return ((MixinThreadDownloadImageData) texture).getBufferedImage(); + return ((MixinThreadDownloadImageData)texture).getBufferedImage(); } else if (texture instanceof ThreadDownloadImageETag) { - return ((ThreadDownloadImageETag) texture).getBufferedImage(); + return ((ThreadDownloadImageETag)texture).getBufferedImage(); } else if (texture instanceof DynamicTextureImage) { - return ((DynamicTextureImage) texture).getImage(); + return ((DynamicTextureImage)texture).getImage(); } - } catch (Exception ignored) { } + } catch (Exception ignored) {} return null; } diff --git a/src/main/java/com/minelittlepony/pony/data/PonyData.java b/src/main/java/com/minelittlepony/pony/data/PonyData.java index 46accf3a..c3db3835 100644 --- a/src/main/java/com/minelittlepony/pony/data/PonyData.java +++ b/src/main/java/com/minelittlepony/pony/data/PonyData.java @@ -98,7 +98,8 @@ public class PonyData implements IPonyData { } /** - * Parses an image buffer into a new IPonyData representing the values stored in it's individual trigger pixels. + * Parses an image buffer into a new IPonyData representing the values stored in it's individual + * trigger pixels. */ static IPonyData parse(BufferedImage image) { return new PonyData(image); diff --git a/src/main/java/com/minelittlepony/pony/data/TriggerPixels.java b/src/main/java/com/minelittlepony/pony/data/TriggerPixels.java index 7d33a6a0..486d15c9 100644 --- a/src/main/java/com/minelittlepony/pony/data/TriggerPixels.java +++ b/src/main/java/com/minelittlepony/pony/data/TriggerPixels.java @@ -53,7 +53,7 @@ public enum TriggerPixels { return out; } - public & ITriggerPixelMapped> void readFlags(boolean[] out, BufferedImage image) { + public & ITriggerPixelMapped> void readFlags(boolean[] out, BufferedImage image) { readFlag(out, Channel.RED, image); readFlag(out, Channel.GREEN, image); readFlag(out, Channel.BLUE, image); @@ -85,4 +85,4 @@ public enum TriggerPixels { return (image.getRGB(x, y) & mask) >> offset; } } -} \ No newline at end of file +} diff --git a/src/main/java/com/minelittlepony/render/AbstractPonyRenderer.java b/src/main/java/com/minelittlepony/render/AbstractPonyRenderer.java index 3097fef9..aac65ff3 100644 --- a/src/main/java/com/minelittlepony/render/AbstractPonyRenderer.java +++ b/src/main/java/com/minelittlepony/render/AbstractPonyRenderer.java @@ -37,7 +37,7 @@ public abstract class AbstractPonyRenderer> ex this.textureOffsetX = x; this.textureOffsetY = y; super.setTextureOffset(x, y); - return (T) this; + return (T)this; } /** @@ -49,7 +49,7 @@ public abstract class AbstractPonyRenderer> ex public T mirror(boolean m) { mirror = m; - return (T) this; + return (T)this; } /** @@ -60,7 +60,7 @@ public abstract class AbstractPonyRenderer> ex } public T size(int x, int y) { - return (T) setTextureSize(x, y); + return (T)setTextureSize(x, y); } /** @@ -77,7 +77,7 @@ public abstract class AbstractPonyRenderer> ex modelOffsetX = x; modelOffsetY = y; modelOffsetZ = z; - return (T) this; + return (T)this; } /** @@ -96,12 +96,12 @@ public abstract class AbstractPonyRenderer> ex rotateAngleX = x; rotateAngleY = y; rotateAngleZ = z; - return (T) this; + return (T)this; } /** - * Positions a given model in space by setting its offset values divided - * by 16 to account for scaling applied inside the model. + * Positions a given model in space by setting its offset values divided by 16 to account for + * scaling applied inside the model. */ public static T at(T renderer, float x, float y, float z) { renderer.offsetX = x / 16; @@ -129,12 +129,12 @@ public abstract class AbstractPonyRenderer> ex */ public T around(float x, float y, float z) { setRotationPoint(x, y, z); - return (T) this; + return (T)this; } /** - * Gets or creates a new child model based on its unique index. - * New children will be of the same type and inherit the same textures and offsets of the original. + * Gets or creates a new child model based on its unique index. New children will be of the same + * type and inherit the same textures and offsets of the original. */ public T child(int index) { if (childModels == null || index >= childModels.size()) { @@ -171,13 +171,13 @@ public abstract class AbstractPonyRenderer> ex setTextureOffset(tex.textureOffsetX, tex.textureOffsetY).addBox(offX, offY, offZ, width, height, depth); cubeList.get(cubeList.size() - 1).setBoxName(partName); - return (T) this; + return (T)this; } @Override public T addBox(float offX, float offY, float offZ, int width, int height, int depth) { addBox(offX, offY, offZ, width, height, depth, 0); - return (T) this; + return (T)this; } @Override diff --git a/src/main/java/com/minelittlepony/render/LevitatingItemRenderer.java b/src/main/java/com/minelittlepony/render/LevitatingItemRenderer.java index 977b8da8..cb6cdb30 100644 --- a/src/main/java/com/minelittlepony/render/LevitatingItemRenderer.java +++ b/src/main/java/com/minelittlepony/render/LevitatingItemRenderer.java @@ -34,7 +34,7 @@ public class LevitatingItemRenderer { setColor(glowColor); RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); - ((IRenderItem) renderItem).useTransparency(true); + ((IRenderItem)renderItem).useTransparency(true); PonySkullRenderer.ponyInstance.useTransparency(true); scale(1.1, 1.1, 1.1); @@ -44,7 +44,7 @@ public class LevitatingItemRenderer { translate(0.01F, -0.01F, -0.02F); renderItem.renderItem(drop, entity, transform, hand == EnumHandSide.LEFT); - ((IRenderItem) renderItem).useTransparency(false); + ((IRenderItem)renderItem).useTransparency(false); PonySkullRenderer.ponyInstance.useTransparency(false); unsetColor(); enableLighting(); diff --git a/src/main/java/com/minelittlepony/render/PonySkull.java b/src/main/java/com/minelittlepony/render/PonySkull.java index a4270511..fa8c9b83 100644 --- a/src/main/java/com/minelittlepony/render/PonySkull.java +++ b/src/main/java/com/minelittlepony/render/PonySkull.java @@ -22,4 +22,4 @@ public abstract class PonySkull implements ISkull { public void render(float animateTicks, float rotation, float scale) { ponyHead.render(null, animateTicks, 0, 0, rotation, 0, scale); } -} \ No newline at end of file +} diff --git a/src/main/java/com/minelittlepony/render/PonySkullRenderer.java b/src/main/java/com/minelittlepony/render/PonySkullRenderer.java index 7729fa0c..d26582c9 100644 --- a/src/main/java/com/minelittlepony/render/PonySkullRenderer.java +++ b/src/main/java/com/minelittlepony/render/PonySkullRenderer.java @@ -30,8 +30,8 @@ public class PonySkullRenderer extends TileEntitySkullRenderer implements IRende private static final Map skullMap = new HashMap<>(); /** - * Resolves the games skull renderer to either a specialised pony skull renderer - * or some other skull renderer depending on the ponyskulls state. + * Resolves the games skull renderer to either a specialised pony skull renderer or some other skull + * renderer depending on the ponyskulls state. * * Original/Existing renderer is stored to a backup variable as a fallback in case of mods. */ diff --git a/src/main/java/com/minelittlepony/render/RenderPonyMob.java b/src/main/java/com/minelittlepony/render/RenderPonyMob.java index b029748e..6adfe251 100644 --- a/src/main/java/com/minelittlepony/render/RenderPonyMob.java +++ b/src/main/java/com/minelittlepony/render/RenderPonyMob.java @@ -21,7 +21,7 @@ import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; // TODO: A lot of this duplicates RenderPonyPlayer -// and is the whole reason we had this scaling bug in the first place. +// and is the whole reason we had this scaling bug in the first place. public abstract class RenderPonyMob extends RenderLiving implements IRenderPony { protected final RenderPony renderPony = new RenderPony<>(this); diff --git a/src/main/java/com/minelittlepony/render/layer/AbstractPonyLayer.java b/src/main/java/com/minelittlepony/render/layer/AbstractPonyLayer.java index 0fecf8d6..06876165 100644 --- a/src/main/java/com/minelittlepony/render/layer/AbstractPonyLayer.java +++ b/src/main/java/com/minelittlepony/render/layer/AbstractPonyLayer.java @@ -28,13 +28,16 @@ public abstract class AbstractPonyLayer implements L * Renders this layer. * * @param entity The entity we're being called for. - * @param move Entity motion parameter - i.e. velocity in no specific direction used in bipeds to calculate step amount. + * @param move Entity motion parameter - i.e. velocity in no specific direction used in + * bipeds to calculate step amount. * @param swing Degree to which each 'limb' swings. * @param partialTicks Render partial ticks - * @param ticks Total whole and partial ticks since the entity's existance. Used in animations together with {@code swing} and {@code move}. + * @param ticks Total whole and partial ticks since the entity's existance. Used in + * animations together with {@code swing} and {@code move}. * @param headYaw Horizontal head motion in radians. * @param headPitch Vertical head motion in radians. - * @param scale Scaling factor used to render this model. Determined by the return value of {@link RenderLivingBase.prepareScale}. Usually {@code 0.0625F}. + * @param scale Scaling factor used to render this model. Determined by the return value of + * {@link RenderLivingBase.prepareScale}. Usually {@code 0.0625F}. */ protected abstract void doPonyRender(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale); diff --git a/src/main/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java b/src/main/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java index a93edad3..888a8ccf 100644 --- a/src/main/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java +++ b/src/main/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java @@ -51,7 +51,7 @@ public class LayerEntityOnPonyShoulder extends AbstractPonyLayer extends AbstractPonyL pushMatrix(); if (model instanceof IModel) { - ((IModel) model).transform(BodyPart.LEGS); + ((IModel)model).transform(BodyPart.LEGS); } if (model.isChild) { diff --git a/src/main/java/com/minelittlepony/render/layer/LayerOverlayBase.java b/src/main/java/com/minelittlepony/render/layer/LayerOverlayBase.java index 779f8f0d..612936be 100644 --- a/src/main/java/com/minelittlepony/render/layer/LayerOverlayBase.java +++ b/src/main/java/com/minelittlepony/render/layer/LayerOverlayBase.java @@ -37,4 +37,4 @@ public abstract class LayerOverlayBase implements LayerR protected abstract ResourceLocation getOverlayTexture(); -} \ No newline at end of file +} diff --git a/src/main/java/com/minelittlepony/render/layer/LayerPonyArmor.java b/src/main/java/com/minelittlepony/render/layer/LayerPonyArmor.java index 36760cef..bb6a521f 100644 --- a/src/main/java/com/minelittlepony/render/layer/LayerPonyArmor.java +++ b/src/main/java/com/minelittlepony/render/layer/LayerPonyArmor.java @@ -56,7 +56,7 @@ public class LayerPonyArmor extends AbstractPonyLaye if (!itemstack.isEmpty() && itemstack.getItem() instanceof ItemArmor) { - ItemArmor itemarmor = (ItemArmor) itemstack.getItem(); + ItemArmor itemarmor = (ItemArmor)itemstack.getItem(); ModelPonyArmor armour = getArmorModel(entity, itemstack, armorSlot, pony.getArmor().getArmorForSlot(armorSlot)); armour.setModelAttributes(pony.getBody()); @@ -85,7 +85,7 @@ public class LayerPonyArmor extends AbstractPonyLaye } private Tuple getArmorTexture(T entity, ItemStack itemstack, EntityEquipmentSlot slot, @Nullable String type) { - ItemArmor item = (ItemArmor) itemstack.getItem(); + ItemArmor item = (ItemArmor)itemstack.getItem(); String texture = item.getArmorMaterial().getName(); String domain = "minecraft"; @@ -170,7 +170,7 @@ public class LayerPonyArmor extends AbstractPonyLaye } if (model instanceof IEquestrianArmor) { - return ((IEquestrianArmor) model).getArmorForSlot(slot); + return ((IEquestrianArmor)model).getArmorForSlot(slot); } return def; diff --git a/src/main/java/com/minelittlepony/render/layer/LayerPonyCape.java b/src/main/java/com/minelittlepony/render/layer/LayerPonyCape.java index f49e2fb1..eefe06a3 100644 --- a/src/main/java/com/minelittlepony/render/layer/LayerPonyCape.java +++ b/src/main/java/com/minelittlepony/render/layer/LayerPonyCape.java @@ -44,7 +44,7 @@ public class LayerPonyCape extends AbstractPonyLayer { double sin = MathHelper.sin(motionYaw * PI / 180); double cos = -MathHelper.cos(motionYaw * PI / 180); - float capeMotionY = (float) capeY * 10; + float capeMotionY = (float)capeY * 10; if (capeMotionY < -6) { capeMotionY = -6; @@ -53,9 +53,9 @@ public class LayerPonyCape extends AbstractPonyLayer { capeMotionY = 32; } - float capeMotionX = (float) (capeX * sin + capeZ * cos) * 100; + float capeMotionX = (float)(capeX * sin + capeZ * cos) * 100; - float diagMotion = (float) (capeX * cos - capeZ * sin) * 100; + float diagMotion = (float)(capeX * cos - capeZ * sin) * 100; if (capeMotionX < 0) { capeMotionX = 0; @@ -65,7 +65,7 @@ public class LayerPonyCape extends AbstractPonyLayer { capeMotionY += MathHelper.sin((player.prevDistanceWalkedModified + (player.distanceWalkedModified - player.prevDistanceWalkedModified) * scale) * 6) * 32 * camera; rotate(2 + capeMotionX / 12 + capeMotionY, 1, 0, 0); - rotate( diagMotion / 2, 0, 0, 1); + rotate(diagMotion / 2, 0, 0, 1); rotate(-diagMotion / 2, 0, 1, 0); rotate(180, 0, 0, 1); rotate(90, 1, 0, 0); diff --git a/src/main/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java b/src/main/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java index f5900193..da558485 100644 --- a/src/main/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java +++ b/src/main/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java @@ -101,7 +101,7 @@ public class LayerPonyCustomHead implements LayerRen } private ModelWrapper getModel() { - return ((IRenderPony) renderer).getModelWrapper(); + return ((IRenderPony)renderer).getModelWrapper(); } @Override diff --git a/src/main/java/com/minelittlepony/render/layer/LayerPonyElytra.java b/src/main/java/com/minelittlepony/render/layer/LayerPonyElytra.java index 4c712fb9..aa947324 100644 --- a/src/main/java/com/minelittlepony/render/layer/LayerPonyElytra.java +++ b/src/main/java/com/minelittlepony/render/layer/LayerPonyElytra.java @@ -51,7 +51,7 @@ public class LayerPonyElytra extends AbstractPonyLay protected ResourceLocation getElytraTexture(T entity) { if (entity instanceof AbstractClientPlayer) { - AbstractClientPlayer player = (AbstractClientPlayer) entity; + AbstractClientPlayer player = (AbstractClientPlayer)entity; ResourceLocation result; diff --git a/src/main/java/com/minelittlepony/render/plane/Face.java b/src/main/java/com/minelittlepony/render/plane/Face.java index 199e9c0e..73e9754d 100644 --- a/src/main/java/com/minelittlepony/render/plane/Face.java +++ b/src/main/java/com/minelittlepony/render/plane/Face.java @@ -1,7 +1,10 @@ package com.minelittlepony.render.plane; enum Face { - NORTH, SOUTH, - UP, DOWN, - EAST, WEST; -} \ No newline at end of file + NORTH, + SOUTH, + UP, + DOWN, + EAST, + WEST; +} diff --git a/src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java b/src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java index 603f1353..f985fa56 100644 --- a/src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java +++ b/src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java @@ -107,7 +107,7 @@ public class RenderPonyPlayer extends RenderPlayer implements IRenderPony { float modelYaw = MathUtil.sensibleAngle(player.renderYawOffset); // detecting that we're flying backwards and roll must be inverted - if (Math.abs(MathUtil.sensibleAngle((float) Math.toDegrees(Math.atan2(motionX, motionZ)) + modelYaw)) > 90) { + if (Math.abs(MathUtil.sensibleAngle((float)Math.toDegrees(Math.atan2(motionX, motionZ)) + modelYaw)) > 90) { roll *= -1; } @@ -53,11 +53,11 @@ public class PostureFlight implements PonyPosture { @Override public void transform(AbstractPonyModel model, AbstractClientPlayer player, double motionX, double motionY, double motionZ, float pitch, float yaw, float ticks) { - model.motionPitch = (float) calculateIncline(player, motionX, motionY, motionZ); + model.motionPitch = (float)calculateIncline(player, motionX, motionY, motionZ); GlStateManager.rotate(model.motionPitch, 1, 0, 0); - float roll = (float)calculateRoll(player, motionX, motionY, motionZ); + float roll = (float)calculateRoll(player, motionX, motionY, motionZ); roll = model.getMetadata().getInterpolator().interpolate("pegasusRoll", roll, 10); diff --git a/src/main/java/com/minelittlepony/util/coordinates/Box.java b/src/main/java/com/minelittlepony/util/coordinates/Box.java index c735c0bd..1cd48c24 100644 --- a/src/main/java/com/minelittlepony/util/coordinates/Box.java +++ b/src/main/java/com/minelittlepony/util/coordinates/Box.java @@ -27,10 +27,10 @@ public abstract class Box extends ModelBox { /** * Creates a new quad with the given spacial vertices. */ - protected Quad quad(int startX, int width, int startY, int height, Vertex ...verts) { + protected Quad quad(int startX, int width, int startY, int height, Vertex... verts) { return new Quad(verts, - startX, startY, + startX, startY, startX + width, startY + height, parent.textureWidth, parent.textureHeight); } -} \ No newline at end of file +} diff --git a/src/main/java/com/minelittlepony/util/coordinates/Quad.java b/src/main/java/com/minelittlepony/util/coordinates/Quad.java index ea43f510..ad7eabcf 100644 --- a/src/main/java/com/minelittlepony/util/coordinates/Quad.java +++ b/src/main/java/com/minelittlepony/util/coordinates/Quad.java @@ -7,4 +7,4 @@ public class Quad extends TexturedQuad { public Quad(Vertex[] vertices, int texcoordU1, int texcoordV1, int texcoordU2, int texcoordV2, float textureWidth, float textureHeight) { super(vertices, texcoordU1, texcoordV1, texcoordU2, texcoordV2, textureWidth, textureHeight); } -} \ No newline at end of file +}