diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 244a668..1eed3a5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Mar 26 13:33:58 CDT 2014 +#Thu Apr 24 12:13:23 VLAT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip diff --git a/src/main/java/Start.java b/src/main/java/Start.java index 1505fad..44a04a9 100644 --- a/src/main/java/Start.java +++ b/src/main/java/Start.java @@ -25,7 +25,7 @@ for( int x = 0; x < args.length; x++) { - if (args[x].equals("--username")) userIndex = x + 1; + if (args[x].equals("--username")) userIndex = x + 1; else if (args[x].equals("--password")) passIndex = x + 1; else if (args[x].equals("--session")) sessIndex = x + 1; else if (args[x].equals("--version")) versIndex = x + 1; diff --git a/src/main/java/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java b/src/main/java/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java index 0795ff1..fa95a64 100644 --- a/src/main/java/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java +++ b/src/main/java/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.client; diff --git a/src/main/java/cpw/mods/fml/client/FMLClientHandler.java b/src/main/java/cpw/mods/fml/client/FMLClientHandler.java index b0d03fa..762711a 100644 --- a/src/main/java/cpw/mods/fml/client/FMLClientHandler.java +++ b/src/main/java/cpw/mods/fml/client/FMLClientHandler.java @@ -509,7 +509,7 @@ public void displayMissingMods(Object modMissingPacket) { -// showGuiScreen(new GuiModsMissingForServer(modMissingPacket)); +// showGuiScreen(new GuiModsMissingForServer(modMissingPacket)); } /** diff --git a/src/main/java/cpw/mods/fml/client/FMLFileResourcePack.java b/src/main/java/cpw/mods/fml/client/FMLFileResourcePack.java index 9948f4a..7b12fae 100644 --- a/src/main/java/cpw/mods/fml/client/FMLFileResourcePack.java +++ b/src/main/java/cpw/mods/fml/client/FMLFileResourcePack.java @@ -44,8 +44,8 @@ FMLLog.log(container.getName(), Level.DEBUG, "Mod %s is missing a pack.mcmeta file, substituting a dummy one", container.getName()); return new ByteArrayInputStream(("{\n" + " \"pack\": {\n"+ - " \"description\": \"dummy FML pack for "+container.getName()+"\",\n"+ - " \"pack_format\": 1\n"+ + " \"description\": \"dummy FML pack for "+container.getName()+"\",\n"+ + " \"pack_format\": 1\n"+ "}\n" + "}").getBytes(Charsets.UTF_8)); } diff --git a/src/main/java/cpw/mods/fml/client/FMLFolderResourcePack.java b/src/main/java/cpw/mods/fml/client/FMLFolderResourcePack.java index 7361157..5505a29 100644 --- a/src/main/java/cpw/mods/fml/client/FMLFolderResourcePack.java +++ b/src/main/java/cpw/mods/fml/client/FMLFolderResourcePack.java @@ -49,8 +49,8 @@ FMLLog.log(container.getName(), Level.DEBUG, "Mod %s is missing a pack.mcmeta file, substituting a dummy one", container.getName()); return new ByteArrayInputStream(("{\n" + " \"pack\": {\n"+ - " \"description\": \"dummy FML pack for "+container.getName()+"\",\n"+ - " \"pack_format\": 1\n"+ + " \"description\": \"dummy FML pack for "+container.getName()+"\",\n"+ + " \"pack_format\": 1\n"+ "}\n" + "}").getBytes(Charsets.UTF_8)); } diff --git a/src/main/java/cpw/mods/fml/client/GuiAccessDenied.java b/src/main/java/cpw/mods/fml/client/GuiAccessDenied.java index a47fe85..efdc2d7 100644 --- a/src/main/java/cpw/mods/fml/client/GuiAccessDenied.java +++ b/src/main/java/cpw/mods/fml/client/GuiAccessDenied.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.client; diff --git a/src/main/java/cpw/mods/fml/client/GuiBackupFailed.java b/src/main/java/cpw/mods/fml/client/GuiBackupFailed.java index df9af95..e0d78eb 100644 --- a/src/main/java/cpw/mods/fml/client/GuiBackupFailed.java +++ b/src/main/java/cpw/mods/fml/client/GuiBackupFailed.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.client; diff --git a/src/main/java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java b/src/main/java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java index 1686543..370bdad 100644 --- a/src/main/java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java +++ b/src/main/java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.client; diff --git a/src/main/java/cpw/mods/fml/client/GuiDupesFound.java b/src/main/java/cpw/mods/fml/client/GuiDupesFound.java index 28d7ddd..91e2eb0 100644 --- a/src/main/java/cpw/mods/fml/client/GuiDupesFound.java +++ b/src/main/java/cpw/mods/fml/client/GuiDupesFound.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.client; diff --git a/src/main/java/cpw/mods/fml/client/GuiModList.java b/src/main/java/cpw/mods/fml/client/GuiModList.java index c327701..69fdc32 100644 --- a/src/main/java/cpw/mods/fml/client/GuiModList.java +++ b/src/main/java/cpw/mods/fml/client/GuiModList.java @@ -142,7 +142,7 @@ { this.modList.drawScreen(p_571_1_, p_571_2_, p_571_3_); this.drawCenteredString(this.fontRendererObj, "Mod List", this.width / 2, 16, 0xFFFFFF); - int offset = this.listWidth + 20; + int offset = this.listWidth + 20; if (selectedMod != null) { GL11.glEnable(GL11.GL_BLEND); if (!selectedMod.getMetadata().autogenerated) { @@ -195,10 +195,10 @@ int top = 32; Tessellator tess = Tessellator.instance; tess.startDrawingQuads(); - tess.addVertexWithUV(offset, top + cachedLogoDimensions.height, zLevel, 0, 1); + tess.addVertexWithUV(offset, top + cachedLogoDimensions.height, zLevel, 0, 1); tess.addVertexWithUV(offset + cachedLogoDimensions.width, top + cachedLogoDimensions.height, zLevel, 1, 1); - tess.addVertexWithUV(offset + cachedLogoDimensions.width, top, zLevel, 1, 0); - tess.addVertexWithUV(offset, top, zLevel, 0, 0); + tess.addVertexWithUV(offset + cachedLogoDimensions.width, top, zLevel, 1, 0); + tess.addVertexWithUV(offset, top, zLevel, 0, 0); tess.draw(); shifty += 65; diff --git a/src/main/java/cpw/mods/fml/client/GuiModsMissing.java b/src/main/java/cpw/mods/fml/client/GuiModsMissing.java index 50567b0..7efed2e 100644 --- a/src/main/java/cpw/mods/fml/client/GuiModsMissing.java +++ b/src/main/java/cpw/mods/fml/client/GuiModsMissing.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.client; diff --git a/src/main/java/cpw/mods/fml/client/GuiModsMissingForServer.java b/src/main/java/cpw/mods/fml/client/GuiModsMissingForServer.java index bf34378..0e951b7 100644 --- a/src/main/java/cpw/mods/fml/client/GuiModsMissingForServer.java +++ b/src/main/java/cpw/mods/fml/client/GuiModsMissingForServer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.client; diff --git a/src/main/java/cpw/mods/fml/client/GuiScrollingList.java b/src/main/java/cpw/mods/fml/client/GuiScrollingList.java index a31da14..6be9cdb 100644 --- a/src/main/java/cpw/mods/fml/client/GuiScrollingList.java +++ b/src/main/java/cpw/mods/fml/client/GuiScrollingList.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.client; @@ -283,7 +283,7 @@ var18.addVertexWithUV((double)this.left, (double)this.top, 0.0D, (double)((float)this.left / var17), (double)((float)(this.top + (int)this.scrollDistance) / var17)); var18.draw(); } - // boxRight = this.listWidth / 2 - 92 - 16; + // boxRight = this.listWidth / 2 - 92 - 16; var10 = this.top + 4 - (int)this.scrollDistance; if (this.field_27262_q) diff --git a/src/main/java/cpw/mods/fml/client/GuiSlotModList.java b/src/main/java/cpw/mods/fml/client/GuiSlotModList.java index cc5f543..7a02e2d 100644 --- a/src/main/java/cpw/mods/fml/client/GuiSlotModList.java +++ b/src/main/java/cpw/mods/fml/client/GuiSlotModList.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.client; diff --git a/src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java b/src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java index 6746f20..d64f24c 100644 --- a/src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java +++ b/src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.client; diff --git a/src/main/java/cpw/mods/fml/client/IModGuiFactory.java b/src/main/java/cpw/mods/fml/client/IModGuiFactory.java index 5be73c5..080eaa1 100644 --- a/src/main/java/cpw/mods/fml/client/IModGuiFactory.java +++ b/src/main/java/cpw/mods/fml/client/IModGuiFactory.java @@ -32,7 +32,7 @@ * can be changed here. * * @return A class that will be instantiated on clicks on the config button - * or null if no GUI is desired. + * or null if no GUI is desired. */ public Class mainConfigGuiClass(); diff --git a/src/main/java/cpw/mods/fml/client/registry/ClientRegistry.java b/src/main/java/cpw/mods/fml/client/registry/ClientRegistry.java index 2f20c31..a0041fa 100644 --- a/src/main/java/cpw/mods/fml/client/registry/ClientRegistry.java +++ b/src/main/java/cpw/mods/fml/client/registry/ClientRegistry.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.client.registry; diff --git a/src/main/java/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java b/src/main/java/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java index c6a4a87..d8d149b 100644 --- a/src/main/java/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java +++ b/src/main/java/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.client.registry; diff --git a/src/main/java/cpw/mods/fml/client/registry/RenderingRegistry.java b/src/main/java/cpw/mods/fml/client/registry/RenderingRegistry.java index ca25363..2dc460e 100644 --- a/src/main/java/cpw/mods/fml/client/registry/RenderingRegistry.java +++ b/src/main/java/cpw/mods/fml/client/registry/RenderingRegistry.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.client.registry; diff --git a/src/main/java/cpw/mods/fml/common/BukkitPluginRef.java b/src/main/java/cpw/mods/fml/common/BukkitPluginRef.java index 06c0bfd..34eb042 100644 --- a/src/main/java/cpw/mods/fml/common/BukkitPluginRef.java +++ b/src/main/java/cpw/mods/fml/common/BukkitPluginRef.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/BukkitProxy.java b/src/main/java/cpw/mods/fml/common/BukkitProxy.java index 4f1fb41..2b1235d 100644 --- a/src/main/java/cpw/mods/fml/common/BukkitProxy.java +++ b/src/main/java/cpw/mods/fml/common/BukkitProxy.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/CertificateHelper.java b/src/main/java/cpw/mods/fml/common/CertificateHelper.java index e65e488..d51a707 100644 --- a/src/main/java/cpw/mods/fml/common/CertificateHelper.java +++ b/src/main/java/cpw/mods/fml/common/CertificateHelper.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/DummyModContainer.java b/src/main/java/cpw/mods/fml/common/DummyModContainer.java index 5fa49e8..1c04f13 100644 --- a/src/main/java/cpw/mods/fml/common/DummyModContainer.java +++ b/src/main/java/cpw/mods/fml/common/DummyModContainer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/DuplicateModsFoundException.java b/src/main/java/cpw/mods/fml/common/DuplicateModsFoundException.java index 7971809..293bcb2 100644 --- a/src/main/java/cpw/mods/fml/common/DuplicateModsFoundException.java +++ b/src/main/java/cpw/mods/fml/common/DuplicateModsFoundException.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/FMLCommonHandler.java b/src/main/java/cpw/mods/fml/common/FMLCommonHandler.java index 4922e1e..6777672 100644 --- a/src/main/java/cpw/mods/fml/common/FMLCommonHandler.java +++ b/src/main/java/cpw/mods/fml/common/FMLCommonHandler.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/FMLContainer.java b/src/main/java/cpw/mods/fml/common/FMLContainer.java index 78bfe0d..ab3539c 100644 --- a/src/main/java/cpw/mods/fml/common/FMLContainer.java +++ b/src/main/java/cpw/mods/fml/common/FMLContainer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/FMLLog.java b/src/main/java/cpw/mods/fml/common/FMLLog.java index df72bd1..ebbd3f3 100644 --- a/src/main/java/cpw/mods/fml/common/FMLLog.java +++ b/src/main/java/cpw/mods/fml/common/FMLLog.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/FMLModContainer.java b/src/main/java/cpw/mods/fml/common/FMLModContainer.java index 4aa37d9..9618dd4 100644 --- a/src/main/java/cpw/mods/fml/common/FMLModContainer.java +++ b/src/main/java/cpw/mods/fml/common/FMLModContainer.java @@ -319,7 +319,7 @@ } else if (!(Modifier.isStatic(m.getModifiers()) && m.getParameterTypes().length == 0)) { - FMLLog.log(getModId(), Level.ERROR, "The InstanceFactory annotation can only apply to a static method, taking zero arguments - it will be ignored on %s(%s)", m.getName(), Arrays.asList(m.getParameterTypes())); + FMLLog.log(getModId(), Level.ERROR, "The InstanceFactory annotation can only apply to a static method, taking zero arguments - it will be ignored on %s(%s)", m.getName(), Arrays.asList(m.getParameterTypes())); } else if (factoryMethod != null) { diff --git a/src/main/java/cpw/mods/fml/common/IASMHook.java b/src/main/java/cpw/mods/fml/common/IASMHook.java index 5208db2..c51a509 100644 --- a/src/main/java/cpw/mods/fml/common/IASMHook.java +++ b/src/main/java/cpw/mods/fml/common/IASMHook.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/ICrashCallable.java b/src/main/java/cpw/mods/fml/common/ICrashCallable.java index 441ac36..5eb619b 100644 --- a/src/main/java/cpw/mods/fml/common/ICrashCallable.java +++ b/src/main/java/cpw/mods/fml/common/ICrashCallable.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/IFMLHandledException.java b/src/main/java/cpw/mods/fml/common/IFMLHandledException.java index 0ca2f01..5061dfd 100644 --- a/src/main/java/cpw/mods/fml/common/IFMLHandledException.java +++ b/src/main/java/cpw/mods/fml/common/IFMLHandledException.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/IFMLSidedHandler.java b/src/main/java/cpw/mods/fml/common/IFMLSidedHandler.java index 5fb6120..7155e0f 100644 --- a/src/main/java/cpw/mods/fml/common/IFMLSidedHandler.java +++ b/src/main/java/cpw/mods/fml/common/IFMLSidedHandler.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/IFuelHandler.java b/src/main/java/cpw/mods/fml/common/IFuelHandler.java index 0794185..4d15fea 100644 --- a/src/main/java/cpw/mods/fml/common/IFuelHandler.java +++ b/src/main/java/cpw/mods/fml/common/IFuelHandler.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/ILanguageAdapter.java b/src/main/java/cpw/mods/fml/common/ILanguageAdapter.java index 60c794c..62eb0d2 100644 --- a/src/main/java/cpw/mods/fml/common/ILanguageAdapter.java +++ b/src/main/java/cpw/mods/fml/common/ILanguageAdapter.java @@ -37,12 +37,12 @@ // of the object directly, or in the object block, i.e. // whether it's: // class ModName { - // @SidedProxy ... + // @SidedProxy ... // } // object ModName extends ModName {} // which leads to us getting the outer class, or // object ModName { - // @SidedProxy ... + // @SidedProxy ... // } // which leads to us getting the inner class. if (!proxyTarget.getName().endsWith("$")) @@ -104,8 +104,8 @@ { // For Scala mods, we want to enable authors to write them like so: // object ModName { - // @SidedProxy(...) - // var proxy: ModProxy = null + // @SidedProxy(...) + // var proxy: ModProxy = null // } // For this to work, we have to search inside the inner class Scala // generates for singletons, which is in called ModName$. These are @@ -113,8 +113,8 @@ // internal classes. // Note that it is alternatively possible to write this like so: // class ModName { - // @SidedProxy(...) - // var proxy: ModProxy = null + // @SidedProxy(...) + // var proxy: ModProxy = null // } // object ModName extends ModName { ... } // which will fall back to the normal injection code which calls diff --git a/src/main/java/cpw/mods/fml/common/IWorldGenerator.java b/src/main/java/cpw/mods/fml/common/IWorldGenerator.java index d03a04f..d05db9e 100644 --- a/src/main/java/cpw/mods/fml/common/IWorldGenerator.java +++ b/src/main/java/cpw/mods/fml/common/IWorldGenerator.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/InjectedModContainer.java b/src/main/java/cpw/mods/fml/common/InjectedModContainer.java index ce82214..e571358 100644 --- a/src/main/java/cpw/mods/fml/common/InjectedModContainer.java +++ b/src/main/java/cpw/mods/fml/common/InjectedModContainer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/LoadController.java b/src/main/java/cpw/mods/fml/common/LoadController.java index 03ddddb..206da0f 100644 --- a/src/main/java/cpw/mods/fml/common/LoadController.java +++ b/src/main/java/cpw/mods/fml/common/LoadController.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/Loader.java b/src/main/java/cpw/mods/fml/common/Loader.java index 592ca31..a0b522d 100644 --- a/src/main/java/cpw/mods/fml/common/Loader.java +++ b/src/main/java/cpw/mods/fml/common/Loader.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/LoaderException.java b/src/main/java/cpw/mods/fml/common/LoaderException.java index cfe8de1..0643152 100644 --- a/src/main/java/cpw/mods/fml/common/LoaderException.java +++ b/src/main/java/cpw/mods/fml/common/LoaderException.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/LoaderState.java b/src/main/java/cpw/mods/fml/common/LoaderState.java index 180d1ec..ca4b44f 100644 --- a/src/main/java/cpw/mods/fml/common/LoaderState.java +++ b/src/main/java/cpw/mods/fml/common/LoaderState.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/MCPDummyContainer.java b/src/main/java/cpw/mods/fml/common/MCPDummyContainer.java index 81373f0..eb4e8b7 100644 --- a/src/main/java/cpw/mods/fml/common/MCPDummyContainer.java +++ b/src/main/java/cpw/mods/fml/common/MCPDummyContainer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/MetadataCollection.java b/src/main/java/cpw/mods/fml/common/MetadataCollection.java index 9572573..567c1d6 100644 --- a/src/main/java/cpw/mods/fml/common/MetadataCollection.java +++ b/src/main/java/cpw/mods/fml/common/MetadataCollection.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/MinecraftDummyContainer.java b/src/main/java/cpw/mods/fml/common/MinecraftDummyContainer.java index fd9d9f8..fba4f55 100644 --- a/src/main/java/cpw/mods/fml/common/MinecraftDummyContainer.java +++ b/src/main/java/cpw/mods/fml/common/MinecraftDummyContainer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/MissingModsException.java b/src/main/java/cpw/mods/fml/common/MissingModsException.java index 3ef8720..a0b5f68 100644 --- a/src/main/java/cpw/mods/fml/common/MissingModsException.java +++ b/src/main/java/cpw/mods/fml/common/MissingModsException.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/Mod.java b/src/main/java/cpw/mods/fml/common/Mod.java index 8a7357b..d0c6c8d 100644 --- a/src/main/java/cpw/mods/fml/common/Mod.java +++ b/src/main/java/cpw/mods/fml/common/Mod.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; @@ -47,15 +47,15 @@ * // Declare that this is a mod with modId "MyModId", name "My example mod", version "1.0" and dependency on FML. * {@literal @}Mod(modId="MyModId",name="My example mod",version="1.0",dependencies="required-after:FML") * public class MyMod { - * // Populate this field with the instance of the mod created by FML - * {@literal @}Instance("MyModId") - * public MyMod instance; + * // Populate this field with the instance of the mod created by FML + * {@literal @}Instance("MyModId") + * public MyMod instance; * - * // Mark this method for receiving an {@link FMLEvent} (in this case, it's the {@link FMLPreInitializationEvent}) - * {@literal @}EventHandler public void preInit(FMLPreInitializationEvent event) - * { - * // Do stuff in pre-init phase (read config, create blocks and items, register them) - * } + * // Mark this method for receiving an {@link FMLEvent} (in this case, it's the {@link FMLPreInitializationEvent}) + * {@literal @}EventHandler public void preInit(FMLPreInitializationEvent event) + * { + * // Do stuff in pre-init phase (read config, create blocks and items, register them) + * } * } * } * diff --git a/src/main/java/cpw/mods/fml/common/ModClassLoader.java b/src/main/java/cpw/mods/fml/common/ModClassLoader.java index 504bc0d..fb7b18c 100644 --- a/src/main/java/cpw/mods/fml/common/ModClassLoader.java +++ b/src/main/java/cpw/mods/fml/common/ModClassLoader.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/ModContainer.java b/src/main/java/cpw/mods/fml/common/ModContainer.java index b4076f2..27f34b2 100644 --- a/src/main/java/cpw/mods/fml/common/ModContainer.java +++ b/src/main/java/cpw/mods/fml/common/ModContainer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/ModContainerFactory.java b/src/main/java/cpw/mods/fml/common/ModContainerFactory.java index 0d724e0..31b7cff 100644 --- a/src/main/java/cpw/mods/fml/common/ModContainerFactory.java +++ b/src/main/java/cpw/mods/fml/common/ModContainerFactory.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/ModMetadata.java b/src/main/java/cpw/mods/fml/common/ModMetadata.java index d40d652..959858a 100644 --- a/src/main/java/cpw/mods/fml/common/ModMetadata.java +++ b/src/main/java/cpw/mods/fml/common/ModMetadata.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/ProxyInjector.java b/src/main/java/cpw/mods/fml/common/ProxyInjector.java index 8a8a861..2c109e8 100644 --- a/src/main/java/cpw/mods/fml/common/ProxyInjector.java +++ b/src/main/java/cpw/mods/fml/common/ProxyInjector.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/SidedProxy.java b/src/main/java/cpw/mods/fml/common/SidedProxy.java index c59fabc..fec9734 100644 --- a/src/main/java/cpw/mods/fml/common/SidedProxy.java +++ b/src/main/java/cpw/mods/fml/common/SidedProxy.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; @@ -28,18 +28,18 @@ * This example will load a CommonProxy on the server side, and a ClientProxy on the client side. * * 
{@code
- *	public class MySidedProxyHolder {
- *		{@literal @}SidedProxy(modId="MyModId",clientSide="mymod.ClientProxy", serverSide="mymod.CommonProxy")
- *		public static CommonProxy proxy;
- *	}
+ *  public class MySidedProxyHolder {
+ *      {@literal @}SidedProxy(modId="MyModId",clientSide="mymod.ClientProxy", serverSide="mymod.CommonProxy")
+ *      public static CommonProxy proxy;
+ *  }
  *
- *	public class CommonProxy {
- *		// Common or server stuff here that needs to be overridden on the client
- *	}
+ *  public class CommonProxy {
+ *      // Common or server stuff here that needs to be overridden on the client
+ *  }
  *
- *	public class ClientProxy extends CommonProxy {
- *		// Override common stuff with client specific stuff here
- *	}
+ *  public class ClientProxy extends CommonProxy {
+ *      // Override common stuff with client specific stuff here
+ *  }
  * }
  *
* @author cpw diff --git a/src/main/java/cpw/mods/fml/common/WorldAccessContainer.java b/src/main/java/cpw/mods/fml/common/WorldAccessContainer.java index aac2362..8dde296 100644 --- a/src/main/java/cpw/mods/fml/common/WorldAccessContainer.java +++ b/src/main/java/cpw/mods/fml/common/WorldAccessContainer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/WrongMinecraftVersionException.java b/src/main/java/cpw/mods/fml/common/WrongMinecraftVersionException.java index 4df6fe0..5b01b36 100644 --- a/src/main/java/cpw/mods/fml/common/WrongMinecraftVersionException.java +++ b/src/main/java/cpw/mods/fml/common/WrongMinecraftVersionException.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common; diff --git a/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java b/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java index ecf1e64..e257d44 100644 --- a/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java +++ b/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.asm; @@ -39,7 +39,7 @@ { private static final String FMLFINGERPRINT = "51:0A:FB:4C:AF:A4:A0:F2:F5:CF:C5:0E:B4:CC:3C:30:24:4A:E3:8E".toLowerCase().replace(":", ""); private static final String FORGEFINGERPRINT = "E3:C3:D5:0C:7C:98:6D:F7:4C:64:5C:0A:C5:46:39:74:1C:90:A5:57".toLowerCase().replace(":", ""); - private static final String MCFINGERPRINT = "CD:99:95:96:56:F7:53:DC:28:D8:63:B4:67:69:F7:F8:FB:AE:FC:FC".toLowerCase().replace(":", ""); + private static final String MCFINGERPRINT = "CD:99:95:96:56:F7:53:DC:28:D8:63:B4:67:69:F7:F8:FB:AE:FC:FC".toLowerCase().replace(":", ""); private LaunchClassLoader cl; public static File fmlLocation; diff --git a/src/main/java/cpw/mods/fml/common/asm/ReobfuscationMarker.java b/src/main/java/cpw/mods/fml/common/asm/ReobfuscationMarker.java index a6be499..2824486 100644 --- a/src/main/java/cpw/mods/fml/common/asm/ReobfuscationMarker.java +++ b/src/main/java/cpw/mods/fml/common/asm/ReobfuscationMarker.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.asm; diff --git a/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java b/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java index 286bdab..2ecae1b 100644 --- a/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java +++ b/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.asm.transformers; diff --git a/src/main/java/cpw/mods/fml/common/asm/transformers/DeobfuscationTransformer.java b/src/main/java/cpw/mods/fml/common/asm/transformers/DeobfuscationTransformer.java index 804edba..b72b606 100644 --- a/src/main/java/cpw/mods/fml/common/asm/transformers/DeobfuscationTransformer.java +++ b/src/main/java/cpw/mods/fml/common/asm/transformers/DeobfuscationTransformer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.asm.transformers; diff --git a/src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java b/src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java index 106f81a..33b9dc8 100644 --- a/src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java +++ b/src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java @@ -134,10 +134,10 @@ classNode.fields.add(new FieldNode(ACC_PRIVATE | ACC_STATIC, "LISTENER_LIST", tList.getDescriptor(), null, null)); /*Add: - * public () - * { - * super(); - * } + * public () + * { + * super(); + * } */ MethodNode method = new MethodNode(ASM4, ACC_PUBLIC, "", getMethodDescriptor(VOID_TYPE), null, null); method.instructions.add(new VarInsnNode(ALOAD, 0)); @@ -149,15 +149,15 @@ } /*Add: - * protected void setup() - * { - * super.setup(); - * if (LISTENER_LIST != NULL) - * { - * return; - * } - * LISTENER_LIST = new ListenerList(super.getListenerList()); - * } + * protected void setup() + * { + * super.setup(); + * if (LISTENER_LIST != NULL) + * { + * return; + * } + * LISTENER_LIST = new ListenerList(super.getListenerList()); + * } */ method = new MethodNode(ASM4, ACC_PROTECTED, "setup", getMethodDescriptor(VOID_TYPE), null, null); method.instructions.add(new VarInsnNode(ALOAD, 0)); @@ -178,10 +178,10 @@ classNode.methods.add(method); /*Add: - * public ListenerList getListenerList() - * { - * return this.LISTENER_LIST; - * } + * public ListenerList getListenerList() + * { + * return this.LISTENER_LIST; + * } */ method = new MethodNode(ASM4, ACC_PUBLIC, "getListenerList", getMethodDescriptor(tList), null, null); method.instructions.add(new FieldInsnNode(GETSTATIC, classNode.name, "LISTENER_LIST", tList.getDescriptor())); diff --git a/src/main/java/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java b/src/main/java/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java index 6dc72cc..380c67a 100644 --- a/src/main/java/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java +++ b/src/main/java/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.asm.transformers; diff --git a/src/main/java/cpw/mods/fml/common/asm/transformers/SideTransformer.java b/src/main/java/cpw/mods/fml/common/asm/transformers/SideTransformer.java index 4c7775d..2dfb77b 100644 --- a/src/main/java/cpw/mods/fml/common/asm/transformers/SideTransformer.java +++ b/src/main/java/cpw/mods/fml/common/asm/transformers/SideTransformer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.asm.transformers; diff --git a/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java b/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java index 84eee25..1f3b15a 100644 --- a/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java +++ b/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.asm.transformers.deobf; @@ -381,7 +381,7 @@ } public void mergeSuperMaps(String name, String superName, String[] interfaces) { -// System.out.printf("Computing super maps for %s: %s %s\n", name, superName, Arrays.asList(interfaces)); +// System.out.printf("Computing super maps for %s: %s %s\n", name, superName, Arrays.asList(interfaces)); if (classNameBiMap == null || classNameBiMap.isEmpty()) { return; @@ -424,7 +424,7 @@ } methodNameMaps.put(name, ImmutableMap.copyOf(methodMap)); fieldNameMaps.put(name, ImmutableMap.copyOf(fieldMap)); -// System.out.printf("Maps: %s %s\n", name, methodMap); +// System.out.printf("Maps: %s %s\n", name, methodMap); } public Set getObfedClasses() diff --git a/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java b/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java index 3eb1132..dcbb925 100644 --- a/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java +++ b/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.asm.transformers.deobf; diff --git a/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/LZMAInputSupplier.java b/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/LZMAInputSupplier.java index 86f041f..91491c5 100644 --- a/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/LZMAInputSupplier.java +++ b/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/LZMAInputSupplier.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.asm.transformers.deobf; diff --git a/src/main/java/cpw/mods/fml/common/discovery/ASMDataTable.java b/src/main/java/cpw/mods/fml/common/discovery/ASMDataTable.java index aed9f1d..4b57d23 100644 --- a/src/main/java/cpw/mods/fml/common/discovery/ASMDataTable.java +++ b/src/main/java/cpw/mods/fml/common/discovery/ASMDataTable.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.discovery; diff --git a/src/main/java/cpw/mods/fml/common/discovery/ContainerType.java b/src/main/java/cpw/mods/fml/common/discovery/ContainerType.java index d1f9b83..1b2437f 100644 --- a/src/main/java/cpw/mods/fml/common/discovery/ContainerType.java +++ b/src/main/java/cpw/mods/fml/common/discovery/ContainerType.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.discovery; diff --git a/src/main/java/cpw/mods/fml/common/discovery/DirectoryDiscoverer.java b/src/main/java/cpw/mods/fml/common/discovery/DirectoryDiscoverer.java index 1f0196f..7759c5d 100644 --- a/src/main/java/cpw/mods/fml/common/discovery/DirectoryDiscoverer.java +++ b/src/main/java/cpw/mods/fml/common/discovery/DirectoryDiscoverer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.discovery; diff --git a/src/main/java/cpw/mods/fml/common/discovery/ITypeDiscoverer.java b/src/main/java/cpw/mods/fml/common/discovery/ITypeDiscoverer.java index 3a2acf8..5a67d7d 100644 --- a/src/main/java/cpw/mods/fml/common/discovery/ITypeDiscoverer.java +++ b/src/main/java/cpw/mods/fml/common/discovery/ITypeDiscoverer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.discovery; diff --git a/src/main/java/cpw/mods/fml/common/discovery/JarDiscoverer.java b/src/main/java/cpw/mods/fml/common/discovery/JarDiscoverer.java index c3862bb..3f10501 100644 --- a/src/main/java/cpw/mods/fml/common/discovery/JarDiscoverer.java +++ b/src/main/java/cpw/mods/fml/common/discovery/JarDiscoverer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.discovery; diff --git a/src/main/java/cpw/mods/fml/common/discovery/ModCandidate.java b/src/main/java/cpw/mods/fml/common/discovery/ModCandidate.java index 89774d8..929bc95 100644 --- a/src/main/java/cpw/mods/fml/common/discovery/ModCandidate.java +++ b/src/main/java/cpw/mods/fml/common/discovery/ModCandidate.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.discovery; diff --git a/src/main/java/cpw/mods/fml/common/discovery/ModDiscoverer.java b/src/main/java/cpw/mods/fml/common/discovery/ModDiscoverer.java index 50e4bc3..0e650cd 100644 --- a/src/main/java/cpw/mods/fml/common/discovery/ModDiscoverer.java +++ b/src/main/java/cpw/mods/fml/common/discovery/ModDiscoverer.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.discovery; diff --git a/src/main/java/cpw/mods/fml/common/discovery/asm/ASMModParser.java b/src/main/java/cpw/mods/fml/common/discovery/asm/ASMModParser.java index 2b50864..38e88e7 100644 --- a/src/main/java/cpw/mods/fml/common/discovery/asm/ASMModParser.java +++ b/src/main/java/cpw/mods/fml/common/discovery/asm/ASMModParser.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.discovery.asm; @@ -118,11 +118,11 @@ public void validate() { -// if (classVersion > 50.0) -// { +// if (classVersion > 50.0) +// { // -// throw new LoaderException(new RuntimeException("Mod compiled for Java 7 detected")); -// } +// throw new LoaderException(new RuntimeException("Mod compiled for Java 7 detected")); +// } } public boolean isBaseMod(List rememberedTypes) diff --git a/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotation.java b/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotation.java index 1b258bd..e6307cf 100644 --- a/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotation.java +++ b/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotation.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.discovery.asm; diff --git a/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotationVisitor.java b/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotationVisitor.java index 46cdd45..a607fed 100644 --- a/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotationVisitor.java +++ b/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotationVisitor.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.discovery.asm; diff --git a/src/main/java/cpw/mods/fml/common/discovery/asm/ModClassVisitor.java b/src/main/java/cpw/mods/fml/common/discovery/asm/ModClassVisitor.java index 7044350..9665e7b 100644 --- a/src/main/java/cpw/mods/fml/common/discovery/asm/ModClassVisitor.java +++ b/src/main/java/cpw/mods/fml/common/discovery/asm/ModClassVisitor.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.discovery.asm; diff --git a/src/main/java/cpw/mods/fml/common/discovery/asm/ModFieldVisitor.java b/src/main/java/cpw/mods/fml/common/discovery/asm/ModFieldVisitor.java index c09b1b9..085e0f1 100644 --- a/src/main/java/cpw/mods/fml/common/discovery/asm/ModFieldVisitor.java +++ b/src/main/java/cpw/mods/fml/common/discovery/asm/ModFieldVisitor.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.discovery.asm; diff --git a/src/main/java/cpw/mods/fml/common/event/FMLConstructionEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLConstructionEvent.java index cea1f68..62ebc93 100644 --- a/src/main/java/cpw/mods/fml/common/event/FMLConstructionEvent.java +++ b/src/main/java/cpw/mods/fml/common/event/FMLConstructionEvent.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.event; diff --git a/src/main/java/cpw/mods/fml/common/event/FMLEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLEvent.java index d441530..9d21a65 100644 --- a/src/main/java/cpw/mods/fml/common/event/FMLEvent.java +++ b/src/main/java/cpw/mods/fml/common/event/FMLEvent.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.event; diff --git a/src/main/java/cpw/mods/fml/common/event/FMLFingerprintViolationEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLFingerprintViolationEvent.java index 4c556ff..bb88015 100644 --- a/src/main/java/cpw/mods/fml/common/event/FMLFingerprintViolationEvent.java +++ b/src/main/java/cpw/mods/fml/common/event/FMLFingerprintViolationEvent.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.event; diff --git a/src/main/java/cpw/mods/fml/common/event/FMLInitializationEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLInitializationEvent.java index fc355cf..7180680 100644 --- a/src/main/java/cpw/mods/fml/common/event/FMLInitializationEvent.java +++ b/src/main/java/cpw/mods/fml/common/event/FMLInitializationEvent.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.event; diff --git a/src/main/java/cpw/mods/fml/common/event/FMLInterModComms.java b/src/main/java/cpw/mods/fml/common/event/FMLInterModComms.java index 00b26d0..0190cdb 100644 --- a/src/main/java/cpw/mods/fml/common/event/FMLInterModComms.java +++ b/src/main/java/cpw/mods/fml/common/event/FMLInterModComms.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.event; diff --git a/src/main/java/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java index d6fc0be..b4a685e 100644 --- a/src/main/java/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java +++ b/src/main/java/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.event; diff --git a/src/main/java/cpw/mods/fml/common/event/FMLLoadEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLLoadEvent.java index ad74768..14304d3 100644 --- a/src/main/java/cpw/mods/fml/common/event/FMLLoadEvent.java +++ b/src/main/java/cpw/mods/fml/common/event/FMLLoadEvent.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.event; diff --git a/src/main/java/cpw/mods/fml/common/event/FMLPostInitializationEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLPostInitializationEvent.java index 0f58605..f6208a2 100644 --- a/src/main/java/cpw/mods/fml/common/event/FMLPostInitializationEvent.java +++ b/src/main/java/cpw/mods/fml/common/event/FMLPostInitializationEvent.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.event; diff --git a/src/main/java/cpw/mods/fml/common/event/FMLPreInitializationEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLPreInitializationEvent.java index 00021d0..de0a785 100644 --- a/src/main/java/cpw/mods/fml/common/event/FMLPreInitializationEvent.java +++ b/src/main/java/cpw/mods/fml/common/event/FMLPreInitializationEvent.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.event; diff --git a/src/main/java/cpw/mods/fml/common/event/FMLServerAboutToStartEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLServerAboutToStartEvent.java index 2f6edc7..9a01ea8 100644 --- a/src/main/java/cpw/mods/fml/common/event/FMLServerAboutToStartEvent.java +++ b/src/main/java/cpw/mods/fml/common/event/FMLServerAboutToStartEvent.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.event; diff --git a/src/main/java/cpw/mods/fml/common/event/FMLServerStartedEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLServerStartedEvent.java index 5884e03..f4c90ee 100644 --- a/src/main/java/cpw/mods/fml/common/event/FMLServerStartedEvent.java +++ b/src/main/java/cpw/mods/fml/common/event/FMLServerStartedEvent.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.event; diff --git a/src/main/java/cpw/mods/fml/common/event/FMLServerStartingEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLServerStartingEvent.java index ad9a396..1f7d8e1 100644 --- a/src/main/java/cpw/mods/fml/common/event/FMLServerStartingEvent.java +++ b/src/main/java/cpw/mods/fml/common/event/FMLServerStartingEvent.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.event; diff --git a/src/main/java/cpw/mods/fml/common/event/FMLServerStoppedEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLServerStoppedEvent.java index 8cdacb7..5da7e1f 100644 --- a/src/main/java/cpw/mods/fml/common/event/FMLServerStoppedEvent.java +++ b/src/main/java/cpw/mods/fml/common/event/FMLServerStoppedEvent.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.event; diff --git a/src/main/java/cpw/mods/fml/common/event/FMLServerStoppingEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLServerStoppingEvent.java index c2568e6..89bf3e0 100644 --- a/src/main/java/cpw/mods/fml/common/event/FMLServerStoppingEvent.java +++ b/src/main/java/cpw/mods/fml/common/event/FMLServerStoppingEvent.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.event; diff --git a/src/main/java/cpw/mods/fml/common/event/FMLStateEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLStateEvent.java index b24a1ea..1d4b1bc 100644 --- a/src/main/java/cpw/mods/fml/common/event/FMLStateEvent.java +++ b/src/main/java/cpw/mods/fml/common/event/FMLStateEvent.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.event; diff --git a/src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java b/src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java index ffa0f13..c62af1b 100644 --- a/src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java +++ b/src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java @@ -70,16 +70,16 @@ MethodVisitor mv; String name = getUniqueName(callback); - String desc = name.replace('.', '/'); + String desc = name.replace('.', '/'); String instType = Type.getInternalName(callback.getDeclaringClass()); String eventType = Type.getInternalName(callback.getParameterTypes()[0]); /* - System.out.println("Name: " + name); - System.out.println("Desc: " + desc); + System.out.println("Name: " + name); + System.out.println("Desc: " + desc); System.out.println("InstType: " + instType); System.out.println("Callback: " + callback.getName() + Type.getMethodDescriptor(callback)); - System.out.println("Event: " + eventType); + System.out.println("Event: " + eventType); */ cw.visit(V1_6, ACC_PUBLIC | ACC_SUPER, desc, null, "java/lang/Object", new String[]{ HANDLER_DESC }); diff --git a/src/main/java/cpw/mods/fml/common/eventhandler/EventPriority.java b/src/main/java/cpw/mods/fml/common/eventhandler/EventPriority.java index ee6ad07..4f3df86 100644 --- a/src/main/java/cpw/mods/fml/common/eventhandler/EventPriority.java +++ b/src/main/java/cpw/mods/fml/common/eventhandler/EventPriority.java @@ -5,8 +5,8 @@ /*Priority of event listeners, listeners will be sorted with respect to this priority level. * * Note: - * Due to using a ArrayList in the ListenerList, - * these need to stay in a contiguous index starting at 0. {Default ordinal} + * Due to using a ArrayList in the ListenerList, + * these need to stay in a contiguous index starting at 0. {Default ordinal} */ HIGHEST, //First to execute HIGH, diff --git a/src/main/java/cpw/mods/fml/common/functions/ModIdFunction.java b/src/main/java/cpw/mods/fml/common/functions/ModIdFunction.java index cc81cd7..fd30171 100644 --- a/src/main/java/cpw/mods/fml/common/functions/ModIdFunction.java +++ b/src/main/java/cpw/mods/fml/common/functions/ModIdFunction.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.functions; diff --git a/src/main/java/cpw/mods/fml/common/functions/ModNameFunction.java b/src/main/java/cpw/mods/fml/common/functions/ModNameFunction.java index 8eb6093..cea8916 100644 --- a/src/main/java/cpw/mods/fml/common/functions/ModNameFunction.java +++ b/src/main/java/cpw/mods/fml/common/functions/ModNameFunction.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.functions; diff --git a/src/main/java/cpw/mods/fml/common/launcher/Yggdrasil.java b/src/main/java/cpw/mods/fml/common/launcher/Yggdrasil.java index c176dd2..c28f559 100644 --- a/src/main/java/cpw/mods/fml/common/launcher/Yggdrasil.java +++ b/src/main/java/cpw/mods/fml/common/launcher/Yggdrasil.java @@ -111,7 +111,7 @@ if (result.selectedProfile != null) { args.put("--username", result.selectedProfile.name); - args.put("--uuid", result.selectedProfile.id); + args.put("--uuid", result.selectedProfile.id); args.put("--accessToken", result.accessToken); } } diff --git a/src/main/java/cpw/mods/fml/common/network/FMLNetworkException.java b/src/main/java/cpw/mods/fml/common/network/FMLNetworkException.java index 194bdcb..291af0b 100644 --- a/src/main/java/cpw/mods/fml/common/network/FMLNetworkException.java +++ b/src/main/java/cpw/mods/fml/common/network/FMLNetworkException.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.network; diff --git a/src/main/java/cpw/mods/fml/common/network/IGuiHandler.java b/src/main/java/cpw/mods/fml/common/network/IGuiHandler.java index ebb38ff..347ab1d 100644 --- a/src/main/java/cpw/mods/fml/common/network/IGuiHandler.java +++ b/src/main/java/cpw/mods/fml/common/network/IGuiHandler.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.network; diff --git a/src/main/java/cpw/mods/fml/common/network/NetworkRegistry.java b/src/main/java/cpw/mods/fml/common/network/NetworkRegistry.java index 38e08ef..e447f4a 100644 --- a/src/main/java/cpw/mods/fml/common/network/NetworkRegistry.java +++ b/src/main/java/cpw/mods/fml/common/network/NetworkRegistry.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.network; diff --git a/src/main/java/cpw/mods/fml/common/network/internal/FMLMessage.java b/src/main/java/cpw/mods/fml/common/network/internal/FMLMessage.java index 7e104d7..0736257 100644 --- a/src/main/java/cpw/mods/fml/common/network/internal/FMLMessage.java +++ b/src/main/java/cpw/mods/fml/common/network/internal/FMLMessage.java @@ -204,9 +204,9 @@ if (mX < -maxVel) mX = -maxVel; if (mY < -maxVel) mY = -maxVel; if (mZ < -maxVel) mZ = -maxVel; - if (mX > maxVel) mX = maxVel; - if (mY > maxVel) mY = maxVel; - if (mZ > maxVel) mZ = maxVel; + if (mX > maxVel) mX = maxVel; + if (mY > maxVel) mY = maxVel; + if (mZ > maxVel) mZ = maxVel; buf.writeInt((int)(mX * 8000D)); buf.writeInt((int)(mY * 8000D)); buf.writeInt((int)(mZ * 8000D)); diff --git a/src/main/java/cpw/mods/fml/common/network/internal/FMLNetworkHandler.java b/src/main/java/cpw/mods/fml/common/network/internal/FMLNetworkHandler.java index d448735..c9332c7 100644 --- a/src/main/java/cpw/mods/fml/common/network/internal/FMLNetworkHandler.java +++ b/src/main/java/cpw/mods/fml/common/network/internal/FMLNetworkHandler.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.network.internal; diff --git a/src/main/java/cpw/mods/fml/common/network/internal/NetworkModHolder.java b/src/main/java/cpw/mods/fml/common/network/internal/NetworkModHolder.java index 70e7326..10d7a77 100644 --- a/src/main/java/cpw/mods/fml/common/network/internal/NetworkModHolder.java +++ b/src/main/java/cpw/mods/fml/common/network/internal/NetworkModHolder.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.network.internal; diff --git a/src/main/java/cpw/mods/fml/common/patcher/GenDiffSet.java b/src/main/java/cpw/mods/fml/common/patcher/GenDiffSet.java index 714bea8..27df114 100644 --- a/src/main/java/cpw/mods/fml/common/patcher/GenDiffSet.java +++ b/src/main/java/cpw/mods/fml/common/patcher/GenDiffSet.java @@ -44,7 +44,7 @@ for (String name : remapper.getObfedClasses()) { -// Logger.getLogger("GENDIFF").info(String.format("Evaluating path for data :%s",name)); +// Logger.getLogger("GENDIFF").info(String.format("Evaluating path for data :%s",name)); String fileName = name; String jarName = name; if (RESERVED_NAMES.contains(name.toUpperCase(Locale.ENGLISH))) diff --git a/src/main/java/cpw/mods/fml/common/registry/EntityRegistry.java b/src/main/java/cpw/mods/fml/common/registry/EntityRegistry.java index 69cfe70..d7878fd 100644 --- a/src/main/java/cpw/mods/fml/common/registry/EntityRegistry.java +++ b/src/main/java/cpw/mods/fml/common/registry/EntityRegistry.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.registry; diff --git a/src/main/java/cpw/mods/fml/common/registry/GameData.java b/src/main/java/cpw/mods/fml/common/registry/GameData.java index f50f180..128bbdc 100644 --- a/src/main/java/cpw/mods/fml/common/registry/GameData.java +++ b/src/main/java/cpw/mods/fml/common/registry/GameData.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.registry; diff --git a/src/main/java/cpw/mods/fml/common/registry/GameRegistry.java b/src/main/java/cpw/mods/fml/common/registry/GameRegistry.java index ad59394..7891db8 100644 --- a/src/main/java/cpw/mods/fml/common/registry/GameRegistry.java +++ b/src/main/java/cpw/mods/fml/common/registry/GameRegistry.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.registry; diff --git a/src/main/java/cpw/mods/fml/common/registry/IEntityAdditionalSpawnData.java b/src/main/java/cpw/mods/fml/common/registry/IEntityAdditionalSpawnData.java index a24dfbd..250d416 100644 --- a/src/main/java/cpw/mods/fml/common/registry/IEntityAdditionalSpawnData.java +++ b/src/main/java/cpw/mods/fml/common/registry/IEntityAdditionalSpawnData.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.registry; diff --git a/src/main/java/cpw/mods/fml/common/registry/IThrowableEntity.java b/src/main/java/cpw/mods/fml/common/registry/IThrowableEntity.java index 33333c2..e9636ab 100644 --- a/src/main/java/cpw/mods/fml/common/registry/IThrowableEntity.java +++ b/src/main/java/cpw/mods/fml/common/registry/IThrowableEntity.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.registry; diff --git a/src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java b/src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java index 1d2f4d5..e5722a7 100644 --- a/src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java +++ b/src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.registry; @@ -200,7 +200,7 @@ InputStream langStream = null; Properties langPack = new Properties(); - try { + try { langStream = localizationFile.openStream(); if (isXML) { @@ -215,9 +215,9 @@ catch (IOException e) { FMLLog.log(Level.ERROR, e, "Unable to load localization from file %s", localizationFile); } - finally { - try { - if (langStream != null) { + finally { + try { + if (langStream != null) { langStream.close(); } } diff --git a/src/main/java/cpw/mods/fml/common/registry/VillagerRegistry.java b/src/main/java/cpw/mods/fml/common/registry/VillagerRegistry.java index aa7cb01..f8bc1a1 100644 --- a/src/main/java/cpw/mods/fml/common/registry/VillagerRegistry.java +++ b/src/main/java/cpw/mods/fml/common/registry/VillagerRegistry.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.registry; diff --git a/src/main/java/cpw/mods/fml/common/toposort/ModSortingException.java b/src/main/java/cpw/mods/fml/common/toposort/ModSortingException.java index 3a7116d..b912de2 100644 --- a/src/main/java/cpw/mods/fml/common/toposort/ModSortingException.java +++ b/src/main/java/cpw/mods/fml/common/toposort/ModSortingException.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.toposort; diff --git a/src/main/java/cpw/mods/fml/common/toposort/TopologicalSort.java b/src/main/java/cpw/mods/fml/common/toposort/TopologicalSort.java index a2bee2c..0c10fff 100644 --- a/src/main/java/cpw/mods/fml/common/toposort/TopologicalSort.java +++ b/src/main/java/cpw/mods/fml/common/toposort/TopologicalSort.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.toposort; diff --git a/src/main/java/cpw/mods/fml/common/versioning/ArtifactVersion.java b/src/main/java/cpw/mods/fml/common/versioning/ArtifactVersion.java index 13ba264..1b0a17e 100644 --- a/src/main/java/cpw/mods/fml/common/versioning/ArtifactVersion.java +++ b/src/main/java/cpw/mods/fml/common/versioning/ArtifactVersion.java @@ -7,26 +7,26 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.versioning; /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ diff --git a/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java b/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java index bfdb337..dbec8ca 100644 --- a/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java +++ b/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java @@ -7,26 +7,26 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.versioning; /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ @@ -48,21 +48,21 @@ *
    *
  • mixing of '-' (dash) and '.' (dot) separators,
    • *
  • transition between characters and digits also constitutes a separator: - * 1.0alpha1 => [1, 0, alpha, 1]
    • + * 1.0alpha1 => [1, 0, alpha, 1] *
  • unlimited number of version components,
    • *
  • version components in the text can be digits or strings,
    • *
  • strings are checked for well-known qualifiers and the qualifier ordering is used for version ordering. - * Well-known qualifiers (case insensitive) are:
      - *
    • snapshot
      • - *
    • alpha or a
      • - *
    • beta or b
      • - *
    • milestone or m
      • - *
    • rc or cr
      • - *
    • (the empty string) or ga or final
      • - *
    • sp
      • - *
    - * Unknown qualifiers are considered after known qualifiers, with lexical order (always case insensitive), - *
    • + * Well-known qualifiers (case insensitive) are:
      + *
    • snapshot
      • + *
    • alpha or a
      • + *
    • beta or b
      • + *
    • milestone or m
      • + *
    • rc or cr
      • + *
    • (the empty string) or ga or final
      • + *
    • sp
      • + *
    + * Unknown qualifiers are considered after known qualifiers, with lexical order (always case insensitive), + * *
  • a dash usually precedes a qualifier, and is always less important than something preceded with a dot.
    • *

* diff --git a/src/main/java/cpw/mods/fml/common/versioning/DefaultArtifactVersion.java b/src/main/java/cpw/mods/fml/common/versioning/DefaultArtifactVersion.java index a25e41a..d0fcf04 100644 --- a/src/main/java/cpw/mods/fml/common/versioning/DefaultArtifactVersion.java +++ b/src/main/java/cpw/mods/fml/common/versioning/DefaultArtifactVersion.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.versioning; diff --git a/src/main/java/cpw/mods/fml/common/versioning/InvalidVersionSpecificationException.java b/src/main/java/cpw/mods/fml/common/versioning/InvalidVersionSpecificationException.java index 0f4e0d9..848056b 100644 --- a/src/main/java/cpw/mods/fml/common/versioning/InvalidVersionSpecificationException.java +++ b/src/main/java/cpw/mods/fml/common/versioning/InvalidVersionSpecificationException.java @@ -7,26 +7,26 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.versioning; /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ diff --git a/src/main/java/cpw/mods/fml/common/versioning/Restriction.java b/src/main/java/cpw/mods/fml/common/versioning/Restriction.java index 5c9dbac..0f1e52b 100644 --- a/src/main/java/cpw/mods/fml/common/versioning/Restriction.java +++ b/src/main/java/cpw/mods/fml/common/versioning/Restriction.java @@ -7,26 +7,26 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.versioning; /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ diff --git a/src/main/java/cpw/mods/fml/common/versioning/VersionParser.java b/src/main/java/cpw/mods/fml/common/versioning/VersionParser.java index 537975e..0d9693c 100644 --- a/src/main/java/cpw/mods/fml/common/versioning/VersionParser.java +++ b/src/main/java/cpw/mods/fml/common/versioning/VersionParser.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.versioning; diff --git a/src/main/java/cpw/mods/fml/common/versioning/VersionRange.java b/src/main/java/cpw/mods/fml/common/versioning/VersionRange.java index 3371f15..18f1615 100644 --- a/src/main/java/cpw/mods/fml/common/versioning/VersionRange.java +++ b/src/main/java/cpw/mods/fml/common/versioning/VersionRange.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.common.versioning; @@ -17,19 +17,19 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ @@ -249,24 +249,24 @@ *

* * @param restriction the VersionRange that will be used to restrict this version - * range. + * range. * @return the VersionRange that is a restriction of this version range and the - * specified version range. - *

- * The restrictions of the returned version range will be an intersection of the restrictions - * of this version range and the specified version range if both version ranges have - * restrictions. Otherwise, the restrictions on the returned range will be empty. - *

- *

- * The recommended version of the returned version range will be the recommended version of - * this version range, provided that ranges falls within the intersected restrictions. If - * the restrictions are empty, this version range's recommended version is used if it is not - * null. If it is null, the specified version range's recommended - * version is used (provided it is non-null). If no recommended version can be - * obtained, the returned version range's recommended version is set to null. - *

+ * specified version range. + *

+ * The restrictions of the returned version range will be an intersection of the restrictions + * of this version range and the specified version range if both version ranges have + * restrictions. Otherwise, the restrictions on the returned range will be empty. + *

+ *

+ * The recommended version of the returned version range will be the recommended version of + * this version range, provided that ranges falls within the intersected restrictions. If + * the restrictions are empty, this version range's recommended version is used if it is not + * null. If it is null, the specified version range's recommended + * version is used (provided it is non-null). If no recommended version can be + * obtained, the returned version range's recommended version is set to null. + *

* @throws NullPointerException if the specified VersionRange is - * null. + * null. */ public VersionRange restrict( VersionRange restriction ) { diff --git a/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java b/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java index 53dfc2a..35a7db8 100644 --- a/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java +++ b/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.relauncher; @@ -338,7 +338,7 @@ /** * @param mcDir - * the minecraft home directory + * the minecraft home directory * @return the coremod directory */ private static File setupCoreModDir(File mcDir) diff --git a/src/main/java/cpw/mods/fml/relauncher/FMLCorePlugin.java b/src/main/java/cpw/mods/fml/relauncher/FMLCorePlugin.java index 2961bfa..1063d28 100644 --- a/src/main/java/cpw/mods/fml/relauncher/FMLCorePlugin.java +++ b/src/main/java/cpw/mods/fml/relauncher/FMLCorePlugin.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.relauncher; diff --git a/src/main/java/cpw/mods/fml/relauncher/FMLInjectionData.java b/src/main/java/cpw/mods/fml/relauncher/FMLInjectionData.java index dacaaca..31704fb 100644 --- a/src/main/java/cpw/mods/fml/relauncher/FMLInjectionData.java +++ b/src/main/java/cpw/mods/fml/relauncher/FMLInjectionData.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.relauncher; diff --git a/src/main/java/cpw/mods/fml/relauncher/FMLLaunchHandler.java b/src/main/java/cpw/mods/fml/relauncher/FMLLaunchHandler.java index 8b3ac60..e78dfb9 100644 --- a/src/main/java/cpw/mods/fml/relauncher/FMLLaunchHandler.java +++ b/src/main/java/cpw/mods/fml/relauncher/FMLLaunchHandler.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.relauncher; diff --git a/src/main/java/cpw/mods/fml/relauncher/FMLRelaunchLog.java b/src/main/java/cpw/mods/fml/relauncher/FMLRelaunchLog.java index baf1dc9..76734de 100644 --- a/src/main/java/cpw/mods/fml/relauncher/FMLRelaunchLog.java +++ b/src/main/java/cpw/mods/fml/relauncher/FMLRelaunchLog.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.relauncher; diff --git a/src/main/java/cpw/mods/fml/relauncher/IFMLCallHook.java b/src/main/java/cpw/mods/fml/relauncher/IFMLCallHook.java index 20cc0c3..4f14fc1 100644 --- a/src/main/java/cpw/mods/fml/relauncher/IFMLCallHook.java +++ b/src/main/java/cpw/mods/fml/relauncher/IFMLCallHook.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.relauncher; diff --git a/src/main/java/cpw/mods/fml/relauncher/IFMLLoadingPlugin.java b/src/main/java/cpw/mods/fml/relauncher/IFMLLoadingPlugin.java index d716900..b8935ed 100644 --- a/src/main/java/cpw/mods/fml/relauncher/IFMLLoadingPlugin.java +++ b/src/main/java/cpw/mods/fml/relauncher/IFMLLoadingPlugin.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package cpw.mods.fml.relauncher; diff --git a/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Checksum.java b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Checksum.java index c9beb9e..f5c11ae 100644 --- a/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Checksum.java +++ b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Checksum.java @@ -127,7 +127,7 @@ public static long incrementChecksum(long checksum, byte out, byte in, int chunkSize) { char old_c = single_hash[out+128]; char new_c = single_hash[in+128]; - int low = ((int)((checksum) & 0xffff) - old_c + new_c) & 0xffff; + int low = ((int)((checksum) & 0xffff) - old_c + new_c) & 0xffff; int high = ((int)((checksum) >> 16) - (old_c * chunkSize) + low) & 0xffff; return (high << 16) | (low & 0xffff); } diff --git a/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Delta.java b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Delta.java index be43429..4d75109 100644 --- a/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Delta.java +++ b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Delta.java @@ -24,12 +24,12 @@ * IN THE SOFTWARE. * * Change Log: - * iiimmddyyn nnnnn Description - * ---------- ----- ------------------------------------------------------- - * gls100603a Fixes from Torgeir Veimo and Dan Morrione - * gls110603a Stream not being closed thus preventing a file from - * being subsequently deleted. - * gls031504a Error being written to stderr rather than throwing exception + * iiimmddyyn nnnnn Description + * ---------- ----- ------------------------------------------------------- + * gls100603a Fixes from Torgeir Veimo and Dan Morrione + * gls110603a Stream not being closed thus preventing a file from + * being subsequently deleted. + * gls031504a Error being written to stderr rather than throwing exception */ package cpw.mods.fml.repackage.com.nothome.delta; diff --git a/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffPatcher.java b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffPatcher.java index 83cf60b..5e13753 100644 --- a/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffPatcher.java +++ b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffPatcher.java @@ -238,7 +238,7 @@ System.out.println("finished patching file"); - } catch (Exception ioe) { //gls031504a + } catch (Exception ioe) { //gls031504a System.err.println("error while patching: " + ioe); } } diff --git a/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java index 4bdad16..a9105e8 100644 --- a/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java +++ b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java @@ -87,7 +87,7 @@ public void addCopy(long offset, int length) throws IOException { writeBuf(); - //output debug data + //output debug data if (debug) System.err.println("COPY off: " + offset + ", len: " + length); @@ -97,8 +97,8 @@ output.writeByte(COPY_LONG_INT); output.writeLong(offset); output.writeInt(length); - } else if (offset < 65536) { - if (length < 256) { + } else if (offset < 65536) { + if (length < 256) { output.writeByte(COPY_USHORT_UBYTE); output.writeShort((int)offset); output.writeByte(length); diff --git a/src/main/java/net/minecraft/block/Block.java b/src/main/java/net/minecraft/block/Block.java index 3fbfd8f..4b099a6 100644 --- a/src/main/java/net/minecraft/block/Block.java +++ b/src/main/java/net/minecraft/block/Block.java @@ -1580,7 +1580,7 @@ */ public int getBedDirection(IBlockAccess world, int x, int y, int z) { - return BlockBed.getDirection(world.getBlockMetadata(x, y, z)); + return BlockBed.getDirection(world.getBlockMetadata(x, y, z)); } /** @@ -1594,7 +1594,7 @@ */ public boolean isBedFoot(IBlockAccess world, int x, int y, int z) { - return BlockBed.isBlockHeadOfBed(world.getBlockMetadata(x, y, z)); + return BlockBed.isBlockHeadOfBed(world.getBlockMetadata(x, y, z)); } /** @@ -1655,7 +1655,7 @@ * @param x X Position * @param y Y Position * @param z Z Position - * @return true if the block is wood (logs) + * @return true if the block is wood (logs) */ public boolean isWood(IBlockAccess world, int x, int y, int z) { @@ -1670,7 +1670,7 @@ * @param y Y Position * @param z Z Position * @param target The generic target block the gen is looking for, Standards define stone - * for overworld generation, and neatherack for the nether. + * for overworld generation, and neatherack for the nether. * @return True to allow this block to be replaced by a ore */ public boolean isReplaceableOreGen(World world, int x, int y, int z, Block target) @@ -1718,11 +1718,11 @@ * Useful to control which sides are inputs and outputs for redstone wires. * * Side: - * -1: UP - * 0: NORTH - * 1: EAST - * 2: SOUTH - * 3: WEST + * -1: UP + * 0: NORTH + * 1: EAST + * 2: SOUTH + * 3: WEST * * @param world The current world * @param x X Position @@ -1839,13 +1839,13 @@ /** * Determines if this block can support the passed in plant, allowing it to be planted and grow. * Some examples: - * Reeds check if its a reed, or if its sand/dirt/grass and adjacent to water - * Cacti checks if its a cacti, or if its sand - * Nether types check for soul sand - * Crops check for tilled soil - * Caves check if it's a solid surface - * Plains check if its grass or dirt - * Water check if its still water + * Reeds check if its a reed, or if its sand/dirt/grass and adjacent to water + * Cacti checks if its a cacti, or if its sand + * Nether types check for soul sand + * Crops check for tilled soil + * Caves check if it's a solid surface + * Plains check if its grass or dirt + * Water check if its still water * * @param world The current world * @param x X Position @@ -1879,16 +1879,16 @@ { case Desert: return this == Blocks.sand; case Nether: return this == Blocks.soul_sand; - case Crop: return this == Blocks.farmland; - case Cave: return isSideSolid(world, x, y, z, UP); + case Crop: return this == Blocks.farmland; + case Cave: return isSideSolid(world, x, y, z, UP); case Plains: return this == Blocks.grass || this == Blocks.dirt; - case Water: return world.getBlock(x, y, z).getMaterial() == Material.water && world.getBlockMetadata(x, y, z) == 0; + case Water: return world.getBlock(x, y, z).getMaterial() == Material.water && world.getBlockMetadata(x, y, z) == 0; case Beach: boolean isBeach = this == Blocks.grass || this == Blocks.dirt || this == Blocks.sand; - boolean hasWater = (world.getBlock(x - 1, y, z ).getMaterial() == Material.water || - world.getBlock(x + 1, y, z ).getMaterial() == Material.water || - world.getBlock(x, y, z - 1).getMaterial() == Material.water || - world.getBlock(x, y, z + 1).getMaterial() == Material.water); + boolean hasWater = (world.getBlock(x - 1, y, z ).getMaterial() == Material.water || + world.getBlock(x + 1, y, z ).getMaterial() == Material.water || + world.getBlock(x, y, z - 1).getMaterial() == Material.water || + world.getBlock(x, y, z + 1).getMaterial() == Material.water); return isBeach && hasWater; } @@ -2134,11 +2134,11 @@ * * @param toolClass Class * @param level Harvest level: - * Wood: 0 - * Stone: 1 - * Iton: 2 - * Diamond: 3 - * Gold: 0 + * Wood: 0 + * Stone: 1 + * Iton: 2 + * Diamond: 3 + * Gold: 0 */ public void setHarvestLevel(String toolClass, int level) { @@ -2153,11 +2153,11 @@ * * @param toolClass Class * @param level Harvest level: - * Wood: 0 - * Stone: 1 - * Iton: 2 - * Diamond: 3 - * Gold: 0 + * Wood: 0 + * Stone: 1 + * Iton: 2 + * Diamond: 3 + * Gold: 0 * @param metadata The specific metadata to set */ public void setHarvestLevel(String toolClass, int level, int metadata) diff --git a/src/main/java/net/minecraft/block/BlockBush.java b/src/main/java/net/minecraft/block/BlockBush.java index c67cce7..9e925dc 100644 --- a/src/main/java/net/minecraft/block/BlockBush.java +++ b/src/main/java/net/minecraft/block/BlockBush.java @@ -62,7 +62,7 @@ public boolean canBlockStay(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_) { - return p_149718_1_.getBlock(p_149718_2_, p_149718_3_ - 1, p_149718_4_).canSustainPlant(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_, ForgeDirection.UP, this); + return p_149718_1_.getBlock(p_149718_2_, p_149718_3_ - 1, p_149718_4_).canSustainPlant(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_, ForgeDirection.UP, this); } public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) @@ -88,21 +88,21 @@ @Override public EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z) { - if (this == Blocks.wheat) return Crop; - if (this == Blocks.carrots) return Crop; - if (this == Blocks.potatoes) return Crop; - if (this == Blocks.melon_stem) return Crop; + if (this == Blocks.wheat) return Crop; + if (this == Blocks.carrots) return Crop; + if (this == Blocks.potatoes) return Crop; + if (this == Blocks.melon_stem) return Crop; if (this == Blocks.pumpkin_stem) return Crop; - if (this == Blocks.deadbush) return Desert; - if (this == Blocks.waterlily) return Water; + if (this == Blocks.deadbush) return Desert; + if (this == Blocks.waterlily) return Water; if (this == Blocks.red_mushroom) return Cave; if (this == Blocks.brown_mushroom) return Cave; - if (this == Blocks.nether_wart) return Nether; - if (this == Blocks.sapling) return Plains; - if (this == Blocks.tallgrass) return Plains; + if (this == Blocks.nether_wart) return Nether; + if (this == Blocks.sapling) return Plains; + if (this == Blocks.tallgrass) return Plains; if (this == Blocks.double_plant) return Plains; - if (this == Blocks.red_flower) return Plains; - if (this == Blocks.yellow_flower) return Plains; + if (this == Blocks.red_flower) return Plains; + if (this == Blocks.yellow_flower) return Plains; return Plains; } diff --git a/src/main/java/net/minecraft/block/BlockButton.java b/src/main/java/net/minecraft/block/BlockButton.java index 24ea688..1af32a3 100644 --- a/src/main/java/net/minecraft/block/BlockButton.java +++ b/src/main/java/net/minecraft/block/BlockButton.java @@ -55,8 +55,8 @@ ForgeDirection dir = ForgeDirection.getOrientation(p_149707_5_); return (dir == NORTH && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_, p_149707_4_ + 1, NORTH)) || (dir == SOUTH && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_, p_149707_4_ - 1, SOUTH)) || - (dir == WEST && p_149707_1_.isSideSolid(p_149707_2_ + 1, p_149707_3_, p_149707_4_, WEST)) || - (dir == EAST && p_149707_1_.isSideSolid(p_149707_2_ - 1, p_149707_3_, p_149707_4_, EAST)); + (dir == WEST && p_149707_1_.isSideSolid(p_149707_2_ + 1, p_149707_3_, p_149707_4_, WEST)) || + (dir == EAST && p_149707_1_.isSideSolid(p_149707_2_ - 1, p_149707_3_, p_149707_4_, EAST)); } public boolean canPlaceBlockAt(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_) diff --git a/src/main/java/net/minecraft/block/BlockFire.java b/src/main/java/net/minecraft/block/BlockFire.java index 7b6ed96..f3a9905 100644 --- a/src/main/java/net/minecraft/block/BlockFire.java +++ b/src/main/java/net/minecraft/block/BlockFire.java @@ -146,7 +146,7 @@ this.tryCatchFire(p_149674_1_, p_149674_2_ + 1, p_149674_3_, p_149674_4_, 300 + b0, p_149674_5_, l, WEST ); this.tryCatchFire(p_149674_1_, p_149674_2_ - 1, p_149674_3_, p_149674_4_, 300 + b0, p_149674_5_, l, EAST ); - this.tryCatchFire(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_, 250 + b0, p_149674_5_, l, UP ); + this.tryCatchFire(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_, 250 + b0, p_149674_5_, l, UP ); this.tryCatchFire(p_149674_1_, p_149674_2_, p_149674_3_ + 1, p_149674_4_, 250 + b0, p_149674_5_, l, DOWN ); this.tryCatchFire(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_ - 1, 300 + b0, p_149674_5_, l, SOUTH); this.tryCatchFire(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_ + 1, 300 + b0, p_149674_5_, l, NORTH); @@ -244,7 +244,7 @@ { return this.canCatchFire(p_149847_1_, p_149847_2_ + 1, p_149847_3_, p_149847_4_, WEST ) || this.canCatchFire(p_149847_1_, p_149847_2_ - 1, p_149847_3_, p_149847_4_, EAST ) || - this.canCatchFire(p_149847_1_, p_149847_2_, p_149847_3_ - 1, p_149847_4_, UP ) || + this.canCatchFire(p_149847_1_, p_149847_2_, p_149847_3_ - 1, p_149847_4_, UP ) || this.canCatchFire(p_149847_1_, p_149847_2_, p_149847_3_ + 1, p_149847_4_, DOWN ) || this.canCatchFire(p_149847_1_, p_149847_2_, p_149847_3_, p_149847_4_ - 1, SOUTH) || this.canCatchFire(p_149847_1_, p_149847_2_, p_149847_3_, p_149847_4_ + 1, NORTH); @@ -263,7 +263,7 @@ int l = b0; l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_ + 1, p_149845_3_, p_149845_4_, l, WEST ); l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_ - 1, p_149845_3_, p_149845_4_, l, EAST ); - l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_, p_149845_3_ - 1, p_149845_4_, l, UP ); + l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_, p_149845_3_ - 1, p_149845_4_, l, UP ); l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_, p_149845_3_ + 1, p_149845_4_, l, DOWN ); l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_, p_149845_3_, p_149845_4_ - 1, l, SOUTH); l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_, p_149845_3_, p_149845_4_ + 1, l, NORTH); diff --git a/src/main/java/net/minecraft/block/BlockLever.java b/src/main/java/net/minecraft/block/BlockLever.java index 39dc6c9..b610111 100644 --- a/src/main/java/net/minecraft/block/BlockLever.java +++ b/src/main/java/net/minecraft/block/BlockLever.java @@ -46,12 +46,12 @@ public boolean canPlaceBlockOnSide(World p_149707_1_, int p_149707_2_, int p_149707_3_, int p_149707_4_, int p_149707_5_) { ForgeDirection dir = ForgeDirection.getOrientation(p_149707_5_); - return (dir == DOWN && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_ + 1, p_149707_4_, DOWN )) || - (dir == UP && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_ - 1, p_149707_4_, UP )) || + return (dir == DOWN && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_ + 1, p_149707_4_, DOWN )) || + (dir == UP && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_ - 1, p_149707_4_, UP )) || (dir == NORTH && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_, p_149707_4_ + 1, NORTH)) || (dir == SOUTH && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_, p_149707_4_ - 1, SOUTH)) || - (dir == WEST && p_149707_1_.isSideSolid(p_149707_2_ + 1, p_149707_3_, p_149707_4_, WEST )) || - (dir == EAST && p_149707_1_.isSideSolid(p_149707_2_ - 1, p_149707_3_, p_149707_4_, EAST )); + (dir == WEST && p_149707_1_.isSideSolid(p_149707_2_ + 1, p_149707_3_, p_149707_4_, WEST )) || + (dir == EAST && p_149707_1_.isSideSolid(p_149707_2_ - 1, p_149707_3_, p_149707_4_, EAST )); } public boolean canPlaceBlockAt(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_) diff --git a/src/main/java/net/minecraft/block/BlockPumpkin.java b/src/main/java/net/minecraft/block/BlockPumpkin.java index 2e13cfc..66a9073 100644 --- a/src/main/java/net/minecraft/block/BlockPumpkin.java +++ b/src/main/java/net/minecraft/block/BlockPumpkin.java @@ -113,7 +113,7 @@ public boolean canPlaceBlockAt(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_) { - return p_149742_1_.getBlock(p_149742_2_, p_149742_3_, p_149742_4_).isReplaceable(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && World.doesBlockHaveSolidTopSurface(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_); + return p_149742_1_.getBlock(p_149742_2_, p_149742_3_, p_149742_4_).isReplaceable(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && World.doesBlockHaveSolidTopSurface(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_); } public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) diff --git a/src/main/java/net/minecraft/block/BlockRailBase.java b/src/main/java/net/minecraft/block/BlockRailBase.java index 60812f3..801d933 100644 --- a/src/main/java/net/minecraft/block/BlockRailBase.java +++ b/src/main/java/net/minecraft/block/BlockRailBase.java @@ -283,7 +283,7 @@ */ public void onMinecartPass(World world, EntityMinecart cart, int y, int x, int z) { - } + } /** * Forge: Moved render type to a field and a setter. diff --git a/src/main/java/net/minecraft/block/BlockRedstoneComparator.java b/src/main/java/net/minecraft/block/BlockRedstoneComparator.java index 71fb187..a8ba519 100644 --- a/src/main/java/net/minecraft/block/BlockRedstoneComparator.java +++ b/src/main/java/net/minecraft/block/BlockRedstoneComparator.java @@ -235,7 +235,7 @@ if (y == tileY && world instanceof World) { onNeighborBlockChange((World)world, x, y, z, world.getBlock(tileX, tileY, tileZ)); - } + } } @Override diff --git a/src/main/java/net/minecraft/block/BlockTorch.java b/src/main/java/net/minecraft/block/BlockTorch.java index d1d76d1..2616719 100644 --- a/src/main/java/net/minecraft/block/BlockTorch.java +++ b/src/main/java/net/minecraft/block/BlockTorch.java @@ -58,8 +58,8 @@ public boolean canPlaceBlockAt(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_) { - return p_149742_1_.isSideSolid(p_149742_2_ - 1, p_149742_3_, p_149742_4_, EAST, true) || - p_149742_1_.isSideSolid(p_149742_2_ + 1, p_149742_3_, p_149742_4_, WEST, true) || + return p_149742_1_.isSideSolid(p_149742_2_ - 1, p_149742_3_, p_149742_4_, EAST, true) || + p_149742_1_.isSideSolid(p_149742_2_ + 1, p_149742_3_, p_149742_4_, WEST, true) || p_149742_1_.isSideSolid(p_149742_2_, p_149742_3_, p_149742_4_ - 1, SOUTH, true) || p_149742_1_.isSideSolid(p_149742_2_, p_149742_3_, p_149742_4_ + 1, NORTH, true) || func_150107_m(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_); diff --git a/src/main/java/net/minecraft/block/BlockTripWireHook.java b/src/main/java/net/minecraft/block/BlockTripWireHook.java index e3e3285..09b3460 100644 --- a/src/main/java/net/minecraft/block/BlockTripWireHook.java +++ b/src/main/java/net/minecraft/block/BlockTripWireHook.java @@ -53,8 +53,8 @@ ForgeDirection dir = ForgeDirection.getOrientation(p_149707_5_); return (dir == NORTH && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_, p_149707_4_ + 1, NORTH)) || (dir == SOUTH && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_, p_149707_4_ - 1, SOUTH)) || - (dir == WEST && p_149707_1_.isSideSolid(p_149707_2_ + 1, p_149707_3_, p_149707_4_, WEST )) || - (dir == EAST && p_149707_1_.isSideSolid(p_149707_2_ - 1, p_149707_3_, p_149707_4_, EAST )); + (dir == WEST && p_149707_1_.isSideSolid(p_149707_2_ + 1, p_149707_3_, p_149707_4_, WEST )) || + (dir == EAST && p_149707_1_.isSideSolid(p_149707_2_ - 1, p_149707_3_, p_149707_4_, EAST )); } public boolean canPlaceBlockAt(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_) diff --git a/src/main/java/net/minecraft/client/gui/GuiScreen.java b/src/main/java/net/minecraft/client/gui/GuiScreen.java index 8c25b36..8e095a7 100644 --- a/src/main/java/net/minecraft/client/gui/GuiScreen.java +++ b/src/main/java/net/minecraft/client/gui/GuiScreen.java @@ -123,7 +123,7 @@ protected void func_146283_a(List p_146283_1_, int p_146283_2_, int p_146283_3_) { - drawHoveringText(p_146283_1_, p_146283_2_, p_146283_3_, fontRendererObj); + drawHoveringText(p_146283_1_, p_146283_2_, p_146283_3_, fontRendererObj); } protected void drawHoveringText(List p_146283_1_, int p_146283_2_, int p_146283_3_, FontRenderer font) diff --git a/src/main/java/net/minecraft/client/gui/GuiWinGame.java b/src/main/java/net/minecraft/client/gui/GuiWinGame.java index da4d9e2..d5d9b0b 100644 --- a/src/main/java/net/minecraft/client/gui/GuiWinGame.java +++ b/src/main/java/net/minecraft/client/gui/GuiWinGame.java @@ -99,7 +99,7 @@ while ((s = bufferedreader.readLine()) != null) { s = s.replaceAll("PLAYERNAME", this.mc.getSession().getUsername()); - s = s.replaceAll("\t", " "); + s = s.replaceAll("\t", " "); this.field_146582_i.addAll(this.mc.fontRenderer.listFormattedStringToWidth(s, short1)); this.field_146582_i.add(""); } diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java b/src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java index 3c0355c..3cc4ec6 100644 --- a/src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java +++ b/src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java @@ -265,7 +265,7 @@ int tabCount = CreativeTabs.creativeTabArray.length; if (tabCount > 12) { - buttonList.add(new GuiButton(101, guiLeft, guiTop - 50, 20, 20, "<")); + buttonList.add(new GuiButton(101, guiLeft, guiTop - 50, 20, 20, "<")); buttonList.add(new GuiButton(102, guiLeft + xSize - 20, guiTop - 50, 20, 20, ">")); maxPages = ((tabCount - 12) / 10) + 1; } diff --git a/src/main/java/net/minecraft/client/renderer/texture/TextureMap.java b/src/main/java/net/minecraft/client/renderer/texture/TextureMap.java index e391cba..102c830 100644 --- a/src/main/java/net/minecraft/client/renderer/texture/TextureMap.java +++ b/src/main/java/net/minecraft/client/renderer/texture/TextureMap.java @@ -420,7 +420,7 @@ } //=================================================================================================== - // Forge Start + // Forge Start //=================================================================================================== /** * Grabs the registered entry for the specified name, returning null if there was not a entry. diff --git a/src/main/java/net/minecraft/entity/Entity.java b/src/main/java/net/minecraft/entity/Entity.java index a9a47f6..e5268ab 100644 --- a/src/main/java/net/minecraft/entity/Entity.java +++ b/src/main/java/net/minecraft/entity/Entity.java @@ -2243,18 +2243,18 @@ * Register the instance of IExtendedProperties into the entity's collection. * @param identifier The identifier which you can use to retrieve these properties for the entity. * @param properties The instanceof IExtendedProperties to register - * @return The identifier that was used to register the extended properties. Empty String indicates an error. If your requested key already existed, this will return a modified one that is unique. + * @return The identifier that was used to register the extended properties. Empty String indicates an error. If your requested key already existed, this will return a modified one that is unique. */ public String registerExtendedProperties(String identifier, IExtendedEntityProperties properties) { if (identifier == null) { - FMLLog.warning("Someone is attempting to register extended properties using a null identifier. This is not allowed. Aborting. This may have caused instability."); + FMLLog.warning("Someone is attempting to register extended properties using a null identifier. This is not allowed. Aborting. This may have caused instability."); return ""; } if (properties == null) { - FMLLog.warning("Someone is attempting to register null extended properties. This is not allowed. Aborting. This may have caused instability."); + FMLLog.warning("Someone is attempting to register null extended properties. This is not allowed. Aborting. This may have caused instability."); return ""; } @@ -2267,7 +2267,7 @@ if (baseIdentifier != identifier) { - FMLLog.info("An attempt was made to register exended properties using an existing key. The duplicate identifier (%s) has been remapped to %s.", baseIdentifier, identifier); + FMLLog.info("An attempt was made to register exended properties using an existing key. The duplicate identifier (%s) has been remapped to %s.", baseIdentifier, identifier); } this.extendedProperties.put(identifier, properties); diff --git a/src/main/java/net/minecraft/entity/item/EntityItem.java b/src/main/java/net/minecraft/entity/item/EntityItem.java index 2fd1d04..284be21 100644 --- a/src/main/java/net/minecraft/entity/item/EntityItem.java +++ b/src/main/java/net/minecraft/entity/item/EntityItem.java @@ -34,7 +34,7 @@ private static final String __OBFID = "CL_00001669"; /** - * The maximum age of this EntityItem. The item is expired once this is reached. + * The maximum age of this EntityItem. The item is expired once this is reached. */ public int lifespan = 6000; @@ -54,7 +54,7 @@ public EntityItem(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack) { - this(par1World, par2, par4, par6); + this(par1World, par2, par4, par6); this.setEntityItemStack(par8ItemStack); this.lifespan = (par8ItemStack.getItem() == null ? 6000 : par8ItemStack.getItem().getEntityLifespan(par8ItemStack, par1World)); } @@ -149,7 +149,7 @@ if (!this.worldObj.isRemote && this.age >= lifespan) { if (item != null) - { + { ItemExpireEvent event = new ItemExpireEvent(this, (item.getItem() == null ? 6000 : item.getItem().getEntityLifespan(item, worldObj))); if (MinecraftForge.EVENT_BUS.post(event)) { diff --git a/src/main/java/net/minecraft/entity/item/EntityMinecart.java b/src/main/java/net/minecraft/entity/item/EntityMinecart.java index 5e79d72..680569f 100644 --- a/src/main/java/net/minecraft/entity/item/EntityMinecart.java +++ b/src/main/java/net/minecraft/entity/item/EntityMinecart.java @@ -866,7 +866,7 @@ { if (par1Entity != this.riddenByEntity) { - if (par1Entity instanceof EntityLivingBase && !(par1Entity instanceof EntityPlayer) && !(par1Entity instanceof EntityIronGolem) && canBeRidden() && this.motionX * this.motionX + this.motionZ * this.motionZ > 0.01D && this.riddenByEntity == null && par1Entity.ridingEntity == null) + if (par1Entity instanceof EntityLivingBase && !(par1Entity instanceof EntityPlayer) && !(par1Entity instanceof EntityIronGolem) && canBeRidden() && this.motionX * this.motionX + this.motionZ * this.motionZ > 0.01D && this.riddenByEntity == null && par1Entity.ridingEntity == null) { par1Entity.mountEntity(this); } diff --git a/src/main/java/net/minecraft/inventory/ContainerEnchantment.java b/src/main/java/net/minecraft/inventory/ContainerEnchantment.java index c1061c3..b5c4f86 100644 --- a/src/main/java/net/minecraft/inventory/ContainerEnchantment.java +++ b/src/main/java/net/minecraft/inventory/ContainerEnchantment.java @@ -125,15 +125,15 @@ { if ((j != 0 || k != 0) && this.worldPointer.isAirBlock(this.posX + k, this.posY, this.posZ + j) && this.worldPointer.isAirBlock(this.posX + k, this.posY + 1, this.posZ + j)) { - power += ForgeHooks.getEnchantPower(worldPointer, posX + k * 2, posY, posZ + j * 2); + power += ForgeHooks.getEnchantPower(worldPointer, posX + k * 2, posY, posZ + j * 2); power += ForgeHooks.getEnchantPower(worldPointer, posX + k * 2, posY + 1, posZ + j * 2); if (k != 0 && j != 0) { - power += ForgeHooks.getEnchantPower(worldPointer, posX + k * 2, posY, posZ + j ); - power += ForgeHooks.getEnchantPower(worldPointer, posX + k * 2, posY + 1, posZ + j ); - power += ForgeHooks.getEnchantPower(worldPointer, posX + k, posY, posZ + j * 2); - power += ForgeHooks.getEnchantPower(worldPointer, posX + k, posY + 1, posZ + j * 2); + power += ForgeHooks.getEnchantPower(worldPointer, posX + k * 2, posY, posZ + j ); + power += ForgeHooks.getEnchantPower(worldPointer, posX + k * 2, posY + 1, posZ + j ); + power += ForgeHooks.getEnchantPower(worldPointer, posX + k, posY, posZ + j * 2); + power += ForgeHooks.getEnchantPower(worldPointer, posX + k, posY + 1, posZ + j * 2); } } } diff --git a/src/main/java/net/minecraft/item/Item.java b/src/main/java/net/minecraft/item/Item.java index 3b51fca..f7b0399 100644 --- a/src/main/java/net/minecraft/item/Item.java +++ b/src/main/java/net/minecraft/item/Item.java @@ -816,7 +816,7 @@ } /** - * Called before a block is broken. Return true to prevent default block harvesting. + * Called before a block is broken. Return true to prevent default block harvesting. * * Note: In SMP, this is called on both client and server sides! * @@ -1119,11 +1119,11 @@ /** * Override this method to have an item handle its own armor rendering. * - * @param entityLiving The entity wearing the armor + * @param entityLiving The entity wearing the armor * @param itemStack The itemStack to render the model of * @param armorSlot 0=head, 1=torso, 2=legs, 3=feet * - * @return A ModelBiped to render instead of the default + * @return A ModelBiped to render instead of the default */ @SideOnly(Side.CLIENT) public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) @@ -1133,7 +1133,7 @@ /** * Called when a entity tries to play the 'swing' animation. - * + * * @param entityLiving The entity swinging the item. * @param stack The Item stack * @return True to cancel any further processing by EntityLiving @@ -1146,7 +1146,7 @@ /** * Called when the client starts rendering the HUD, for whatever item the player currently has as a helmet. * This is where pumpkins would render there overlay. - * + * * @param stack The ItemStack that is equipped * @param player Reference to the current client entity * @param resolution Resolution information about the current viewport and configured GUI Scale @@ -1274,11 +1274,11 @@ * * @param toolClass Class * @param level Harvest level: - * Wood: 0 - * Stone: 1 - * Iron: 2 - * Diamond: 3 - * Gold: 0 + * Wood: 0 + * Stone: 1 + * Iron: 2 + * Diamond: 3 + * Gold: 0 */ public void setHarvestLevel(String toolClass, int level) { @@ -1306,7 +1306,7 @@ Integer ret = toolClasses.get(toolClass); return ret == null ? -1 : ret; } - /* ======================================== FORGE END =====================================*/ + /* ======================================== FORGE END =====================================*/ public static enum ToolMaterial { @@ -1364,12 +1364,12 @@ { switch (this) { - case WOOD: return Item.getItemFromBlock(Blocks.planks); - case STONE: return Item.getItemFromBlock(Blocks.cobblestone); - case GOLD: return Items.gold_ingot; - case IRON: return Items.iron_ingot; + case WOOD: return Item.getItemFromBlock(Blocks.planks); + case STONE: return Item.getItemFromBlock(Blocks.cobblestone); + case GOLD: return Items.gold_ingot; + case IRON: return Items.iron_ingot; case EMERALD: return Items.diamond; - default: return customCraftingMaterial; + default: return customCraftingMaterial; } } } diff --git a/src/main/java/net/minecraft/item/ItemArmor.java b/src/main/java/net/minecraft/item/ItemArmor.java index fea1f33..93657d3 100644 --- a/src/main/java/net/minecraft/item/ItemArmor.java +++ b/src/main/java/net/minecraft/item/ItemArmor.java @@ -288,12 +288,12 @@ { switch (this) { - case CLOTH: return Items.leather; - case CHAIN: return Items.iron_ingot; - case GOLD: return Items.gold_ingot; - case IRON: return Items.iron_ingot; + case CLOTH: return Items.leather; + case CHAIN: return Items.iron_ingot; + case GOLD: return Items.gold_ingot; + case IRON: return Items.iron_ingot; case DIAMOND: return Items.diamond; - default: return customCraftingMaterial; + default: return customCraftingMaterial; } } } diff --git a/src/main/java/net/minecraft/item/ItemFirework.java b/src/main/java/net/minecraft/item/ItemFirework.java index 20c1ed7..0f174da 100644 --- a/src/main/java/net/minecraft/item/ItemFirework.java +++ b/src/main/java/net/minecraft/item/ItemFirework.java @@ -63,7 +63,7 @@ { for (int j = 1; j < arraylist.size(); ++j) { - arraylist.set(j, " " + (String)arraylist.get(j)); + arraylist.set(j, " " + (String)arraylist.get(j)); } par3List.addAll(arraylist); diff --git a/src/main/java/net/minecraft/item/crafting/CraftingManager.java b/src/main/java/net/minecraft/item/crafting/CraftingManager.java index 075a878..3d8fcc7 100644 --- a/src/main/java/net/minecraft/item/crafting/CraftingManager.java +++ b/src/main/java/net/minecraft/item/crafting/CraftingManager.java @@ -47,7 +47,7 @@ this.addRecipe(new ItemStack(Blocks.nether_brick_fence, 6), new Object[] {"###", "###", '#', Blocks.nether_brick}); this.addRecipe(new ItemStack(Blocks.fence_gate, 1), new Object[] {"#W#", "#W#", '#', Items.stick, 'W', Blocks.planks}); this.addRecipe(new ItemStack(Blocks.jukebox, 1), new Object[] {"###", "#X#", "###", '#', Blocks.planks, 'X', Items.diamond}); - this.addRecipe(new ItemStack(Items.lead, 2), new Object[] {"~~ ", "~O ", " ~", '~', Items.string, 'O', Items.slime_ball}); + this.addRecipe(new ItemStack(Items.lead, 2), new Object[] {"~~ ", "~O ", " ~", '~', Items.string, 'O', Items.slime_ball}); this.addRecipe(new ItemStack(Blocks.noteblock, 1), new Object[] {"###", "#X#", "###", '#', Blocks.planks, 'X', Items.redstone}); this.addRecipe(new ItemStack(Blocks.bookshelf, 1), new Object[] {"###", "XXX", "###", '#', Blocks.planks, 'X', Items.book}); this.addRecipe(new ItemStack(Blocks.snow, 1), new Object[] {"##", "##", '#', Items.snowball}); @@ -107,19 +107,19 @@ this.addShapelessRecipe(new ItemStack(Items.flint_and_steel, 1), new Object[] {new ItemStack(Items.iron_ingot, 1), new ItemStack(Items.flint, 1)}); this.addRecipe(new ItemStack(Items.bread, 1), new Object[] {"###", '#', Items.wheat}); this.addRecipe(new ItemStack(Blocks.oak_stairs, 4), new Object[] {"# ", "## ", "###", '#', new ItemStack(Blocks.planks, 1, 0)}); - this.addRecipe(new ItemStack(Blocks.birch_stairs, 4), new Object[] {"# ", "## ", "###", '#', new ItemStack(Blocks.planks, 1, 2)}); - this.addRecipe(new ItemStack(Blocks.spruce_stairs, 4), new Object[] {"# ", "## ", "###", '#', new ItemStack(Blocks.planks, 1, 1)}); - this.addRecipe(new ItemStack(Blocks.jungle_stairs, 4), new Object[] {"# ", "## ", "###", '#', new ItemStack(Blocks.planks, 1, 3)}); - this.addRecipe(new ItemStack(Blocks.acacia_stairs, 4), new Object[] {"# ", "## ", "###", '#', new ItemStack(Blocks.planks, 1, 4)}); + this.addRecipe(new ItemStack(Blocks.birch_stairs, 4), new Object[] {"# ", "## ", "###", '#', new ItemStack(Blocks.planks, 1, 2)}); + this.addRecipe(new ItemStack(Blocks.spruce_stairs, 4), new Object[] {"# ", "## ", "###", '#', new ItemStack(Blocks.planks, 1, 1)}); + this.addRecipe(new ItemStack(Blocks.jungle_stairs, 4), new Object[] {"# ", "## ", "###", '#', new ItemStack(Blocks.planks, 1, 3)}); + this.addRecipe(new ItemStack(Blocks.acacia_stairs, 4), new Object[] {"# ", "## ", "###", '#', new ItemStack(Blocks.planks, 1, 4)}); this.addRecipe(new ItemStack(Blocks.dark_oak_stairs, 4), new Object[] {"# ", "## ", "###", '#', new ItemStack(Blocks.planks, 1, 5)}); - this.addRecipe(new ItemStack(Items.fishing_rod, 1), new Object[] {" #", " #X", "# X", '#', Items.stick, 'X', Items.string}); + this.addRecipe(new ItemStack(Items.fishing_rod, 1), new Object[] {" #", " #X", "# X", '#', Items.stick, 'X', Items.string}); this.addRecipe(new ItemStack(Items.carrot_on_a_stick, 1), new Object[] {"# ", " X", '#', Items.fishing_rod, 'X', Items.carrot}).func_92100_c(); - this.addRecipe(new ItemStack(Blocks.stone_stairs, 4), new Object[] {"# ", "## ", "###", '#', Blocks.cobblestone}); - this.addRecipe(new ItemStack(Blocks.brick_stairs, 4), new Object[] {"# ", "## ", "###", '#', Blocks.brick_block}); + this.addRecipe(new ItemStack(Blocks.stone_stairs, 4), new Object[] {"# ", "## ", "###", '#', Blocks.cobblestone}); + this.addRecipe(new ItemStack(Blocks.brick_stairs, 4), new Object[] {"# ", "## ", "###", '#', Blocks.brick_block}); this.addRecipe(new ItemStack(Blocks.stone_brick_stairs, 4), new Object[] {"# ", "## ", "###", '#', Blocks.stonebrick}); this.addRecipe(new ItemStack(Blocks.nether_brick_stairs, 4), new Object[] {"# ", "## ", "###", '#', Blocks.nether_brick}); - this.addRecipe(new ItemStack(Blocks.sandstone_stairs, 4), new Object[] {"# ", "## ", "###", '#', Blocks.sandstone}); - this.addRecipe(new ItemStack(Blocks.quartz_stairs, 4), new Object[] {"# ", "## ", "###", '#', Blocks.quartz_block}); + this.addRecipe(new ItemStack(Blocks.sandstone_stairs, 4), new Object[] {"# ", "## ", "###", '#', Blocks.sandstone}); + this.addRecipe(new ItemStack(Blocks.quartz_stairs, 4), new Object[] {"# ", "## ", "###", '#', Blocks.quartz_block}); this.addRecipe(new ItemStack(Items.painting, 1), new Object[] {"###", "#X#", "###", '#', Items.stick, 'X', Blocks.wool}); this.addRecipe(new ItemStack(Items.item_frame, 1), new Object[] {"###", "#X#", "###", '#', Items.stick, 'X', Items.leather}); this.addRecipe(new ItemStack(Items.golden_apple, 1, 0), new Object[] {"###", "#X#", "###", '#', Items.gold_ingot, 'X', Items.apple}); diff --git a/src/main/java/net/minecraft/network/NetworkManager.java b/src/main/java/net/minecraft/network/NetworkManager.java index d79c55f..19f22a5 100644 --- a/src/main/java/net/minecraft/network/NetworkManager.java +++ b/src/main/java/net/minecraft/network/NetworkManager.java @@ -151,7 +151,7 @@ private static final String __OBFID = "CL_00001241"; public void run() { - if (enumconnectionstate != enumconnectionstate1 && !( p_150732_1_ instanceof FMLProxyPacket)) + if (enumconnectionstate != enumconnectionstate1 && !( p_150732_1_ instanceof FMLProxyPacket)) { NetworkManager.this.setConnectionState(enumconnectionstate); } diff --git a/src/main/java/net/minecraft/network/PingResponseHandler.java b/src/main/java/net/minecraft/network/PingResponseHandler.java index de5220a..ff1ab04 100644 --- a/src/main/java/net/minecraft/network/PingResponseHandler.java +++ b/src/main/java/net/minecraft/network/PingResponseHandler.java @@ -30,13 +30,8 @@ try { - try + if (bytebuf.readUnsignedByte() == 254) { - if (bytebuf.readUnsignedByte() != 254) - { - return; - } - InetSocketAddress inetsocketaddress = (InetSocketAddress)p_channelRead_1_.channel().remoteAddress(); MinecraftServer minecraftserver = this.field_151257_b.func_151267_d(); int i = bytebuf.readableBytes(); @@ -81,11 +76,12 @@ bytebuf.release(); flag = false; + return; } - catch (RuntimeException runtimeexception) - { - ; - } + } + catch (RuntimeException runtimeexception) + { + return; } finally { diff --git a/src/main/java/net/minecraft/src/FMLRenderAccessLibrary.java b/src/main/java/net/minecraft/src/FMLRenderAccessLibrary.java index 6e6c96c..529b7c5 100644 --- a/src/main/java/net/minecraft/src/FMLRenderAccessLibrary.java +++ b/src/main/java/net/minecraft/src/FMLRenderAccessLibrary.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * * Contributors: - * cpw - implementation + * cpw - implementation */ package net.minecraft.src; @@ -65,8 +65,8 @@ return RenderingRegistry.instance().renderItemAsFull3DBlock(modelId); } -// public static void doTextureCopy(Texture atlas, Texture source, int targetX, int targetY) -// { -// TextureFXManager.instance().getHelper().doTextureCopy(atlas, source, targetX, targetY); -// } +// public static void doTextureCopy(Texture atlas, Texture source, int targetX, int targetY) +// { +// TextureFXManager.instance().getHelper().doTextureCopy(atlas, source, targetX, targetY); +// } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/world/World.java b/src/main/java/net/minecraft/world/World.java index 13400e8..37c9acd 100644 --- a/src/main/java/net/minecraft/world/World.java +++ b/src/main/java/net/minecraft/world/World.java @@ -3357,7 +3357,7 @@ public int getIndirectPowerLevelTo(int par1, int par2, int par3, int par4) { - Block block = this.getBlock(par1, par2, par3); + Block block = this.getBlock(par1, par2, par3); return block.shouldCheckWeakPower(this, par1, par2, par3, par4) ? this.getBlockPowerInput(par1, par2, par3) : block.isProvidingWeakPower(this, par1, par2, par3, par4); } @@ -3866,7 +3866,7 @@ /** * Determine if the given block is considered solid on the - * specified side. Used by placement logic. + * specified side. Used by placement logic. * * @param x Block X Position * @param y Block Y Position @@ -3881,7 +3881,7 @@ /** * Determine if the given block is considered solid on the - * specified side. Used by placement logic. + * specified side. Used by placement logic. * * @param x Block X Position * @param y Block Y Position diff --git a/src/main/java/net/minecraft/world/WorldType.java b/src/main/java/net/minecraft/world/WorldType.java index f4794d5..7af3256 100644 --- a/src/main/java/net/minecraft/world/WorldType.java +++ b/src/main/java/net/minecraft/world/WorldType.java @@ -169,7 +169,7 @@ return this == FLAT ? 1.0D : 0.03125D; } -/* public BiomeGenBase[] getBiomesForWorldType() { +/* public BiomeGenBase[] getBiomesForWorldType() { return biomesForWorldType; } diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenBase.java b/src/main/java/net/minecraft/world/biome/BiomeGenBase.java index f5a7d57..a264ca5 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeGenBase.java +++ b/src/main/java/net/minecraft/world/biome/BiomeGenBase.java @@ -550,14 +550,14 @@ public void addDefaultFlowers() { this.flowers.add(new FlowerEntry(Blocks.yellow_flower, 0, 20)); - this.flowers.add(new FlowerEntry(Blocks.red_flower, 0, 10)); + this.flowers.add(new FlowerEntry(Blocks.red_flower, 0, 10)); } /** Register a new plant to be planted when bonemeal is used on grass. * @param block The block to place. * @param metadata The metadata to set for the block when being placed. * @param weight The weight of the plant, where red flowers are - * 10 and yellow flowers are 20. + * 10 and yellow flowers are 20. */ public void addFlower(Block block, int metadata, int weight) { diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenPlains.java b/src/main/java/net/minecraft/world/biome/BiomeGenPlains.java index 81769f2..915db30 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeGenPlains.java +++ b/src/main/java/net/minecraft/world/biome/BiomeGenPlains.java @@ -21,13 +21,13 @@ this.theBiomeDecorator.flowersPerChunk = 4; this.theBiomeDecorator.grassPerChunk = 10; this.flowers.clear(); - this.addFlower(Blocks.red_flower, 4, 3); - this.addFlower(Blocks.red_flower, 5, 3); - this.addFlower(Blocks.red_flower, 6, 3); - this.addFlower(Blocks.red_flower, 7, 3); - this.addFlower(Blocks.red_flower, 0, 20); - this.addFlower(Blocks.red_flower, 3, 20); - this.addFlower(Blocks.red_flower, 8, 20); + this.addFlower(Blocks.red_flower, 4, 3); + this.addFlower(Blocks.red_flower, 5, 3); + this.addFlower(Blocks.red_flower, 6, 3); + this.addFlower(Blocks.red_flower, 7, 3); + this.addFlower(Blocks.red_flower, 0, 20); + this.addFlower(Blocks.red_flower, 3, 20); + this.addFlower(Blocks.red_flower, 8, 20); this.addFlower(Blocks.yellow_flower, 0, 30); } diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java b/src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java index 56b67e4..a0da5c0 100644 --- a/src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java +++ b/src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java @@ -65,7 +65,7 @@ mineshaftGenerator = (MapGenMineshaft) TerrainGen.getModdedMapGen(mineshaftGenerator, MINESHAFT); scatteredFeatureGenerator = (MapGenScatteredFeature) TerrainGen.getModdedMapGen(scatteredFeatureGenerator, SCATTERED_FEATURE); ravineGenerator = TerrainGen.getModdedMapGen(ravineGenerator, RAVINE); - } + } public ChunkProviderGenerate(World par1World, long par2, boolean par4) { diff --git a/src/main/java/net/minecraft/world/gen/MapGenCaves.java b/src/main/java/net/minecraft/world/gen/MapGenCaves.java index c8a7bd1..e85ba04 100644 --- a/src/main/java/net/minecraft/world/gen/MapGenCaves.java +++ b/src/main/java/net/minecraft/world/gen/MapGenCaves.java @@ -277,9 +277,9 @@ protected void digBlock(Block[] data, int index, int x, int y, int z, int chunkX, int chunkZ, boolean foundTop) { BiomeGenBase biome = worldObj.getBiomeGenForCoords(x + chunkX * 16, z + chunkZ * 16); - Block top = (isExceptionBiome(biome) ? Blocks.grass : biome.topBlock); + Block top = (isExceptionBiome(biome) ? Blocks.grass : biome.topBlock); Block filler = (isExceptionBiome(biome) ? Blocks.dirt : biome.fillerBlock); - Block block = data[index]; + Block block = data[index]; if (block == Blocks.stone || block == filler || block == top) { diff --git a/src/main/java/net/minecraft/world/gen/MapGenRavine.java b/src/main/java/net/minecraft/world/gen/MapGenRavine.java index c95956d..87bc817 100644 --- a/src/main/java/net/minecraft/world/gen/MapGenRavine.java +++ b/src/main/java/net/minecraft/world/gen/MapGenRavine.java @@ -251,9 +251,9 @@ protected void digBlock(Block[] data, int index, int x, int y, int z, int chunkX, int chunkZ, boolean foundTop) { BiomeGenBase biome = worldObj.getBiomeGenForCoords(x + chunkX * 16, z + chunkZ * 16); - Block top = (isExceptionBiome(biome) ? Blocks.grass : biome.topBlock); + Block top = (isExceptionBiome(biome) ? Blocks.grass : biome.topBlock); Block filler = (isExceptionBiome(biome) ? Blocks.dirt : biome.fillerBlock); - Block block = data[index]; + Block block = data[index]; if (block == Blocks.stone || block == filler || block == top) { diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java index 801a94c..f146c1b 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java @@ -74,10 +74,10 @@ boolean isSoil = block2.canSustainPlant(par1World, par3, par4 - 1, par5, ForgeDirection.UP, (BlockSapling)Blocks.sapling); if (isSoil && par4 < 256 - l - 1) { - onPlantGrow(par1World, par3, par4 - 1, par5, par3, par4, par5); - onPlantGrow(par1World, par3 + 1, par4 - 1, par5, par3, par4, par5); + onPlantGrow(par1World, par3, par4 - 1, par5, par3, par4, par5); + onPlantGrow(par1World, par3 + 1, par4 - 1, par5, par3, par4, par5); onPlantGrow(par1World, par3 + 1, par4 - 1, par5 + 1, par3, par4, par5); - onPlantGrow(par1World, par3, par4 - 1, par5 + 1, par3, par4, par5); + onPlantGrow(par1World, par3, par4 - 1, par5 + 1, par3, par4, par5); int j3 = par2Random.nextInt(4); j1 = l - par2Random.nextInt(4); k1 = 2 - par2Random.nextInt(3); diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java index 25ee8f9..9ddcd47 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java @@ -93,9 +93,9 @@ boolean isSoil = block.canSustainPlant(p_150532_1_, p_150532_3_, p_150532_4_ - 1, p_150532_5_, ForgeDirection.UP, (BlockSapling)Blocks.sapling); if (isSoil && p_150532_4_ >= 2) { - onPlantGrow(p_150532_1_, p_150532_3_, p_150532_4_ - 1, p_150532_5_, p_150532_3_, p_150532_4_, p_150532_5_); - onPlantGrow(p_150532_1_, p_150532_3_ + 1, p_150532_4_ - 1, p_150532_5_, p_150532_3_, p_150532_4_, p_150532_5_); - onPlantGrow(p_150532_1_, p_150532_3_, p_150532_4_ - 1, p_150532_5_ + 1, p_150532_3_, p_150532_4_, p_150532_5_); + onPlantGrow(p_150532_1_, p_150532_3_, p_150532_4_ - 1, p_150532_5_, p_150532_3_, p_150532_4_, p_150532_5_); + onPlantGrow(p_150532_1_, p_150532_3_ + 1, p_150532_4_ - 1, p_150532_5_, p_150532_3_, p_150532_4_, p_150532_5_); + onPlantGrow(p_150532_1_, p_150532_3_, p_150532_4_ - 1, p_150532_5_ + 1, p_150532_3_, p_150532_4_, p_150532_5_); onPlantGrow(p_150532_1_, p_150532_3_ + 1, p_150532_4_ - 1, p_150532_5_ + 1, p_150532_3_, p_150532_4_, p_150532_5_); return true; } diff --git a/src/main/java/net/minecraftforge/client/ClientCommandHandler.java b/src/main/java/net/minecraftforge/client/ClientCommandHandler.java index 46b5478..b45a45b 100644 --- a/src/main/java/net/minecraftforge/client/ClientCommandHandler.java +++ b/src/main/java/net/minecraftforge/client/ClientCommandHandler.java @@ -32,7 +32,7 @@ /** * @return 1 if successfully executed, 0 if wrong usage, it doesn't exist or - * it was canceled. + * it was canceled. */ @Override public int executeCommand(ICommandSender sender, String message) diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index da53fa0..fc13f8d 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -431,9 +431,9 @@ String line = null; switch(status) { - //case FAILED: line = " Version check failed"; break; - //case UP_TO_DATE: line = "Forge up to date"}; break; - //case AHEAD: line = "Using non-recommended Forge build, issues may arise."}; break; + //case FAILED: line = " Version check failed"; break; + //case UP_TO_DATE: line = "Forge up to date"}; break; + //case AHEAD: line = "Using non-recommended Forge build, issues may arise."}; break; case OUTDATED: case BETA_OUTDATED: line = "New Forge version available: " + ForgeVersion.getTarget(); break; default: break; diff --git a/src/main/java/net/minecraftforge/client/GuiIngameForge.java b/src/main/java/net/minecraftforge/client/GuiIngameForge.java index 0f6b29b..d82c02e 100644 --- a/src/main/java/net/minecraftforge/client/GuiIngameForge.java +++ b/src/main/java/net/minecraftforge/client/GuiIngameForge.java @@ -49,8 +49,8 @@ public class GuiIngameForge extends GuiIngame { - //private static final ResourceLocation VIGNETTE = new ResourceLocation("textures/misc/vignette.png"); - private static final ResourceLocation WIDGITS = new ResourceLocation("textures/gui/widgets.png"); + //private static final ResourceLocation VIGNETTE = new ResourceLocation("textures/misc/vignette.png"); + private static final ResourceLocation WIDGITS = new ResourceLocation("textures/gui/widgets.png"); //private static final ResourceLocation PUMPKIN_BLUR = new ResourceLocation("textures/misc/pumpkinblur.png"); private static final int WHITE = 0xFFFFFF; @@ -134,9 +134,9 @@ { if (renderHealth) renderHealth(width, height); if (renderArmor) renderArmor(width, height); - if (renderFood) renderFood(width, height); + if (renderFood) renderFood(width, height); if (renderHealthMount) renderHealthMount(width, height); - if (renderAir) renderAir(width, height); + if (renderAir) renderAir(width, height); } if (renderHotbar) renderHotbar(width, height, partialTicks); } @@ -366,10 +366,10 @@ regen = updateCounter % 25; } - final int TOP = 9 * (mc.theWorld.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0); + final int TOP = 9 * (mc.theWorld.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0); final int BACKGROUND = (highlight ? 25 : 16); int MARGIN = 16; - if (mc.thePlayer.isPotionActive(Potion.poison)) MARGIN += 36; + if (mc.thePlayer.isPotionActive(Potion.poison)) MARGIN += 36; else if (mc.thePlayer.isPotionActive(Potion.wither)) MARGIN += 72; float absorbRemaining = absorb; diff --git a/src/main/java/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java b/src/main/java/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java index a056e99..d1f8461 100644 --- a/src/main/java/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java +++ b/src/main/java/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java @@ -31,7 +31,7 @@ public PlaySoundSourceEvent(SoundManager manager, ISound sound, String uuid) { super(manager, sound, uuid); - this.name = sound.getPositionedSoundLocation().getResourcePath(); + this.name = sound.getPositionedSoundLocation().getResourcePath(); this.manager = manager; this.x = this.y = this.z = 0; } diff --git a/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java b/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java index d25ea21..7b5be5c 100644 --- a/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java +++ b/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java @@ -21,8 +21,8 @@ import cpw.mods.fml.relauncher.SideOnly; /** - * Wavefront Object importer - * Based heavily off of the specifications found at http://en.wikipedia.org/wiki/Wavefront_.obj_file + * Wavefront Object importer + * Based heavily off of the specifications found at http://en.wikipedia.org/wiki/Wavefront_.obj_file */ public class WavefrontObject implements IModelCustom { diff --git a/src/main/java/net/minecraftforge/client/model/techne/TechneModel.java b/src/main/java/net/minecraftforge/client/model/techne/TechneModel.java index ec3a010..aab2b28 100644 --- a/src/main/java/net/minecraftforge/client/model/techne/TechneModel.java +++ b/src/main/java/net/minecraftforge/client/model/techne/TechneModel.java @@ -317,7 +317,7 @@ @Override public void renderPart(String partName) - { + { ModelRenderer part = parts.get(partName); if (part != null) { diff --git a/src/main/java/net/minecraftforge/common/BiomeDictionary.java b/src/main/java/net/minecraftforge/common/BiomeDictionary.java index ade9eb4..d7e052d 100644 --- a/src/main/java/net/minecraftforge/common/BiomeDictionary.java +++ b/src/main/java/net/minecraftforge/common/BiomeDictionary.java @@ -61,7 +61,7 @@ * @return returns true if the biome was registered successfully */ public static boolean registerBiomeType(BiomeGenBase biome, Type ... types) - { + { if(BiomeGenBase.getBiomeGenArray()[biome.biomeID] != null) { for(Type type : types) @@ -180,7 +180,7 @@ * @return returns true if the biome has been registered, false otherwise */ public static boolean isBiomeRegistered(BiomeGenBase biome) - { + { return biomeList[biome.biomeID] != null; } @@ -231,7 +231,7 @@ * @param biome the biome to be considered */ public static void makeBestGuess(BiomeGenBase biome) - { + { if(biome.theBiomeDecorator.treesPerChunk >= 3) { if(biome.isHighHumidity() && biome.temperature >= 1.0F) @@ -277,7 +277,7 @@ } } - //Internal implementation + //Internal implementation private static void checkRegistration(BiomeGenBase biome) { if(!isBiomeRegistered(biome)) @@ -293,28 +293,28 @@ private static void registerVanillaBiomes() { - registerBiomeType(ocean, WATER ); - registerBiomeType(plains, PLAINS ); - registerBiomeType(desert, DESERT ); - registerBiomeType(extremeHills, MOUNTAIN ); - registerBiomeType(forest, FOREST ); - registerBiomeType(taiga, FOREST, FROZEN); - registerBiomeType(taigaHills, FOREST, FROZEN); - registerBiomeType(swampland, SWAMP ); - registerBiomeType(river, WATER ); - registerBiomeType(frozenOcean, WATER, FROZEN); - registerBiomeType(frozenRiver, WATER, FROZEN); - registerBiomeType(icePlains, FROZEN ); - registerBiomeType(iceMountains, FROZEN ); - registerBiomeType(beach, BEACH ); - registerBiomeType(desertHills, DESERT ); - registerBiomeType(jungle, JUNGLE ); - registerBiomeType(jungleHills, JUNGLE ); - registerBiomeType(forestHills, FOREST ); - registerBiomeType(sky, END ); - registerBiomeType(hell, NETHER ); - registerBiomeType(mushroomIsland, MUSHROOM ); - registerBiomeType(extremeHillsEdge, MOUNTAIN ); + registerBiomeType(ocean, WATER ); + registerBiomeType(plains, PLAINS ); + registerBiomeType(desert, DESERT ); + registerBiomeType(extremeHills, MOUNTAIN ); + registerBiomeType(forest, FOREST ); + registerBiomeType(taiga, FOREST, FROZEN); + registerBiomeType(taigaHills, FOREST, FROZEN); + registerBiomeType(swampland, SWAMP ); + registerBiomeType(river, WATER ); + registerBiomeType(frozenOcean, WATER, FROZEN); + registerBiomeType(frozenRiver, WATER, FROZEN); + registerBiomeType(icePlains, FROZEN ); + registerBiomeType(iceMountains, FROZEN ); + registerBiomeType(beach, BEACH ); + registerBiomeType(desertHills, DESERT ); + registerBiomeType(jungle, JUNGLE ); + registerBiomeType(jungleHills, JUNGLE ); + registerBiomeType(forestHills, FOREST ); + registerBiomeType(sky, END ); + registerBiomeType(hell, NETHER ); + registerBiomeType(mushroomIsland, MUSHROOM ); + registerBiomeType(extremeHillsEdge, MOUNTAIN ); registerBiomeType(mushroomIslandShore, MUSHROOM, BEACH); } } diff --git a/src/main/java/net/minecraftforge/common/ChestGenHooks.java b/src/main/java/net/minecraftforge/common/ChestGenHooks.java index d32fe3b..862b1dd 100644 --- a/src/main/java/net/minecraftforge/common/ChestGenHooks.java +++ b/src/main/java/net/minecraftforge/common/ChestGenHooks.java @@ -21,16 +21,16 @@ public class ChestGenHooks { //Currently implemented categories for chests/dispensers, Dungeon loot is still in DungeonHooks - public static final String MINESHAFT_CORRIDOR = "mineshaftCorridor"; - public static final String PYRAMID_DESERT_CHEST = "pyramidDesertyChest"; - public static final String PYRAMID_JUNGLE_CHEST = "pyramidJungleChest"; + public static final String MINESHAFT_CORRIDOR = "mineshaftCorridor"; + public static final String PYRAMID_DESERT_CHEST = "pyramidDesertyChest"; + public static final String PYRAMID_JUNGLE_CHEST = "pyramidJungleChest"; public static final String PYRAMID_JUNGLE_DISPENSER = "pyramidJungleDispenser"; - public static final String STRONGHOLD_CORRIDOR = "strongholdCorridor"; - public static final String STRONGHOLD_LIBRARY = "strongholdLibrary"; - public static final String STRONGHOLD_CROSSING = "strongholdCrossing"; - public static final String VILLAGE_BLACKSMITH = "villageBlacksmith"; - public static final String BONUS_CHEST = "bonusChest"; - public static final String DUNGEON_CHEST = "dungeonChest"; + public static final String STRONGHOLD_CORRIDOR = "strongholdCorridor"; + public static final String STRONGHOLD_LIBRARY = "strongholdLibrary"; + public static final String STRONGHOLD_CROSSING = "strongholdCrossing"; + public static final String VILLAGE_BLACKSMITH = "villageBlacksmith"; + public static final String BONUS_CHEST = "bonusChest"; + public static final String DUNGEON_CHEST = "dungeonChest"; private static final HashMap chestInfo = new HashMap(); private static boolean hasInit = false; @@ -48,26 +48,26 @@ hasInit = true; - addInfo(MINESHAFT_CORRIDOR, StructureMineshaftPieces.mineshaftChestContents, 3, 7); - addInfo(PYRAMID_DESERT_CHEST, DesertPyramid.itemsToGenerateInTemple, 2, 7); - addInfo(PYRAMID_JUNGLE_CHEST, JunglePyramid.junglePyramidsChestContents, 2, 7); - addInfo(PYRAMID_JUNGLE_DISPENSER, JunglePyramid.junglePyramidsDispenserContents, 2, 2); - addInfo(STRONGHOLD_CORRIDOR, ChestCorridor.strongholdChestContents, 2, 4); - addInfo(STRONGHOLD_LIBRARY, Library.strongholdLibraryChestContents, 1, 5); - addInfo(STRONGHOLD_CROSSING, RoomCrossing.strongholdRoomCrossingChestContents, 1, 5); - addInfo(VILLAGE_BLACKSMITH, House2.villageBlacksmithChestContents, 3, 9); - addInfo(BONUS_CHEST, WorldServer.bonusChestContent, 10, 10); - addInfo(DUNGEON_CHEST, WorldGenDungeons.field_111189_a, 8, 8); + addInfo(MINESHAFT_CORRIDOR, StructureMineshaftPieces.mineshaftChestContents, 3, 7); + addInfo(PYRAMID_DESERT_CHEST, DesertPyramid.itemsToGenerateInTemple, 2, 7); + addInfo(PYRAMID_JUNGLE_CHEST, JunglePyramid.junglePyramidsChestContents, 2, 7); + addInfo(PYRAMID_JUNGLE_DISPENSER, JunglePyramid.junglePyramidsDispenserContents, 2, 2); + addInfo(STRONGHOLD_CORRIDOR, ChestCorridor.strongholdChestContents, 2, 4); + addInfo(STRONGHOLD_LIBRARY, Library.strongholdLibraryChestContents, 1, 5); + addInfo(STRONGHOLD_CROSSING, RoomCrossing.strongholdRoomCrossingChestContents, 1, 5); + addInfo(VILLAGE_BLACKSMITH, House2.villageBlacksmithChestContents, 3, 9); + addInfo(BONUS_CHEST, WorldServer.bonusChestContent, 10, 10); + addInfo(DUNGEON_CHEST, WorldGenDungeons.field_111189_a, 8, 8); ItemStack book = new ItemStack(Items.enchanted_book, 1, 0); WeightedRandomChestContent tmp = new WeightedRandomChestContent(book, 1, 1, 1); - getInfo(MINESHAFT_CORRIDOR ).addItem(tmp); + getInfo(MINESHAFT_CORRIDOR ).addItem(tmp); getInfo(PYRAMID_DESERT_CHEST).addItem(tmp); getInfo(PYRAMID_JUNGLE_CHEST).addItem(tmp); getInfo(STRONGHOLD_CORRIDOR ).addItem(tmp); - getInfo(STRONGHOLD_LIBRARY ).addItem(new WeightedRandomChestContent(book, 1, 5, 2)); + getInfo(STRONGHOLD_LIBRARY ).addItem(new WeightedRandomChestContent(book, 1, 5, 2)); getInfo(STRONGHOLD_CROSSING ).addItem(tmp); - getInfo(DUNGEON_CHEST ).addItem(tmp); + getInfo(DUNGEON_CHEST ).addItem(tmp); } static void addDungeonLoot(ChestGenHooks dungeon, ItemStack item, int weight, int min, int max) @@ -231,7 +231,7 @@ * Returns a single ItemStack from the possible items in this registry, * Useful if you just want a quick and dirty random Item. * - * @param rand A Random Number gen + * @param rand A Random Number gen * @return A single ItemStack, or null if it could not get one. */ public ItemStack getOneItem(Random rand) diff --git a/src/main/java/net/minecraftforge/common/DimensionManager.java b/src/main/java/net/minecraftforge/common/DimensionManager.java index e5c4c7a..bb8cae2 100644 --- a/src/main/java/net/minecraftforge/common/DimensionManager.java +++ b/src/main/java/net/minecraftforge/common/DimensionManager.java @@ -100,8 +100,8 @@ hasInit = true; registerProviderType( 0, WorldProviderSurface.class, true); - registerProviderType(-1, WorldProviderHell.class, true); - registerProviderType( 1, WorldProviderEnd.class, false); + registerProviderType(-1, WorldProviderHell.class, true); + registerProviderType( 1, WorldProviderEnd.class, false); registerDimension( 0, 0); registerDimension(-1, -1); registerDimension( 1, 1); @@ -294,7 +294,7 @@ } else { - throw new RuntimeException(String.format("No WorldProvider bound for dimension %d", dim)); //It's going to crash anyway at this point. Might as well be informative + throw new RuntimeException(String.format("No WorldProvider bound for dimension %d", dim)); //It's going to crash anyway at this point. Might as well be informative } } catch (Exception e) diff --git a/src/main/java/net/minecraftforge/common/DungeonHooks.java b/src/main/java/net/minecraftforge/common/DungeonHooks.java index 1a922d2..272c0e2 100644 --- a/src/main/java/net/minecraftforge/common/DungeonHooks.java +++ b/src/main/java/net/minecraftforge/common/DungeonHooks.java @@ -16,11 +16,11 @@ * * @param name The name of the monster, use the same name used when registering the entity. * @param rarity The rarity of selecting this mob over others. Must be greater then 0. - * Vanilla Minecraft has the following mobs: - * Spider 100 - * Skeleton 100 - * Zombie 200 - * Meaning, Zombies are twice as common as spiders or skeletons. + * Vanilla Minecraft has the following mobs: + * Spider 100 + * Skeleton 100 + * Zombie 200 + * Meaning, Zombies are twice as common as spiders or skeletons. * @return The new rarity of the monster, */ public static float addDungeonMob(String name, int rarity) @@ -96,7 +96,7 @@ static { addDungeonMob("Skeleton", 100); - addDungeonMob("Zombie", 200); - addDungeonMob("Spider", 100); + addDungeonMob("Zombie", 200); + addDungeonMob("Spider", 100); } } diff --git a/src/main/java/net/minecraftforge/common/ForgeModContainer.java b/src/main/java/net/minecraftforge/common/ForgeModContainer.java index 43fcb17..cc6cbec 100644 --- a/src/main/java/net/minecraftforge/common/ForgeModContainer.java +++ b/src/main/java/net/minecraftforge/common/ForgeModContainer.java @@ -60,18 +60,18 @@ { super(new ModMetadata()); ModMetadata meta = getMetadata(); - meta.modId = "Forge"; - meta.name = "Minecraft Forge"; - meta.version = String.format("%d.%d.%d.%d", majorVersion, minorVersion, revisionVersion, buildVersion); - meta.credits = "Made possible with help from many people"; - meta.authorList = Arrays.asList("LexManos", "Eloraam", "Spacetoad"); + meta.modId = "Forge"; + meta.name = "Minecraft Forge"; + meta.version = String.format("%d.%d.%d.%d", majorVersion, minorVersion, revisionVersion, buildVersion); + meta.credits = "Made possible with help from many people"; + meta.authorList = Arrays.asList("LexManos", "Eloraam", "Spacetoad"); meta.description = "Minecraft Forge is a common open source API allowing a broad range of mods " + "to work cooperatively together. It allows many mods to be created without " + "them editing the main Minecraft code."; - meta.url = "http://MinecraftForge.net"; - meta.updateUrl = "http://MinecraftForge.net/forum/index.php/topic,5.0.html"; + meta.url = "http://MinecraftForge.net"; + meta.updateUrl = "http://MinecraftForge.net/forum/index.php/topic,5.0.html"; meta.screenshots = new String[0]; - meta.logoFile = "/forge_logo.png"; + meta.logoFile = "/forge_logo.png"; Configuration config = null; File cfgFile = new File(Loader.instance().getConfigDir(), "forge.cfg"); diff --git a/src/main/java/net/minecraftforge/common/ForgeVersion.java b/src/main/java/net/minecraftforge/common/ForgeVersion.java index 698ccc0..7a87922 100644 --- a/src/main/java/net/minecraftforge/common/ForgeVersion.java +++ b/src/main/java/net/minecraftforge/common/ForgeVersion.java @@ -19,13 +19,13 @@ public class ForgeVersion { //This number is incremented every time we remove deprecated code/major API changes, never reset - public static final int majorVersion = 10; + public static final int majorVersion = 10; //This number is incremented every minecraft release, never reset - public static final int minorVersion = 12; + public static final int minorVersion = 12; //This number is incremented every time a interface changes or new major feature is added, and reset every Minecraft version public static final int revisionVersion = 1; //This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code. - public static final int buildVersion = 0; + public static final int buildVersion = 0; private static Status status = PENDING; private static String target = null; diff --git a/src/main/java/net/minecraftforge/common/IExtendedEntityProperties.java b/src/main/java/net/minecraftforge/common/IExtendedEntityProperties.java index 2270cb2..1b937a4 100644 --- a/src/main/java/net/minecraftforge/common/IExtendedEntityProperties.java +++ b/src/main/java/net/minecraftforge/common/IExtendedEntityProperties.java @@ -31,7 +31,7 @@ * as the world object. * Called automatically if you register with the EntityConstructing event. * @param entity The entity that this extended properties is attached to - * @param world The world in which the entity exists + * @param world The world in which the entity exists */ public void init(Entity entity, World world); } diff --git a/src/main/java/net/minecraftforge/common/ISpecialArmor.java b/src/main/java/net/minecraftforge/common/ISpecialArmor.java index d9fc44e..764d1b3 100644 --- a/src/main/java/net/minecraftforge/common/ISpecialArmor.java +++ b/src/main/java/net/minecraftforge/common/ISpecialArmor.java @@ -34,7 +34,7 @@ * @param player The entity wearing the armor. * @param armor The ItemStack of the armor item itself. * @param source The source of the damage, which can be used to alter armor - * properties based on the type or source of damage. + * properties based on the type or source of damage. * @param damage The total damage being applied to the entity * @param slot The armor slot the item is in. * @return A ArmorProperties instance holding information about how the armor effects damage. @@ -59,7 +59,7 @@ * @param entity The entity wearing the armor * @param stack The ItemStack of the armor item itself. * @param source The source of the damage, which can be used to alter armor - * properties based on the type or source of damage. + * properties based on the type or source of damage. * @param damage The amount of damage being applied to the armor * @param slot The armor slot the item is in. */ @@ -67,18 +67,18 @@ public static class ArmorProperties implements Comparable { - public int Priority = 0; - public int AbsorbMax = Integer.MAX_VALUE; + public int Priority = 0; + public int AbsorbMax = Integer.MAX_VALUE; public double AbsorbRatio = 0; - public int Slot = 0; + public int Slot = 0; private static final boolean DEBUG = false; //Only enable this if you wish to be spamed with debugging information. //Left it in because I figured it'd be useful for modders developing custom armor. public ArmorProperties(int priority, double ratio, int max) { - Priority = priority; + Priority = priority; AbsorbRatio = ratio; - AbsorbMax = max; + AbsorbMax = max; } /** @@ -184,11 +184,11 @@ { Arrays.sort(armor); - int start = 0; - double total = 0; - int priority = armor[0].Priority; - int pStart = 0; - boolean pChange = false; + int start = 0; + double total = 0; + int priority = armor[0].Priority; + int pStart = 0; + boolean pChange = false; boolean pFinished = false; if (DEBUG) @@ -300,7 +300,7 @@ { return o.Priority - Priority; } - double left = ( AbsorbRatio == 0 ? 0 : AbsorbMax * 100.0D / AbsorbRatio); + double left = ( AbsorbRatio == 0 ? 0 : AbsorbMax * 100.0D / AbsorbRatio); double right = (o.AbsorbRatio == 0 ? 0 : o.AbsorbMax * 100.0D / o.AbsorbRatio); return (int)(left - right); } diff --git a/src/main/java/net/minecraftforge/common/MinecraftForge.java b/src/main/java/net/minecraftforge/common/MinecraftForge.java index 37dd044..ac3f65c 100644 --- a/src/main/java/net/minecraftforge/common/MinecraftForge.java +++ b/src/main/java/net/minecraftforge/common/MinecraftForge.java @@ -29,7 +29,7 @@ * * @param seed The item to drop as a seed. * @param weight The relative probability of the seeds, - * where wheat seeds are 10. + * where wheat seeds are 10. */ public static void addGrassSeed(ItemStack seed, int weight) { diff --git a/src/main/java/net/minecraftforge/common/config/ConfigCategory.java b/src/main/java/net/minecraftforge/common/config/ConfigCategory.java index 249365d..994f11b 100644 --- a/src/main/java/net/minecraftforge/common/config/ConfigCategory.java +++ b/src/main/java/net/minecraftforge/common/config/ConfigCategory.java @@ -45,7 +45,7 @@ if (obj instanceof ConfigCategory) { ConfigCategory cat = (ConfigCategory)obj; - return name.equals(cat.name) && children.equals(cat.children); + return name.equals(cat.name) && children.equals(cat.children); } return false; @@ -198,7 +198,7 @@ StringBuilder buf = new StringBuilder(""); for (int x = 0; x < indent; x++) { - buf.append(" "); + buf.append(" "); } return buf.toString(); } diff --git a/src/main/java/net/minecraftforge/common/config/Configuration.java b/src/main/java/net/minecraftforge/common/config/Configuration.java index e8c86e5..94342df 100644 --- a/src/main/java/net/minecraftforge/common/config/Configuration.java +++ b/src/main/java/net/minecraftforge/common/config/Configuration.java @@ -173,7 +173,7 @@ values[i] = Integer.toString(defaultValue[i]); } - Property prop = get(category, key, values, comment, INTEGER); + Property prop = get(category, key, values, comment, INTEGER); if (!prop.isIntList()) { prop.set(values); @@ -195,7 +195,7 @@ values[i] = Double.toString(defaultValue[i]); } - Property prop = get(category, key, values, comment, DOUBLE); + Property prop = get(category, key, values, comment, DOUBLE); if (!prop.isDoubleList()) { @@ -218,7 +218,7 @@ values[i] = Boolean.toString(defaultValue[i]); } - Property prop = get(category, key, values, comment, BOOLEAN); + Property prop = get(category, key, values, comment, BOOLEAN); if (!prop.isBooleanList()) { @@ -582,7 +582,7 @@ } private void save(BufferedWriter out) throws IOException - { + { for (ConfigCategory cat : categories.values()) { if (!cat.isChild()) @@ -725,7 +725,7 @@ size = 4; } else if (bom32 == 0xFFFE0000) //This will never happen as it'll be caught by UTF-16LE, - { //but if anyone ever runs across a 32LE file, i'd like to disect it. + { //but if anyone ever runs across a 32LE file, i'd like to disect it. enc = "UTF-32LE"; size = 4; } diff --git a/src/main/java/net/minecraftforge/common/config/Property.java b/src/main/java/net/minecraftforge/common/config/Property.java index 46de7c1..a54f96f 100644 --- a/src/main/java/net/minecraftforge/common/config/Property.java +++ b/src/main/java/net/minecraftforge/common/config/Property.java @@ -50,8 +50,8 @@ public Property() { wasRead = false; - type = null; - isList = false; + type = null; + isList = false; } public Property(String name, String value, Type type) @@ -64,8 +64,8 @@ setName(name); this.value = value; this.type = type; - wasRead = read; - isList = false; + wasRead = read; + isList = false; } public Property(String name, String[] values, Type type) @@ -76,10 +76,10 @@ Property(String name, String[] values, Type type, boolean read) { setName(name); - this.type = type; + this.type = type; this.values = values; - wasRead = read; - isList = true; + wasRead = read; + isList = true; } /** @@ -401,7 +401,7 @@ changed = true; } - public void set(int value){ set(Integer.toString(value)); } + public void set(int value){ set(Integer.toString(value)); } public void set(boolean value){ set(Boolean.toString(value)); } - public void set(double value){ set(Double.toString(value)); } + public void set(double value){ set(Double.toString(value)); } } diff --git a/src/main/java/net/minecraftforge/common/util/Constants.java b/src/main/java/net/minecraftforge/common/util/Constants.java index 58eb606..8ff547f 100644 --- a/src/main/java/net/minecraftforge/common/util/Constants.java +++ b/src/main/java/net/minecraftforge/common/util/Constants.java @@ -15,18 +15,18 @@ */ public static class NBT { - public static final int TAG_END = 0; - public static final int TAG_BYTE = 1; - public static final int TAG_SHORT = 2; - public static final int TAG_INT = 3; - public static final int TAG_LONG = 4; - public static final int TAG_FLOAT = 5; - public static final int TAG_DOUBLE = 6; - public static final int TAG_BYTE_ARRAY = 7; - public static final int TAG_STRING = 8; - public static final int TAG_LIST = 9; - public static final int TAG_COMPOUND = 10; - public static final int TAG_INT_ARRAY = 11; + public static final int TAG_END = 0; + public static final int TAG_BYTE = 1; + public static final int TAG_SHORT = 2; + public static final int TAG_INT = 3; + public static final int TAG_LONG = 4; + public static final int TAG_FLOAT = 5; + public static final int TAG_DOUBLE = 6; + public static final int TAG_BYTE_ARRAY = 7; + public static final int TAG_STRING = 8; + public static final int TAG_LIST = 9; + public static final int TAG_COMPOUND = 10; + public static final int TAG_INT_ARRAY = 11; public static final int TAG_ANY_NUMERIC = 99; } } diff --git a/src/main/java/net/minecraftforge/common/util/EnumHelper.java b/src/main/java/net/minecraftforge/common/util/EnumHelper.java index 4ae531f..8d40292 100644 --- a/src/main/java/net/minecraftforge/common/util/EnumHelper.java +++ b/src/main/java/net/minecraftforge/common/util/EnumHelper.java @@ -22,12 +22,12 @@ public class EnumHelper { - private static Object reflectionFactory = null; + private static Object reflectionFactory = null; private static Method newConstructorAccessor = null; - private static Method newInstance = null; - private static Method newFieldAccessor = null; - private static Method fieldAccessorSet = null; - private static boolean isSetup = false; + private static Method newInstance = null; + private static Method newFieldAccessor = null; + private static Method fieldAccessorSet = null; + private static boolean isSetup = false; //Some enums are decompiled with extra arguments, so lets check for that @SuppressWarnings("rawtypes") @@ -112,11 +112,11 @@ try { Method getReflectionFactory = Class.forName("sun.reflect.ReflectionFactory").getDeclaredMethod("getReflectionFactory"); - reflectionFactory = getReflectionFactory.invoke(null); + reflectionFactory = getReflectionFactory.invoke(null); newConstructorAccessor = Class.forName("sun.reflect.ReflectionFactory").getDeclaredMethod("newConstructorAccessor", Constructor.class); - newInstance = Class.forName("sun.reflect.ConstructorAccessor").getDeclaredMethod("newInstance", Object[].class); - newFieldAccessor = Class.forName("sun.reflect.ReflectionFactory").getDeclaredMethod("newFieldAccessor", Field.class, boolean.class); - fieldAccessorSet = Class.forName("sun.reflect.FieldAccessor").getDeclaredMethod("set", Object.class, Object.class); + newInstance = Class.forName("sun.reflect.ConstructorAccessor").getDeclaredMethod("newInstance", Object[].class); + newFieldAccessor = Class.forName("sun.reflect.ReflectionFactory").getDeclaredMethod("newFieldAccessor", Field.class, boolean.class); + fieldAccessorSet = Class.forName("sun.reflect.FieldAccessor").getDeclaredMethod("set", Object.class, Object.class); } catch (Exception e) { @@ -248,7 +248,7 @@ for (Field field : fields) { String mods = String.format("%16s", Integer.toBinaryString(field.getModifiers())).replace(' ', '0'); - FMLLog.severe(" %s %s: %s", mods, field.getName(), field.getType().getName()); + FMLLog.severe(" %s %s: %s", mods, field.getName(), field.getType().getName()); } return null; } diff --git a/src/main/java/net/minecraftforge/common/util/FakePlayerFactory.java b/src/main/java/net/minecraftforge/common/util/FakePlayerFactory.java index d39af8a..57b7f8f 100644 --- a/src/main/java/net/minecraftforge/common/util/FakePlayerFactory.java +++ b/src/main/java/net/minecraftforge/common/util/FakePlayerFactory.java @@ -22,7 +22,7 @@ { if (MINECRAFT_PLAYER == null) { - MINECRAFT_PLAYER = FakePlayerFactory.get(world, MINECRAFT); + MINECRAFT_PLAYER = FakePlayerFactory.get(world, MINECRAFT); } return MINECRAFT_PLAYER; } diff --git a/src/main/java/net/minecraftforge/event/AnvilUpdateEvent.java b/src/main/java/net/minecraftforge/event/AnvilUpdateEvent.java index cd6a2d9..d5d8154 100644 --- a/src/main/java/net/minecraftforge/event/AnvilUpdateEvent.java +++ b/src/main/java/net/minecraftforge/event/AnvilUpdateEvent.java @@ -16,9 +16,9 @@ { public final ItemStack left; // The left side of the input public final ItemStack right; // The right side of the input - public final String name; // The name to set the item, if the user specified one. - public ItemStack output; // Set this to set the output stack - public int cost; // The base cost, set this to change it if output != null + public final String name; // The name to set the item, if the user specified one. + public ItemStack output; // Set this to set the output stack + public int cost; // The base cost, set this to change it if output != null public AnvilUpdateEvent(ItemStack left, ItemStack right, String name, int cost) { diff --git a/src/main/java/net/minecraftforge/event/brewing/PotionBrewedEvent.java b/src/main/java/net/minecraftforge/event/brewing/PotionBrewedEvent.java index 6143ea2..dcffeab 100644 --- a/src/main/java/net/minecraftforge/event/brewing/PotionBrewedEvent.java +++ b/src/main/java/net/minecraftforge/event/brewing/PotionBrewedEvent.java @@ -6,7 +6,7 @@ public class PotionBrewedEvent extends Event { /** - * The brewing stacks in the brewing stand. Each index has the possibility to be null, so make sure you check. + * The brewing stacks in the brewing stand. Each index has the possibility to be null, so make sure you check. */ public ItemStack[] brewingStacks; public PotionBrewedEvent(ItemStack[] brewingStacks) diff --git a/src/main/java/net/minecraftforge/event/entity/living/EnderTeleportEvent.java b/src/main/java/net/minecraftforge/event/entity/living/EnderTeleportEvent.java index 7b01e81..184aa01 100644 --- a/src/main/java/net/minecraftforge/event/entity/living/EnderTeleportEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/living/EnderTeleportEvent.java @@ -4,7 +4,7 @@ import net.minecraft.entity.EntityLivingBase; /** - * Event for when an Enderman teleports or an ender pearl is used. Can be used to either modify the target position, or cancel the teleport outright. + * Event for when an Enderman teleports or an ender pearl is used. Can be used to either modify the target position, or cancel the teleport outright. * @author Mithion * */ diff --git a/src/main/java/net/minecraftforge/event/entity/living/LivingPackSizeEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingPackSizeEvent.java index e55aa01..1189574 100644 --- a/src/main/java/net/minecraftforge/event/entity/living/LivingPackSizeEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/living/LivingPackSizeEvent.java @@ -10,7 +10,7 @@ * This event is fired when the spawning system determines the * maximum amount of the selected entity that can spawn at the same * time. - * + * * If you set the result to 'ALLOW', it means that you want to return * the value of maxPackSize as the maximum pack size for current entity. */ diff --git a/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java index 8701ba3..7176187 100644 --- a/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java @@ -24,9 +24,9 @@ * Fires before mob spawn events. * * Result is significant: - * DEFAULT: use vanilla spawn rules - * ALLOW: allow the spawn - * DENY: deny the spawn + * DEFAULT: use vanilla spawn rules + * ALLOW: allow the spawn + * DENY: deny the spawn * */ @HasResult diff --git a/src/main/java/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java b/src/main/java/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java index 6065315..0f06f01 100644 --- a/src/main/java/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java @@ -13,11 +13,11 @@ * This event is called when a player collides with a EntityItem on the ground. * The event can be canceled, and no further processing will be done. * - * You can set the result of this event to ALLOW which will trigger the - * processing of achievements, FML's event, play the sound, and kill the - * entity if all the items are picked up. - * - * setResult(ALLOW) is the same as the old setHandled() + * You can set the result of this event to ALLOW which will trigger the + * processing of achievements, FML's event, play the sound, and kill the + * entity if all the items are picked up. + * + * setResult(ALLOW) is the same as the old setHandled() */ public final EntityItem item; diff --git a/src/main/java/net/minecraftforge/event/entity/player/PlayerDropsEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerDropsEvent.java index b6827b4..1d33173 100644 --- a/src/main/java/net/minecraftforge/event/entity/player/PlayerDropsEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/player/PlayerDropsEvent.java @@ -12,7 +12,7 @@ /** * Child class of LivingDropEvent that is fired specifically when a - * player dies. Canceling the event will prevent ALL drops from entering the + * player dies. Canceling the event will prevent ALL drops from entering the * world. */ @Cancelable diff --git a/src/main/java/net/minecraftforge/event/entity/player/PlayerFlyableFallEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerFlyableFallEvent.java index a52ddc7..15328b8 100644 --- a/src/main/java/net/minecraftforge/event/entity/player/PlayerFlyableFallEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/player/PlayerFlyableFallEvent.java @@ -3,7 +3,7 @@ import net.minecraft.entity.player.EntityPlayer; /** - * Occurs when a player falls, but is able to fly. Doesn't need to be cancelable, this is mainly for notification purposes. + * Occurs when a player falls, but is able to fly. Doesn't need to be cancelable, this is mainly for notification purposes. * @author Mithion * */ diff --git a/src/main/java/net/minecraftforge/event/entity/player/PlayerUseItemEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerUseItemEvent.java index dacf356..ff66281 100644 --- a/src/main/java/net/minecraftforge/event/entity/player/PlayerUseItemEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/player/PlayerUseItemEvent.java @@ -19,10 +19,10 @@ /** * Fired when a player starts 'using' an item, typically when they hold right mouse. * Examples: - * Drawing a bow - * Eating Food - * Drinking Potions/Milk - * Guarding with a sword + * Drawing a bow + * Eating Food + * Drinking Potions/Milk + * Guarding with a sword * * Cancel the event, or set the duration or <= 0 to prevent it from processing. * @@ -54,10 +54,10 @@ /** * Fired when a player stops using an item without the use duration timing out. * Example: - * Stop eating 1/2 way through - * Stop defending with sword - * Stop drawing bow. This case would fire the arrow - * + * Stop eating 1/2 way through + * Stop defending with sword + * Stop drawing bow. This case would fire the arrow + * * Duration on this event is how long the item had left in it's count down before 'finishing' * * Canceling this event will prevent the Item from being notified that it has stopped being used, diff --git a/src/main/java/net/minecraftforge/event/world/ChunkWatchEvent.java b/src/main/java/net/minecraftforge/event/world/ChunkWatchEvent.java index c183f6c..d3fd8f6 100644 --- a/src/main/java/net/minecraftforge/event/world/ChunkWatchEvent.java +++ b/src/main/java/net/minecraftforge/event/world/ChunkWatchEvent.java @@ -17,11 +17,11 @@ public static class Watch extends ChunkWatchEvent { - public Watch(ChunkCoordIntPair chunk, EntityPlayerMP player) { super(chunk, player); } + public Watch(ChunkCoordIntPair chunk, EntityPlayerMP player) { super(chunk, player); } } public static class UnWatch extends ChunkWatchEvent { - public UnWatch(ChunkCoordIntPair chunkLocation, EntityPlayerMP player) { super(chunkLocation, player); } + public UnWatch(ChunkCoordIntPair chunkLocation, EntityPlayerMP player) { super(chunkLocation, player); } } } diff --git a/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java b/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java index f44c103..b51f1f3 100644 --- a/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java +++ b/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java @@ -31,10 +31,10 @@ static { defaultDisplacements.put(Blocks.wooden_door, false); - defaultDisplacements.put(Blocks.iron_door, false); + defaultDisplacements.put(Blocks.iron_door, false); defaultDisplacements.put(Blocks.standing_sign, false); - defaultDisplacements.put(Blocks.wall_sign, false); - defaultDisplacements.put(Blocks.reeds, false); + defaultDisplacements.put(Blocks.wall_sign, false); + defaultDisplacements.put(Blocks.reeds, false); } protected Map displacements = Maps.newHashMap(); @@ -308,12 +308,12 @@ @Override public int getMixedBrightnessForBlock(IBlockAccess world, int x, int y, int z) { - int lightThis = world.getLightBrightnessForSkyBlocks(x, y, z, 0); - int lightUp = world.getLightBrightnessForSkyBlocks(x, y + 1, z, 0); + int lightThis = world.getLightBrightnessForSkyBlocks(x, y, z, 0); + int lightUp = world.getLightBrightnessForSkyBlocks(x, y + 1, z, 0); int lightThisBase = lightThis & 255; - int lightUpBase = lightUp & 255; + int lightUpBase = lightUp & 255; int lightThisExt = lightThis >> 16 & 255; - int lightUpExt = lightUp >> 16 & 255; + int lightUpExt = lightUp >> 16 & 255; return (lightThisBase > lightUpBase ? lightThisBase : lightUpBase) | ((lightThisExt > lightUpExt ? lightThisExt : lightUpExt) << 16); } @@ -434,14 +434,14 @@ if (world.getBlock(x, y + 1, z) == this) { boolean flag = - isBlockSolid(world, x, y, z - 1, 2) || - isBlockSolid(world, x, y, z + 1, 3) || - isBlockSolid(world, x - 1, y, z, 4) || - isBlockSolid(world, x + 1, y, z, 5) || - isBlockSolid(world, x, y + 1, z - 1, 2) || - isBlockSolid(world, x, y + 1, z + 1, 3) || - isBlockSolid(world, x - 1, y + 1, z, 4) || - isBlockSolid(world, x + 1, y + 1, z, 5); + isBlockSolid(world, x, y, z - 1, 2) || + isBlockSolid(world, x, y, z + 1, 3) || + isBlockSolid(world, x - 1, y, z, 4) || + isBlockSolid(world, x + 1, y, z, 5) || + isBlockSolid(world, x, y + 1, z - 1, 2) || + isBlockSolid(world, x, y + 1, z + 1, 3) || + isBlockSolid(world, x - 1, y + 1, z, 4) || + isBlockSolid(world, x + 1, y + 1, z, 5); if (flag) { diff --git a/src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java b/src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java index e6042fe..3c5f261 100644 --- a/src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java +++ b/src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java @@ -91,21 +91,21 @@ { int y2 = y - densityDir; - if (world.getBlock(x, y2, z ) == this || - world.getBlock(x - 1, y2, z ) == this || - world.getBlock(x + 1, y2, z ) == this || - world.getBlock(x, y2, z - 1) == this || - world.getBlock(x, y2, z + 1) == this) + if (world.getBlock(x, y2, z ) == this || + world.getBlock(x - 1, y2, z ) == this || + world.getBlock(x + 1, y2, z ) == this || + world.getBlock(x, y2, z - 1) == this || + world.getBlock(x, y2, z + 1) == this) { expQuanta = quantaPerBlock - 1; } else { int maxQuanta = -100; - maxQuanta = getLargerQuanta(world, x - 1, y, z, maxQuanta); - maxQuanta = getLargerQuanta(world, x + 1, y, z, maxQuanta); - maxQuanta = getLargerQuanta(world, x, y, z - 1, maxQuanta); - maxQuanta = getLargerQuanta(world, x, y, z + 1, maxQuanta); + maxQuanta = getLargerQuanta(world, x - 1, y, z, maxQuanta); + maxQuanta = getLargerQuanta(world, x + 1, y, z, maxQuanta); + maxQuanta = getLargerQuanta(world, x, y, z - 1, maxQuanta); + maxQuanta = getLargerQuanta(world, x, y, z + 1, maxQuanta); expQuanta = maxQuanta - 1; } @@ -155,10 +155,10 @@ } boolean flowTo[] = getOptimalFlowDirections(world, x, y, z); - if (flowTo[0]) flowIntoBlock(world, x - 1, y, z, flowMeta); - if (flowTo[1]) flowIntoBlock(world, x + 1, y, z, flowMeta); - if (flowTo[2]) flowIntoBlock(world, x, y, z - 1, flowMeta); - if (flowTo[3]) flowIntoBlock(world, x, y, z + 1, flowMeta); + if (flowTo[0]) flowIntoBlock(world, x - 1, y, z, flowMeta); + if (flowTo[1]) flowIntoBlock(world, x + 1, y, z, flowMeta); + if (flowTo[2]) flowIntoBlock(world, x, y, z - 1, flowMeta); + if (flowTo[3]) flowIntoBlock(world, x, y, z + 1, flowMeta); } } diff --git a/src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java b/src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java index 3373fab..08afec9 100644 --- a/src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java +++ b/src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java @@ -82,14 +82,14 @@ // Flow out if possible int lowerthan = quantaRemaining - 1; - if (displaceIfPossible(world, x, y, z - 1)) world.setBlock(x, y, z - 1, Blocks.air); - if (displaceIfPossible(world, x, y, z + 1)) world.setBlock(x, y, z + 1, Blocks.air); - if (displaceIfPossible(world, x - 1, y, z )) world.setBlock(x - 1, y, z, Blocks.air); - if (displaceIfPossible(world, x + 1, y, z )) world.setBlock(x + 1, y, z, Blocks.air); - int north = getQuantaValueBelow(world, x, y, z - 1, lowerthan); - int south = getQuantaValueBelow(world, x, y, z + 1, lowerthan); - int west = getQuantaValueBelow(world, x - 1, y, z, lowerthan); - int east = getQuantaValueBelow(world, x + 1, y, z, lowerthan); + if (displaceIfPossible(world, x, y, z - 1)) world.setBlock(x, y, z - 1, Blocks.air); + if (displaceIfPossible(world, x, y, z + 1)) world.setBlock(x, y, z + 1, Blocks.air); + if (displaceIfPossible(world, x - 1, y, z )) world.setBlock(x - 1, y, z, Blocks.air); + if (displaceIfPossible(world, x + 1, y, z )) world.setBlock(x + 1, y, z, Blocks.air); + int north = getQuantaValueBelow(world, x, y, z - 1, lowerthan); + int south = getQuantaValueBelow(world, x, y, z + 1, lowerthan); + int west = getQuantaValueBelow(world, x - 1, y, z, lowerthan); + int east = getQuantaValueBelow(world, x + 1, y, z, lowerthan); int total = quantaRemaining; int count = 1; @@ -282,10 +282,10 @@ { BlockFluidBase block = (BlockFluidBase)world.getBlock(x, otherY, z); int otherData = world.getBlockMetadata(x, otherY, z); - world.setBlock(x, otherY, z, this, amtToInput - 1, 3); - world.setBlock(x, y, z, block, otherData, 3); + world.setBlock(x, otherY, z, this, amtToInput - 1, 3); + world.setBlock(x, y, z, block, otherData, 3); world.scheduleBlockUpdate(x, otherY, z, this, tickRate); - world.scheduleBlockUpdate(x, y, z, block, block.tickRate(world)); + world.scheduleBlockUpdate(x, y, z, block, block.tickRate(world)); return 0; } } @@ -295,10 +295,10 @@ { BlockFluidBase block = (BlockFluidBase)world.getBlock(x, otherY, z); int otherData = world.getBlockMetadata(x, otherY, z); - world.setBlock(x, otherY, z, this, amtToInput - 1, 3); - world.setBlock(x, y, z, block, otherData, 3); + world.setBlock(x, otherY, z, this, amtToInput - 1, 3); + world.setBlock(x, y, z, block, otherData, 3); world.scheduleBlockUpdate(x, otherY, z, this, tickRate); - world.scheduleBlockUpdate(x, y, z, block, block.tickRate(world)); + world.scheduleBlockUpdate(x, y, z, block, block.tickRate(world)); return 0; } } diff --git a/src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java b/src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java index 8cddbd1..d953cca 100644 --- a/src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java +++ b/src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java @@ -81,7 +81,7 @@ static { registerFluidContainer(FluidRegistry.WATER, new ItemStack(Items.water_bucket), EMPTY_BUCKET); - registerFluidContainer(FluidRegistry.LAVA, new ItemStack(Items.lava_bucket), EMPTY_BUCKET); + registerFluidContainer(FluidRegistry.LAVA, new ItemStack(Items.lava_bucket), EMPTY_BUCKET); registerFluidContainer(FluidRegistry.WATER, new ItemStack(Items.potionitem), EMPTY_BOTTLE); } @@ -91,11 +91,11 @@ * Register a new fluid containing item. * * @param stack - * FluidStack containing the type and amount of the fluid stored in the item. + * FluidStack containing the type and amount of the fluid stored in the item. * @param filledContainer - * ItemStack representing the container when it is full. + * ItemStack representing the container when it is full. * @param emptyContainer - * ItemStack representing the container when it is empty. + * ItemStack representing the container when it is empty. * @return True if container was successfully registered; false if it already is. */ public static boolean registerFluidContainer(FluidStack stack, ItemStack filledContainer, ItemStack emptyContainer) @@ -108,11 +108,11 @@ * registers the Fluid if possible. * * @param fluid - * Fluid type that is stored in the item. + * Fluid type that is stored in the item. * @param filledContainer - * ItemStack representing the container when it is full. + * ItemStack representing the container when it is full. * @param emptyContainer - * ItemStack representing the container when it is empty. + * ItemStack representing the container when it is empty. * @return True if container was successfully registered; false if it already is. */ public static boolean registerFluidContainer(Fluid fluid, ItemStack filledContainer, ItemStack emptyContainer) @@ -128,9 +128,9 @@ * Register a new fluid containing item that does not have an empty container. * * @param stack - * FluidStack containing the type and amount of the fluid stored in the item. + * FluidStack containing the type and amount of the fluid stored in the item. * @param filledContainer - * ItemStack representing the container when it is full. + * ItemStack representing the container when it is full. * @return True if container was successfully registered; false if it already is. */ public static boolean registerFluidContainer(FluidStack stack, ItemStack filledContainer) @@ -143,9 +143,9 @@ * assumed to hold 1000 mB of fluid. Also registers the Fluid if possible. * * @param fluid - * Fluid type that is stored in the item. + * Fluid type that is stored in the item. * @param filledContainer - * ItemStack representing the container when it is full. + * ItemStack representing the container when it is full. * @return True if container was successfully registered; false if it already is. */ public static boolean registerFluidContainer(Fluid fluid, ItemStack filledContainer) @@ -161,7 +161,7 @@ * Register a new fluid containing item. * * @param data - * See {@link FluidContainerData}. + * See {@link FluidContainerData}. * @return True if container was successfully registered; false if it already is. */ public static boolean registerFluidContainer(FluidContainerData data) @@ -186,7 +186,7 @@ * Determines the fluid type and amount inside a container. * * @param container - * The fluid container. + * The fluid container. * @return FluidStack representing stored fluid. */ public static FluidStack getFluidForFilledItem(ItemStack container) @@ -206,9 +206,9 @@ * NOTE: Returns null on fail, NOT the empty container. * * @param fluid - * FluidStack containing the type and amount of fluid to fill. + * FluidStack containing the type and amount of fluid to fill. * @param container - * ItemStack representing the empty container. + * ItemStack representing the empty container. * @return Filled container if successful, otherwise null. */ public static ItemStack fillFluidContainer(FluidStack fluid, ItemStack container) diff --git a/src/main/java/net/minecraftforge/fluids/FluidRegistry.java b/src/main/java/net/minecraftforge/fluids/FluidRegistry.java index d399d79..5f2cbfd 100644 --- a/src/main/java/net/minecraftforge/fluids/FluidRegistry.java +++ b/src/main/java/net/minecraftforge/fluids/FluidRegistry.java @@ -68,7 +68,7 @@ * Register a new Fluid. If a fluid with the same name already exists, registration is denied. * * @param fluid - * The fluid to register. + * The fluid to register. * @return True if the fluid was successfully registered; false if there is a name clash. */ public static boolean registerFluid(Fluid fluid) diff --git a/src/main/java/net/minecraftforge/fluids/FluidStack.java b/src/main/java/net/minecraftforge/fluids/FluidStack.java index 1f4a29f..671c82b 100644 --- a/src/main/java/net/minecraftforge/fluids/FluidStack.java +++ b/src/main/java/net/minecraftforge/fluids/FluidStack.java @@ -112,7 +112,7 @@ * Determines if the FluidIDs and NBT Tags are equal. This does not check amounts. * * @param other - * The FluidStack for comparison + * The FluidStack for comparison * @return true if the Fluids (IDs and NBT Tags) are the same */ public boolean isFluidEqual(FluidStack other) @@ -148,7 +148,7 @@ * Determines if the FluidIDs, Amounts, and NBT Tags are all equal. * * @param other - * - the FluidStack for comparison + * - the FluidStack for comparison * @return true if the two FluidStacks are exactly the same */ public boolean isFluidStackIdentical(FluidStack other) @@ -161,7 +161,7 @@ * ItemStack. This does not check amounts. * * @param other - * The ItemStack for comparison + * The ItemStack for comparison * @return true if the Fluids (IDs and NBT Tags) are the same */ public boolean isFluidEqual(ItemStack other) diff --git a/src/main/java/net/minecraftforge/fluids/IFluidBlock.java b/src/main/java/net/minecraftforge/fluids/IFluidBlock.java index 52c0595..5fe6d9d 100644 --- a/src/main/java/net/minecraftforge/fluids/IFluidBlock.java +++ b/src/main/java/net/minecraftforge/fluids/IFluidBlock.java @@ -23,7 +23,7 @@ * NOTE: The block is intended to handle its own state changes. * * @param doDrain - * If false, the drain will only be simulated. + * If false, the drain will only be simulated. * @return */ FluidStack drain(World world, int x, int y, int z, boolean doDrain); @@ -33,7 +33,7 @@ * pumps. * * @param doDrain - * If false, the drain will only be simulated. + * If false, the drain will only be simulated. * @return */ boolean canDrain(World world, int x, int y, int z); diff --git a/src/main/java/net/minecraftforge/fluids/IFluidContainerItem.java b/src/main/java/net/minecraftforge/fluids/IFluidContainerItem.java index ba566e0..97dfd7c 100644 --- a/src/main/java/net/minecraftforge/fluids/IFluidContainerItem.java +++ b/src/main/java/net/minecraftforge/fluids/IFluidContainerItem.java @@ -18,7 +18,7 @@ /** * * @param container - * ItemStack which is the fluid container. + * ItemStack which is the fluid container. * @return FluidStack representing the fluid in the container, null if the container is empty. */ FluidStack getFluid(ItemStack container); @@ -26,7 +26,7 @@ /** * * @param container - * ItemStack which is the fluid container. + * ItemStack which is the fluid container. * @return Capacity of this fluid container. */ int getCapacity(ItemStack container); @@ -34,26 +34,26 @@ /** * * @param container - * ItemStack which is the fluid container. + * ItemStack which is the fluid container. * @param resource - * FluidStack attempting to fill the container. + * FluidStack attempting to fill the container. * @param doFill - * If false, the fill will only be simulated. + * If false, the fill will only be simulated. * @return Amount of fluid that was (or would have been, if simulated) filled into the - * container. + * container. */ int fill(ItemStack container, FluidStack resource, boolean doFill); /** * * @param container - * ItemStack which is the fluid container. + * ItemStack which is the fluid container. * @param maxDrain - * Maximum amount of fluid to be removed from the container. + * Maximum amount of fluid to be removed from the container. * @param doFill - * If false, the drain will only be simulated. + * If false, the drain will only be simulated. * @return Amount of fluid that was (or would have been, if simulated) drained from the - * container. + * container. */ FluidStack drain(ItemStack container, int maxDrain, boolean doDrain); } diff --git a/src/main/java/net/minecraftforge/fluids/IFluidHandler.java b/src/main/java/net/minecraftforge/fluids/IFluidHandler.java index 6d0d194..4c777bb 100644 --- a/src/main/java/net/minecraftforge/fluids/IFluidHandler.java +++ b/src/main/java/net/minecraftforge/fluids/IFluidHandler.java @@ -17,11 +17,11 @@ * Fills fluid into internal tanks, distribution is left entirely to the IFluidHandler. * * @param from - * Orientation the Fluid is pumped in from. + * Orientation the Fluid is pumped in from. * @param resource - * FluidStack representing the Fluid and maximum amount of fluid to be filled. + * FluidStack representing the Fluid and maximum amount of fluid to be filled. * @param doFill - * If false, fill will only be simulated. + * If false, fill will only be simulated. * @return Amount of resource that was (or would have been, if simulated) filled. */ int fill(ForgeDirection from, FluidStack resource, boolean doFill); @@ -30,13 +30,13 @@ * Drains fluid out of internal tanks, distribution is left entirely to the IFluidHandler. * * @param from - * Orientation the Fluid is drained to. + * Orientation the Fluid is drained to. * @param resource - * FluidStack representing the Fluid and maximum amount of fluid to be drained. + * FluidStack representing the Fluid and maximum amount of fluid to be drained. * @param doDrain - * If false, drain will only be simulated. + * If false, drain will only be simulated. * @return FluidStack representing the Fluid and amount that was (or would have been, if - * simulated) drained. + * simulated) drained. */ FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain); @@ -46,13 +46,13 @@ * This method is not Fluid-sensitive. * * @param from - * Orientation the fluid is drained to. + * Orientation the fluid is drained to. * @param maxDrain - * Maximum amount of fluid to drain. + * Maximum amount of fluid to drain. * @param doDrain - * If false, drain will only be simulated. + * If false, drain will only be simulated. * @return FluidStack representing the Fluid and amount that was (or would have been, if - * simulated) drained. + * simulated) drained. */ FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain); @@ -75,7 +75,7 @@ * to manipulate the internal tanks. See {@link FluidTankInfo}. * * @param from - * Orientation determining which tanks should be queried. + * Orientation determining which tanks should be queried. * @return Info for the relevant internal tanks. */ FluidTankInfo[] getTankInfo(ForgeDirection from); diff --git a/src/main/java/net/minecraftforge/fluids/IFluidTank.java b/src/main/java/net/minecraftforge/fluids/IFluidTank.java index ce1da16..1372c98 100644 --- a/src/main/java/net/minecraftforge/fluids/IFluidTank.java +++ b/src/main/java/net/minecraftforge/fluids/IFluidTank.java @@ -38,9 +38,9 @@ /** * * @param resource - * FluidStack attempting to fill the tank. + * FluidStack attempting to fill the tank. * @param doFill - * If false, the fill will only be simulated. + * If false, the fill will only be simulated. * @return Amount of fluid that was accepted by the tank. */ int fill(FluidStack resource, boolean doFill); @@ -48,9 +48,9 @@ /** * * @param maxDrain - * Maximum amount of fluid to be removed from the container. + * Maximum amount of fluid to be removed from the container. * @param doFill - * If false, the fill will only be simulated. + * If false, the fill will only be simulated. * @return Amount of fluid that was removed from the tank. */ FluidStack drain(int maxDrain, boolean doDrain); diff --git a/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java b/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java index 4d82e16..217d9ec 100644 --- a/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java +++ b/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java @@ -116,12 +116,12 @@ if (flow11 != 1) { float flow00 = getFluidHeightForRender(world, x - 1, y, z - 1, theFluid); - float flow01 = getFluidHeightForRender(world, x - 1, y, z, theFluid); + float flow01 = getFluidHeightForRender(world, x - 1, y, z, theFluid); float flow02 = getFluidHeightForRender(world, x - 1, y, z + 1, theFluid); - float flow10 = getFluidHeightForRender(world, x, y, z - 1, theFluid); - float flow12 = getFluidHeightForRender(world, x, y, z + 1, theFluid); + float flow10 = getFluidHeightForRender(world, x, y, z - 1, theFluid); + float flow12 = getFluidHeightForRender(world, x, y, z + 1, theFluid); float flow20 = getFluidHeightForRender(world, x + 1, y, z - 1, theFluid); - float flow21 = getFluidHeightForRender(world, x + 1, y, z, theFluid); + float flow21 = getFluidHeightForRender(world, x + 1, y, z, theFluid); float flow22 = getFluidHeightForRender(world, x + 1, y, z + 1, theFluid); heightNW = getFluidHeightAverage(new float[]{ flow00, flow01, flow10, flow11 }); diff --git a/src/main/java/net/minecraftforge/oredict/OreDictionary.java b/src/main/java/net/minecraftforge/oredict/OreDictionary.java index e0eb1aa..2379318 100644 --- a/src/main/java/net/minecraftforge/oredict/OreDictionary.java +++ b/src/main/java/net/minecraftforge/oredict/OreDictionary.java @@ -41,10 +41,10 @@ { if (!hasInit) { - registerOre("logWood", new ItemStack(Blocks.log, 1, WILDCARD_VALUE)); - registerOre("logWood", new ItemStack(Blocks.log2, 1, WILDCARD_VALUE)); + registerOre("logWood", new ItemStack(Blocks.log, 1, WILDCARD_VALUE)); + registerOre("logWood", new ItemStack(Blocks.log2, 1, WILDCARD_VALUE)); registerOre("plankWood", new ItemStack(Blocks.planks, 1, WILDCARD_VALUE)); - registerOre("slabWood", new ItemStack(Blocks.wooden_slab, 1, WILDCARD_VALUE)); + registerOre("slabWood", new ItemStack(Blocks.wooden_slab, 1, WILDCARD_VALUE)); registerOre("stairWood", Blocks.oak_stairs); registerOre("stairWood", Blocks.spruce_stairs); registerOre("stairWood", Blocks.birch_stairs); @@ -55,36 +55,36 @@ registerOre("treeSapling", new ItemStack(Blocks.sapling, 1, WILDCARD_VALUE)); registerOre("treeLeaves", new ItemStack(Blocks.leaves, 1, WILDCARD_VALUE)); registerOre("treeLeaves", new ItemStack(Blocks.leaves2, 1, WILDCARD_VALUE)); - registerOre("oreGold", Blocks.gold_ore); - registerOre("oreIron", Blocks.iron_ore); - registerOre("oreLapis", Blocks.lapis_ore); + registerOre("oreGold", Blocks.gold_ore); + registerOre("oreIron", Blocks.iron_ore); + registerOre("oreLapis", Blocks.lapis_ore); registerOre("oreDiamond", Blocks.diamond_ore); registerOre("oreRedstone", Blocks.redstone_ore); registerOre("oreEmerald", Blocks.emerald_ore); registerOre("oreQuartz", Blocks.quartz_ore); - registerOre("oreCoal", Blocks.coal_ore); + registerOre("oreCoal", Blocks.coal_ore); registerOre("gemDiamond", Items.diamond); registerOre("gemEmerald", Items.emerald); - registerOre("dustRedstone", Items.redstone); + registerOre("dustRedstone", Items.redstone); registerOre("dustGlowstone", Items.glowstone_dust); registerOre("glowstone", Blocks.glowstone); registerOre("cropWheat", Items.wheat); registerOre("cropPotato", Items.potato); registerOre("cropCarrot", Items.carrot); - registerOre("stone", Blocks.stone); + registerOre("stone", Blocks.stone); registerOre("cobblestone", Blocks.cobblestone); - registerOre("record", Items.record_13); - registerOre("record", Items.record_cat); - registerOre("record", Items.record_blocks); - registerOre("record", Items.record_chirp); - registerOre("record", Items.record_far); - registerOre("record", Items.record_mall); - registerOre("record", Items.record_mellohi); - registerOre("record", Items.record_stal); - registerOre("record", Items.record_strad); - registerOre("record", Items.record_ward); - registerOre("record", Items.record_11); - registerOre("record", Items.record_wait); + registerOre("record", Items.record_13); + registerOre("record", Items.record_cat); + registerOre("record", Items.record_blocks); + registerOre("record", Items.record_chirp); + registerOre("record", Items.record_far); + registerOre("record", Items.record_mall); + registerOre("record", Items.record_mellohi); + registerOre("record", Items.record_stal); + registerOre("record", Items.record_strad); + registerOre("record", Items.record_ward); + registerOre("record", Items.record_11); + registerOre("record", Items.record_wait); } // Build our list of items to replace with ore tags @@ -330,12 +330,12 @@ } //Convenience functions that make for cleaner code mod side. They all drill down to registerOre(String, int, ItemStack) - public static void registerOre(String name, Item ore){ registerOre(name, new ItemStack(ore)); } - public static void registerOre(String name, Block ore){ registerOre(name, new ItemStack(ore)); } + public static void registerOre(String name, Item ore){ registerOre(name, new ItemStack(ore)); } + public static void registerOre(String name, Block ore){ registerOre(name, new ItemStack(ore)); } public static void registerOre(String name, ItemStack ore){ registerOre(name, getOreID(name), ore); } - public static void registerOre(int id, Item ore){ registerOre(id, new ItemStack(ore)); } - public static void registerOre(int id, Block ore){ registerOre(id, new ItemStack(ore)); } - public static void registerOre(int id, ItemStack ore){ registerOre(getOreName(id), id, ore); } + public static void registerOre(int id, Item ore){ registerOre(id, new ItemStack(ore)); } + public static void registerOre(int id, Block ore){ registerOre(id, new ItemStack(ore)); } + public static void registerOre(int id, ItemStack ore){ registerOre(getOreName(id), id, ore); } /** * Registers a ore item into the dictionary. diff --git a/src/main/java/net/minecraftforge/oredict/RecipeSorter.java b/src/main/java/net/minecraftforge/oredict/RecipeSorter.java index 18088f9..916f458 100644 --- a/src/main/java/net/minecraftforge/oredict/RecipeSorter.java +++ b/src/main/java/net/minecraftforge/oredict/RecipeSorter.java @@ -99,29 +99,29 @@ } }; - private static Map categories = Maps.newHashMap(); - //private static Map types = Maps.newHashMap(); - private static Map entries = Maps.newHashMap(); - private static Map priorities = Maps.newHashMap(); + private static Map categories = Maps.newHashMap(); + //private static Map types = Maps.newHashMap(); + private static Map entries = Maps.newHashMap(); + private static Map priorities = Maps.newHashMap(); public static RecipeSorter INSTANCE = new RecipeSorter(); private static boolean isDirty = true; private static SortEntry before = new SortEntry("Before", null, UNKNOWN, ""); - private static SortEntry after = new SortEntry("After", null, UNKNOWN, ""); + private static SortEntry after = new SortEntry("After", null, UNKNOWN, ""); private RecipeSorter() { - register("minecraft:shaped", ShapedRecipes.class, SHAPED, "before:minecraft:shapeless"); - register("minecraft:mapextending", RecipesMapExtending.class, SHAPED, "after:minecraft:shaped before:minecraft:shapeless"); - register("minecraft:shapeless", ShapelessRecipes.class, SHAPELESS, "after:minecraft:shaped"); - register("minecraft:bookcloning", RecipeBookCloning.class, SHAPELESS, "after:minecraft:shapeless"); //Size 9 - register("minecraft:fireworks", RecipeFireworks.class, SHAPELESS, "after:minecraft:shapeless"); //Size 10 - register("minecraft:armordyes", RecipesArmorDyes.class, SHAPELESS, "after:minecraft:shapeless"); //Size 10 - register("minecraft:mapcloning", RecipesMapCloning.class, SHAPELESS, "after:minecraft:shapeless"); //Size 10 + register("minecraft:shaped", ShapedRecipes.class, SHAPED, "before:minecraft:shapeless"); + register("minecraft:mapextending", RecipesMapExtending.class, SHAPED, "after:minecraft:shaped before:minecraft:shapeless"); + register("minecraft:shapeless", ShapelessRecipes.class, SHAPELESS, "after:minecraft:shaped"); + register("minecraft:bookcloning", RecipeBookCloning.class, SHAPELESS, "after:minecraft:shapeless"); //Size 9 + register("minecraft:fireworks", RecipeFireworks.class, SHAPELESS, "after:minecraft:shapeless"); //Size 10 + register("minecraft:armordyes", RecipesArmorDyes.class, SHAPELESS, "after:minecraft:shapeless"); //Size 10 + register("minecraft:mapcloning", RecipesMapCloning.class, SHAPELESS, "after:minecraft:shapeless"); //Size 10 - register("forge:shapedore", ShapedOreRecipe.class, SHAPED, "after:minecraft:shaped before:minecraft:shapeless"); - register("forge:shapelessore", ShapelessOreRecipe.class, SHAPELESS, "after:minecraft:shapeless"); + register("forge:shapedore", ShapedOreRecipe.class, SHAPED, "after:minecraft:shaped before:minecraft:shapeless"); + register("forge:shapelessore", ShapelessOreRecipe.class, SHAPELESS, "after:minecraft:shapeless"); } @Override @@ -129,10 +129,10 @@ { Category c1 = getCategory(r1); Category c2 = getCategory(r2); - if (c1 == SHAPELESS && c2 == SHAPED) return 1; + if (c1 == SHAPELESS && c2 == SHAPED) return 1; if (c1 == SHAPED && c2 == SHAPELESS) return -1; if (r2.getRecipeSize() < r1.getRecipeSize()) return -1; - if (r2.getRecipeSize() > r1.getRecipeSize()) return 1; + if (r2.getRecipeSize() > r1.getRecipeSize()) return 1; return getPriority(r2) - getPriority(r1); // high priority value first! } @@ -208,7 +208,7 @@ if (ret != null) { priorities.put(recipe.getClass(), ret); - FMLLog.fine(" Parent Found: %d - %s", ret.intValue(), cls.getName()); + FMLLog.fine(" Parent Found: %d - %s", ret.intValue(), cls.getName()); return ret.intValue(); } } diff --git a/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java b/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java index 0f10ad3..108f6f0 100644 --- a/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java +++ b/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java @@ -25,8 +25,8 @@ private int height = 0; private boolean mirrored = true; - public ShapedOreRecipe(Block result, Object... recipe){ this(new ItemStack(result), recipe); } - public ShapedOreRecipe(Item result, Object... recipe){ this(new ItemStack(result), recipe); } + public ShapedOreRecipe(Block result, Object... recipe){ this(new ItemStack(result), recipe); } + public ShapedOreRecipe(Item result, Object... recipe){ this(new ItemStack(result), recipe); } public ShapedOreRecipe(ItemStack result, Object... recipe) { output = result.copy(); diff --git a/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java b/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java index cf9b301..82545cf 100644 --- a/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java +++ b/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java @@ -20,7 +20,7 @@ private ArrayList input = new ArrayList(); public ShapelessOreRecipe(Block result, Object... recipe){ this(new ItemStack(result), recipe); } - public ShapelessOreRecipe(Item result, Object... recipe){ this(new ItemStack(result), recipe); } + public ShapelessOreRecipe(Item result, Object... recipe){ this(new ItemStack(result), recipe); } public ShapelessOreRecipe(ItemStack result, Object... recipe) {