From 28ff001cc0d15a22faa27731e07a597396a9bfdd Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Mon, 22 Sep 2014 22:01:24 -0700 Subject: [PATCH] Move FML to net.minecraft.fml package. --- fml/build.gradle | 4 +- fml/eclipse-workspace-dev.zip | Bin 19651 -> 19684 bytes .../com/example/examplemod/ExampleMod.java | 6 +- fml/jsons/1.8-dev.json | 2 +- fml/jsons/1.8-rel.json | 120 ++++++++++++++++++ .../net/minecraft/block/Block.java.patch | 6 +- .../client/ClientBrandRetriever.java.patch | 2 +- .../client/LoadingScreenRenderer.java.patch | 2 +- .../net/minecraft/client/Minecraft.java.patch | 52 ++++---- .../client/gui/GuiIngameMenu.java.patch | 2 +- .../client/gui/GuiMainMenu.java.patch | 4 +- .../client/gui/GuiMultiplayer.java.patch | 4 +- .../client/gui/GuiOverlayDebug.java.patch | 2 +- .../client/gui/GuiSelectWorld.java.patch | 2 +- .../gui/ServerListEntryNormal.java.patch | 4 +- .../NetHandlerHandshakeMemory.java.patch | 2 +- .../network/NetHandlerLoginClient.java.patch | 4 +- .../client/network/OldServerPinger.java.patch | 2 +- .../renderer/entity/RenderVillager.java.patch | 2 +- .../resources/LanguageManager.java.patch | 2 +- .../client/settings/GameSettings.java.patch | 2 +- .../minecraft/crash/CrashReport.java.patch | 2 +- .../minecraft/entity/EntityList.java.patch | 2 +- .../minecraft/entity/EntityTracker.java.patch | 2 +- .../entity/EntityTrackerEntry.java.patch | 4 +- .../entity/boss/IBossDisplayData.java.patch | 4 +- .../entity/item/EntityItem.java.patch | 2 +- .../entity/passive/EntityVillager.java.patch | 2 +- .../entity/player/EntityPlayer.java.patch | 6 +- .../inventory/SlotCrafting.java.patch | 2 +- .../inventory/SlotFurnaceOutput.java.patch | 2 +- .../net/minecraft/item/Item.java.patch | 6 +- .../net/minecraft/item/ItemStack.java.patch | 2 +- .../network/NetworkManager.java.patch | 6 +- .../network/NetworkSystem.java.patch | 2 +- .../network/ServerStatusResponse.java.patch | 4 +- .../minecraft/realms/RealmsConnect.java.patch | 2 +- .../server/MinecraftServer.java.patch | 30 ++--- .../dedicated/DedicatedServer.java.patch | 8 +- .../integrated/IntegratedServer.java.patch | 4 +- .../ServerConfigurationManager.java.patch | 8 +- .../network/NetHandlerHandshakeTCP.java.patch | 2 +- .../network/NetHandlerLoginServer.java.patch | 4 +- .../tileentity/TileEntity.java.patch | 2 +- .../tileentity/TileEntityFurnace.java.patch | 2 +- .../util/ResourceLocation.java.patch | 4 +- .../minecraft/util/StringTranslate.java.patch | 24 +--- .../chunk/storage/AnvilChunkLoader.java.patch | 4 +- .../world/gen/ChunkProviderServer.java.patch | 2 +- .../StructureVillagePieces.java.patch | 4 +- .../world/storage/SaveHandler.java.patch | 14 +- ...CustomModLoadingErrorDisplayException.java | 8 +- .../fml/client/ExtendedServerListData.java | 2 +- .../fml/client/FMLClientHandler.java | 47 ++++--- .../fml/client/FMLConfigGuiFactory.java | 16 +-- .../fml/client/FMLFileResourcePack.java | 8 +- .../fml/client/FMLFolderResourcePack.java | 8 +- .../fml/client/GuiAccessDenied.java | 2 +- .../fml/client/GuiBackupFailed.java | 2 +- .../fml/client/GuiConfirmation.java | 4 +- .../GuiCustomModLoadingErrorScreen.java | 2 +- .../fml/client/GuiDupesFound.java | 6 +- .../fml/client/GuiIngameModOptions.java | 2 +- .../fml/client/GuiModList.java | 11 +- .../fml/client/GuiModOptionList.java | 2 +- .../fml/client/GuiModsMissing.java | 8 +- .../fml/client/GuiModsMissingForServer.java | 6 +- .../fml/client/GuiNotification.java | 4 +- .../fml/client/GuiOldSaveLoadConfirm.java | 11 +- .../fml/client/GuiScrollingList.java | 2 +- .../fml/client/GuiSlotModList.java | 9 +- .../fml/client/GuiSortingProblem.java | 8 +- .../fml/client/GuiWrongMinecraft.java | 6 +- .../fml/client/IModGuiFactory.java | 2 +- .../fml/client/config/ConfigGuiType.java | 2 +- .../fml/client/config/DummyConfigElement.java | 7 +- .../fml/client/config/GuiButtonExt.java | 2 +- .../fml/client/config/GuiCheckBox.java | 2 +- .../fml/client/config/GuiConfig.java | 21 ++- .../fml/client/config/GuiConfigEntries.java | 13 +- .../fml/client/config/GuiEditArray.java | 6 +- .../client/config/GuiEditArrayEntries.java | 11 +- .../fml/client/config/GuiMessageDialog.java | 2 +- .../fml/client/config/GuiSelectString.java | 7 +- .../client/config/GuiSelectStringEntries.java | 4 +- .../fml/client/config/GuiSlider.java | 2 +- .../client/config/GuiUnicodeGlyphButton.java | 2 +- .../fml/client/config/GuiUtils.java | 2 +- .../fml/client/config/HoverChecker.java | 2 +- .../fml/client/config/IConfigElement.java | 6 +- .../fml/client/event/ConfigChangedEvent.java | 6 +- .../fml/client/registry/ClientRegistry.java | 4 +- .../client/registry/RenderingRegistry.java | 2 +- .../minecraftforge}/fml/common/API.java | 2 +- .../fml/common/BukkitPluginRef.java | 2 +- .../fml/common/BukkitProxy.java | 2 +- .../fml/common/CertificateHelper.java | 2 +- .../fml/common/DummyModContainer.java | 10 +- .../common/DuplicateModsFoundException.java | 2 +- .../fml/common/FMLCommonHandler.java | 19 ++- .../fml/common/FMLContainer.java | 23 ++-- .../minecraftforge}/fml/common/FMLLog.java | 4 +- .../fml/common/FMLModContainer.java | 34 ++--- .../minecraftforge}/fml/common/IASMHook.java | 2 +- .../fml/common/ICrashCallable.java | 2 +- .../fml/common/IFMLHandledException.java | 2 +- .../fml/common/IFMLSidedHandler.java | 6 +- .../fml/common/IFuelHandler.java | 2 +- .../fml/common/ILanguageAdapter.java | 7 +- .../fml/common/IWorldGenerator.java | 2 +- .../fml/common/InjectedModContainer.java | 8 +- .../fml/common/LoadController.java | 20 +-- .../minecraftforge}/fml/common/Loader.java | 44 +++---- .../fml/common/LoaderException.java | 2 +- .../fml/common/LoaderState.java | 26 ++-- .../fml/common/MCPDummyContainer.java | 2 +- .../fml/common/MetadataCollection.java | 8 +- .../fml/common/MinecraftDummyContainer.java | 6 +- .../fml/common/MissingModsException.java | 4 +- .../minecraftforge}/fml/common/Mod.java | 32 ++--- .../fml/common/ModAPIManager.java | 24 ++-- .../fml/common/ModClassLoader.java | 10 +- .../fml/common/ModContainer.java | 8 +- .../fml/common/ModContainerFactory.java | 10 +- .../fml/common/ModMetadata.java | 8 +- .../common/ObfuscationReflectionHelper.java | 13 +- .../minecraftforge}/fml/common/Optional.java | 2 +- .../fml/common/ProxyInjector.java | 11 +- .../fml/common/SaveInspectionHandler.java | 2 +- .../fml/common/SidedProxy.java | 2 +- .../fml/common/StartupQuery.java | 2 +- .../fml/common/TracingPrintStream.java | 2 +- .../fml/common/WorldAccessContainer.java | 2 +- .../WrongMinecraftVersionException.java | 2 +- .../fml/common/ZipperUtil.java | 2 +- .../fml/common/asm/FMLSanityChecker.java | 20 +-- .../fml/common/asm/ReobfuscationMarker.java | 2 +- .../asm/transformers/AccessTransformer.java | 5 +- .../DeobfuscationTransformer.java | 7 +- .../EventSubscriptionTransformer.java | 9 +- .../transformers/ItemStackTransformer.java | 2 +- .../asm/transformers/MarkerTransformer.java | 2 +- .../asm/transformers/ModAPITransformer.java | 19 ++- .../transformers/ModAccessTransformer.java | 6 +- .../asm/transformers/PatchingTransformer.java | 4 +- .../asm/transformers/SideTransformer.java | 7 +- .../asm/transformers/TerminalTransformer.java | 8 +- .../deobf/FMLDeobfuscatingRemapper.java | 7 +- .../deobf/FMLRemappingAdapter.java | 2 +- .../transformers/deobf/LZMAInputSupplier.java | 2 +- .../fml/common/discovery/ASMDataTable.java | 6 +- .../fml/common/discovery/ContainerType.java | 6 +- .../common/discovery/DirectoryDiscoverer.java | 16 +-- .../fml/common/discovery/ITypeDiscoverer.java | 4 +- .../fml/common/discovery/JarDiscoverer.java | 18 +-- .../fml/common/discovery/ModCandidate.java | 10 +- .../fml/common/discovery/ModDiscoverer.java | 20 +-- .../common/discovery/asm/ASMModParser.java | 12 +- .../common/discovery/asm/ModAnnotation.java | 6 +- .../discovery/asm/ModAnnotationVisitor.java | 2 +- .../common/discovery/asm/ModClassVisitor.java | 2 +- .../common/discovery/asm/ModFieldVisitor.java | 2 +- .../discovery/asm/ModMethodVisitor.java | 2 +- .../common/event/FMLConstructionEvent.java | 10 +- .../fml/common/event/FMLEvent.java | 4 +- .../event/FMLFingerprintViolationEvent.java | 2 +- .../common/event/FMLInitializationEvent.java | 4 +- .../fml/common/event/FMLInterModComms.java | 15 +-- .../common/event/FMLLoadCompleteEvent.java | 4 +- .../fml/common/event/FMLLoadEvent.java | 2 +- .../common/event/FMLMissingMappingsEvent.java | 9 +- .../fml/common/event/FMLModDisabledEvent.java | 2 +- .../common/event/FMLModIdMappingEvent.java | 2 +- .../event/FMLPostInitializationEvent.java | 8 +- .../event/FMLPreInitializationEvent.java | 14 +- .../event/FMLServerAboutToStartEvent.java | 4 +- .../common/event/FMLServerStartedEvent.java | 4 +- .../common/event/FMLServerStartingEvent.java | 4 +- .../common/event/FMLServerStoppedEvent.java | 4 +- .../common/event/FMLServerStoppingEvent.java | 4 +- .../fml/common/event/FMLStateEvent.java | 8 +- .../common/eventhandler/ASMEventHandler.java | 5 +- .../fml/common/eventhandler/Cancelable.java | 2 +- .../fml/common/eventhandler/Event.java | 2 +- .../fml/common/eventhandler/EventBus.java | 10 +- .../common/eventhandler/EventPriority.java | 2 +- .../eventhandler/IEventExceptionHandler.java | 2 +- .../common/eventhandler/IEventListener.java | 2 +- .../fml/common/eventhandler/ListenerList.java | 2 +- .../common/eventhandler/SubscribeEvent.java | 2 +- .../ArtifactVersionNameFunction.java | 6 +- .../functions/CollectionWrapperFactory.java | 2 +- .../functions/GenericIterableFactory.java | 2 +- .../fml/common/functions/ModIdFunction.java | 6 +- .../fml/common/functions/ModNameFunction.java | 6 +- .../common/functions/TypeCastFunction.java | 2 +- .../fml/common/gameevent/InputEvent.java | 4 +- .../fml/common/gameevent/PlayerEvent.java | 4 +- .../fml/common/gameevent/TickEvent.java | 6 +- .../fml/common/launcher/FMLDeobfTweaker.java | 17 ++- .../FMLInjectionAndSortingTweaker.java | 7 +- .../fml/common/launcher/FMLServerTweaker.java | 10 +- .../fml/common/launcher/FMLTweaker.java | 13 +- .../fml/common/launcher/TerminalTweaker.java | 4 +- .../fml/common/launcher/Yggdrasil.java | 2 +- .../fml/common/network/ByteBufUtils.java | 2 +- .../common/network/FMLEmbeddedChannel.java | 14 +- .../fml/common/network/FMLEventChannel.java | 14 +- .../FMLIndexedMessageToMessageCodec.java | 7 +- .../fml/common/network/FMLNetworkEvent.java | 10 +- .../common/network/FMLNetworkException.java | 2 +- .../common/network/FMLOutboundHandler.java | 15 ++- .../fml/common/network/IGuiHandler.java | 2 +- .../common/network/NetworkCheckHandler.java | 5 +- .../network/NetworkEventFiringHandler.java | 8 +- .../network/NetworkHandshakeEstablished.java | 6 +- .../fml/common/network/NetworkRegistry.java | 24 ++-- .../common/network/PacketLoggingHandler.java | 4 +- .../handshake/ChannelRegistrationHandler.java | 14 +- .../handshake/FMLHandshakeClientState.java | 17 +-- .../network/handshake/FMLHandshakeCodec.java | 4 +- .../handshake/FMLHandshakeMessage.java | 13 +- .../handshake/FMLHandshakeServerState.java | 16 +-- .../network/handshake/HandshakeInjector.java | 4 +- .../handshake/HandshakeMessageHandler.java | 6 +- .../network/handshake/IHandshakeState.java | 2 +- .../network/handshake/NetworkDispatcher.java | 24 ++-- .../network/internal/EntitySpawnHandler.java | 23 ++-- .../common/network/internal/FMLMessage.java | 16 +-- .../network/internal/FMLNetworkHandler.java | 38 +++--- .../network/internal/FMLProxyPacket.java | 13 +- .../network/internal/FMLRuntimeCodec.java | 12 +- .../internal/HandshakeCompletionHandler.java | 10 +- .../network/internal/NetworkModHolder.java | 23 ++-- .../network/internal/OpenGuiHandler.java | 9 +- .../common/network/simpleimpl/IMessage.java | 2 +- .../network/simpleimpl/IMessageHandler.java | 4 +- .../network/simpleimpl/MessageContext.java | 4 +- .../SimpleChannelHandlerWrapper.java | 10 +- .../simpleimpl/SimpleIndexedCodec.java | 4 +- .../simpleimpl/SimpleNetworkWrapper.java | 14 +- .../fml/common/patcher/ClassPatch.java | 2 +- .../fml/common/patcher/ClassPatchManager.java | 10 +- .../fml/common/patcher/GenDiffSet.java | 9 +- .../fml/common/registry/EntityRegistry.java | 13 +- .../ExistingSubstitutionException.java | 2 +- .../FMLControlledNamespacedRegistry.java | 7 +- .../fml/common/registry/GameData.java | 23 ++-- .../fml/common/registry/GameRegistry.java | 17 ++- .../registry/IEntityAdditionalSpawnData.java | 2 +- .../fml/common/registry/IThrowableEntity.java | 2 +- .../IncompatibleSubstitutionException.java | 2 +- .../fml/common/registry/LanguageRegistry.java | 14 +- .../fml/common/registry/ObjectHolderRef.java | 9 +- .../common/registry/ObjectHolderRegistry.java | 12 +- .../fml/common/registry/RegistryDelegate.java | 2 +- .../fml/common/registry/VillagerRegistry.java | 9 +- .../fml/common/toposort/ModSorter.java | 16 +-- .../common/toposort/ModSortingException.java | 2 +- .../fml/common/toposort/TopologicalSort.java | 6 +- .../common/versioning/ArtifactVersion.java | 2 +- .../common/versioning/ComparableVersion.java | 2 +- .../versioning/DefaultArtifactVersion.java | 2 +- .../InvalidVersionSpecificationException.java | 2 +- .../fml/common/versioning/Restriction.java | 2 +- .../fml/common/versioning/VersionParser.java | 9 +- .../fml/common/versioning/VersionRange.java | 2 +- .../fml/relauncher/CoreModManager.java | 35 ++--- .../fml/relauncher/FMLCorePlugin.java | 14 +- .../fml/relauncher/FMLInjectionData.java | 2 +- .../fml/relauncher/FMLLaunchHandler.java | 12 +- .../fml/relauncher/FMLRelaunchLog.java | 6 +- .../fml/relauncher/FMLSecurityManager.java | 4 +- .../fml/relauncher/FileListHelper.java | 2 +- .../fml/relauncher/IFMLCallHook.java | 2 +- .../fml/relauncher/IFMLLoadingPlugin.java | 2 +- .../fml/relauncher/ModListHelper.java | 2 +- .../fml/relauncher/ReflectionHelper.java | 2 +- .../fml/relauncher/ServerLaunchWrapper.java | 4 +- .../minecraftforge}/fml/relauncher/Side.java | 2 +- .../fml/relauncher/SideOnly.java | 4 +- .../delta/ByteBufferSeekableSource.java | 2 +- .../repackage/com/nothome/delta/Checksum.java | 2 +- .../com/nothome/delta/DebugDiffWriter.java | 2 +- .../repackage/com/nothome/delta/Delta.java | 2 +- .../com/nothome/delta/DiffWriter.java | 2 +- .../com/nothome/delta/GDiffPatcher.java | 24 ++-- .../com/nothome/delta/GDiffWriter.java | 2 +- .../com/nothome/delta/PatchException.java | 2 +- .../delta/RandomAccessFileSeekableSource.java | 2 +- .../com/nothome/delta/SeekableSource.java | 2 +- .../fml/server/FMLServerHandler.java | 29 ++--- .../fml/test/TestNetStuff.java | 6 +- .../fml/test/simplenet/SimpleNetHandler1.java | 6 +- .../fml/test/simplenet/SimpleNetHandler2.java | 6 +- .../test/simplenet/SimpleNetTestMessage1.java | 4 +- .../test/simplenet/SimpleNetTestMessage2.java | 4 +- .../fml/test/simplenet/SimpleNetTester.java | 9 +- 298 files changed, 1188 insertions(+), 1060 deletions(-) create mode 100644 fml/jsons/1.8-rel.json rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/CustomModLoadingErrorDisplayException.java (91%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/ExtendedServerListData.java (92%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/FMLClientHandler.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/FMLConfigGuiFactory.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/FMLFileResourcePack.java (92%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/FMLFolderResourcePack.java (93%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiAccessDenied.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiBackupFailed.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiConfirmation.java (90%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiCustomModLoadingErrorScreen.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiDupesFound.java (91%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiIngameModOptions.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiModList.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiModOptionList.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiModsMissing.java (90%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiModsMissingForServer.java (93%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiNotification.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiOldSaveLoadConfirm.java (93%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiScrollingList.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiSlotModList.java (93%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiSortingProblem.java (87%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/GuiWrongMinecraft.java (92%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/IModGuiFactory.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/ConfigGuiType.java (91%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/DummyConfigElement.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/GuiButtonExt.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/GuiCheckBox.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/GuiConfig.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/GuiConfigEntries.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/GuiEditArray.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/GuiEditArrayEntries.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/GuiMessageDialog.java (93%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/GuiSelectString.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/GuiSelectStringEntries.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/GuiSlider.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/GuiUnicodeGlyphButton.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/GuiUtils.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/HoverChecker.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/config/IConfigElement.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/event/ConfigChangedEvent.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/registry/ClientRegistry.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/client/registry/RenderingRegistry.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/API.java (89%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/BukkitPluginRef.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/BukkitProxy.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/CertificateHelper.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/DummyModContainer.java (93%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/DuplicateModsFoundException.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/FMLCommonHandler.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/FMLContainer.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/FMLLog.java (92%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/FMLModContainer.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/IASMHook.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/ICrashCallable.java (92%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/IFMLHandledException.java (91%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/IFMLSidedHandler.java (90%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/IFuelHandler.java (92%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/ILanguageAdapter.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/IWorldGenerator.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/InjectedModContainer.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/LoadController.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/Loader.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/LoaderException.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/LoaderState.java (79%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/MCPDummyContainer.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/MetadataCollection.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/MinecraftDummyContainer.java (84%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/MissingModsException.java (86%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/Mod.java (91%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/ModAPIManager.java (91%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/ModClassLoader.java (90%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/ModContainer.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/ModContainerFactory.java (93%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/ModMetadata.java (92%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/ObfuscationReflectionHelper.java (91%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/Optional.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/ProxyInjector.java (93%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/SaveInspectionHandler.java (91%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/SidedProxy.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/StartupQuery.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/TracingPrintStream.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/WorldAccessContainer.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/WrongMinecraftVersionException.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/ZipperUtil.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/asm/FMLSanityChecker.java (93%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/asm/ReobfuscationMarker.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/asm/transformers/AccessTransformer.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/asm/transformers/DeobfuscationTransformer.java (87%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/asm/transformers/EventSubscriptionTransformer.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/asm/transformers/ItemStackTransformer.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/asm/transformers/MarkerTransformer.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/asm/transformers/ModAPITransformer.java (90%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/asm/transformers/ModAccessTransformer.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/asm/transformers/PatchingTransformer.java (72%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/asm/transformers/SideTransformer.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/asm/transformers/TerminalTransformer.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/asm/transformers/deobf/LZMAInputSupplier.java (93%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/discovery/ASMDataTable.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/discovery/ContainerType.java (90%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/discovery/DirectoryDiscoverer.java (91%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/discovery/ITypeDiscoverer.java (86%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/discovery/JarDiscoverer.java (91%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/discovery/ModCandidate.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/discovery/ModDiscoverer.java (92%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/discovery/asm/ASMModParser.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/discovery/asm/ModAnnotation.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/discovery/asm/ModAnnotationVisitor.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/discovery/asm/ModClassVisitor.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/discovery/asm/ModFieldVisitor.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/discovery/asm/ModMethodVisitor.java (93%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLConstructionEvent.java (85%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLEvent.java (85%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLFingerprintViolationEvent.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLInitializationEvent.java (85%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLInterModComms.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLLoadCompleteEvent.java (85%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLLoadEvent.java (89%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLMissingMappingsEvent.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLModDisabledEvent.java (55%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLModIdMappingEvent.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLPostInitializationEvent.java (88%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLPreInitializationEvent.java (91%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLServerAboutToStartEvent.java (88%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLServerStartedEvent.java (85%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLServerStartingEvent.java (91%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLServerStoppedEvent.java (85%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLServerStoppingEvent.java (85%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/event/FMLStateEvent.java (75%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/eventhandler/ASMEventHandler.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/eventhandler/Cancelable.java (83%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/eventhandler/Event.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/eventhandler/EventBus.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/eventhandler/EventPriority.java (90%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/eventhandler/IEventExceptionHandler.java (92%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/eventhandler/IEventListener.java (59%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/eventhandler/ListenerList.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/eventhandler/SubscribeEvent.java (88%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/functions/ArtifactVersionNameFunction.java (66%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/functions/CollectionWrapperFactory.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/functions/GenericIterableFactory.java (84%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/functions/ModIdFunction.java (85%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/functions/ModNameFunction.java (85%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/functions/TypeCastFunction.java (86%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/gameevent/InputEvent.java (61%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/gameevent/PlayerEvent.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/gameevent/TickEvent.java (92%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/launcher/FMLDeobfTweaker.java (73%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/launcher/FMLInjectionAndSortingTweaker.java (87%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/launcher/FMLServerTweaker.java (66%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/launcher/FMLTweaker.java (92%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/launcher/TerminalTweaker.java (79%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/launcher/Yggdrasil.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/ByteBufUtils.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/FMLEmbeddedChannel.java (87%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/FMLEventChannel.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/FMLIndexedMessageToMessageCodec.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/FMLNetworkEvent.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/FMLNetworkException.java (93%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/FMLOutboundHandler.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/IGuiHandler.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/NetworkCheckHandler.java (92%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/NetworkEventFiringHandler.java (88%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/NetworkHandshakeEstablished.java (84%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/NetworkRegistry.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/PacketLoggingHandler.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/handshake/ChannelRegistrationHandler.java (83%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/handshake/FMLHandshakeClientState.java (92%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/handshake/FMLHandshakeCodec.java (87%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/handshake/FMLHandshakeMessage.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/handshake/FMLHandshakeServerState.java (88%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/handshake/HandshakeInjector.java (83%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/handshake/HandshakeMessageHandler.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/handshake/IHandshakeState.java (73%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/handshake/NetworkDispatcher.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/internal/EntitySpawnHandler.java (86%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/internal/FMLMessage.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/internal/FMLNetworkHandler.java (87%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/internal/FMLProxyPacket.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/internal/FMLRuntimeCodec.java (82%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/internal/HandshakeCompletionHandler.java (76%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/internal/NetworkModHolder.java (92%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/internal/OpenGuiHandler.java (78%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/simpleimpl/IMessage.java (88%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/simpleimpl/IMessageHandler.java (86%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/simpleimpl/MessageContext.java (90%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java (87%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/simpleimpl/SimpleIndexedCodec.java (77%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/network/simpleimpl/SimpleNetworkWrapper.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/patcher/ClassPatch.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/patcher/ClassPatchManager.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/patcher/GenDiffSet.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/registry/EntityRegistry.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/registry/ExistingSubstitutionException.java (81%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/registry/FMLControlledNamespacedRegistry.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/registry/GameData.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/registry/GameRegistry.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/registry/IEntityAdditionalSpawnData.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/registry/IThrowableEntity.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/registry/IncompatibleSubstitutionException.java (83%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/registry/LanguageRegistry.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/registry/ObjectHolderRef.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/registry/ObjectHolderRegistry.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/registry/RegistryDelegate.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/registry/VillagerRegistry.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/toposort/ModSorter.java (91%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/toposort/ModSortingException.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/toposort/TopologicalSort.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/versioning/ArtifactVersion.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/versioning/ComparableVersion.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/versioning/DefaultArtifactVersion.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/versioning/InvalidVersionSpecificationException.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/versioning/Restriction.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/versioning/VersionParser.java (93%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/common/versioning/VersionRange.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/relauncher/CoreModManager.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/relauncher/FMLCorePlugin.java (61%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/relauncher/FMLInjectionData.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/relauncher/FMLLaunchHandler.java (89%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/relauncher/FMLRelaunchLog.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/relauncher/FMLSecurityManager.java (75%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/relauncher/FileListHelper.java (94%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/relauncher/IFMLCallHook.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/relauncher/IFMLLoadingPlugin.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/relauncher/ModListHelper.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/relauncher/ReflectionHelper.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/relauncher/ServerLaunchWrapper.java (91%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/relauncher/Side.java (95%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/relauncher/SideOnly.java (93%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/repackage/com/nothome/delta/Checksum.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/repackage/com/nothome/delta/DebugDiffWriter.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/repackage/com/nothome/delta/Delta.java (99%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/repackage/com/nothome/delta/DiffWriter.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/repackage/com/nothome/delta/GDiffPatcher.java (88%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/repackage/com/nothome/delta/GDiffWriter.java (98%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/repackage/com/nothome/delta/PatchException.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java (97%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/repackage/com/nothome/delta/SeekableSource.java (96%) rename fml/src/main/java/{cpw/mods => net/minecraftforge}/fml/server/FMLServerHandler.java (89%) rename fml/src/test/java/{cpw/mods => net/minecraftforge}/fml/test/TestNetStuff.java (98%) rename fml/src/test/java/{cpw/mods => net/minecraftforge}/fml/test/simplenet/SimpleNetHandler1.java (57%) rename fml/src/test/java/{cpw/mods => net/minecraftforge}/fml/test/simplenet/SimpleNetHandler2.java (57%) rename fml/src/test/java/{cpw/mods => net/minecraftforge}/fml/test/simplenet/SimpleNetTestMessage1.java (66%) rename fml/src/test/java/{cpw/mods => net/minecraftforge}/fml/test/simplenet/SimpleNetTestMessage2.java (66%) rename fml/src/test/java/{cpw/mods => net/minecraftforge}/fml/test/simplenet/SimpleNetTester.java (67%) diff --git a/fml/build.gradle b/fml/build.gradle index 1983cb5b7d..47af8e986f 100644 --- a/fml/build.gradle +++ b/fml/build.gradle @@ -33,8 +33,8 @@ minecraft { mcpVersion = '9.10' mappings = 'snapshot_nodoc_20140916' fmlDir = projectDir.getAbsolutePath(); - mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper' - tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker' + mainClass = 'net.minecraftforge.fml.relauncher.ServerLaunchWrapper' + tweakClass = 'net.minecraftforge.fml.common.launcher.FMLTweaker' installerVersion = "1.4" } diff --git a/fml/eclipse-workspace-dev.zip b/fml/eclipse-workspace-dev.zip index e3b721dd8ea8aad1573fdc245d4dd20c18807c29..4401ff364f70fc9a7fcf476d9fd961ed89d91589 100644 GIT binary patch delta 1619 zcmZux2{hDO9G)4w82dg#G4>^iG?QAEEb%I)o?g$%d%b(k?|kQ;^ZUMg@A-b;ZOsHPWP&U6cQ7itI}|B)Q99BLP=$)q z@M;f2o^1f*=rx9TaGK%*X(5+^1Jfkk0_~@$cDE3}w|F+Ox%w83aNC9&$RsIYlAD zga$7mheCHp4o`We`((k(%MzqaHQS1sZ_T)qN#jt#pBbx&&w`51G`3Hnb(4(G z59s~st7xRXJ4vfvlJd^Uz~InvpdQZ#ENkux^Dfq92jH|QOg^!RQuJw(vYU6nt78#r zi4%b-D{X#CWg0aPrBlmbgYCV;(FD0U4362sA*wz9v90ZLR;*-3@J}04-Cip(Djvhe znavcnVh!PU(kNo>{i5|SEptRbw(Mlm&yn9MHRlHvg^jX{zO8|jsbJcO3PfPlJfe$Rdm8XxvI_mLj4FpZ^f@Pj7 zdd&iw5k;nS%516|y%7=$!4Q)pytF#=DLP_pt(T)@xmsJ@?g}$dErS&?>WBn{skrl7 zc4)Ah63pI7JQ`%`^dWY9AC~o?iB)8Ku=vTu5YIUk{rXl>o10gI!qE62_(n3(|n2tO4)(7|5|d=bDnT7ca)iCru#`N=mfrTtx!J zw|VVnvz5(dMTtQi7Q-V2_juy5d9#kZTA9~t;P9>B5--fP4ha{LyG9@{%I>)pyil0P zrKjqJX`w3BCN@)2RXz)N`^AR>#7gtzVpf}Qc?Rf?xhLQBxI=;Ts& zw0@LWU-n$H0>wh#m2~@xlpo5kCsy;;%Je7MdZK)!{_`U27fAJtN~QRJ{yvf^9vS+MvM@eb9bV0cA57BtjlA1j_&eCWn9-IbPtVnG6E1{f)Jc2U$M^ z8YH`y`>#uSuOxt3v$Mu!hK@{MPuIbI)7i&^IzPQd<>gzN90_~{X$^ZZW delta 1577 zcmZWp2{hDO9G*dCXEfROW^6Gr$vU<(#LQ@{S@S|EYlxoZ#S~eR{m)25^ulDxE@Ti1 zF=#Af7xhADn|RN7=1uS9J@0kTx#xG!y}#dgzjJ@zci-fKyK=$R#c)3REFwB5(wiO# z27zLM$8Zk<1Sa7m2&HA2b@|v~-MAavrV-d==4>q|7X-CX>2q;ztK^GICE+Qy`b`ga zrEhgimFz;&3d!1;FE!I4i2cS@`_rV+q>1~ls-wfA9kT1K{l|w_%`U_hQJUDB`lI5s z#1<`+X0B)!>eZ9zkruwEymAmeci!1n*K!d(pS2K%b&o2)V5Ucobx7%CSnIY-POUsF| z{Tg?_Udmqov>UFSwnoSC_En_P==usj$bwD~H%-n^}>kT>kE$;ZR&)+Q6OoJ!|s zrc93$p0HKUEs^Rkk6OG^$Mo{sZ@h&ym&TIw-anUDR*1iQq@R>GhM4DGzkJ+qzQLK6 zk1W_;i}J8jLP5BX$+W?n@*V;CD1lyd={!D9YVn;!`X>rSZdvP4J2SbRdC(fi&H)91 zK%Af}jv8oVZ__~(>*f2{Kp=D0E+W9IE>AHD48gP7GPmTF*v&dT$^inI0UmH|U>L&z z7-0Aa5ADtcQq=_s=8O7H!i#E~+?;YXNV5P3J)#!Yj#eN)5qzR4Rm#8AE$;V?vrJXn z?jCf6e&L5`!dmOg@)y{mlxn>A>tD*`Jgd>ZqlCZ^jX)3ghfa*-OLm-rbrK&H4PTl~_BmM9S)HhH|{+TuBG z0~aAWD@%?&qhftK)m$SZ?Hd~^s^T6Rd?x2{$)Z6Zs)6Bp;*QbSWRy_b{gy4EyjUkf zjue^j^rUsF;vwmso4j+F_xD2cGpD<_s3#ILL-nv-Is()YRI0*c1)MjAdbUXVkHnac zzyq!V&=CGlkvJ7Qo!Sa0%I1t%R1Am4$G}Oly_2_RKF>R3ov?W4^JbyIViRJ5GqG`% za)7a0F{V$7=(7oOG}uJUMI~-!=$mj6-q{7s33%BxAwYWD1V+OaIR4Mdbr<$C#G(V{z7=sohBe6~U zsIRpH*U~a}R8r89Hod3GLxmQa{<-=%X3%qIO2+8Ytl{Q>=#W)+Yg#4Jubj&(xBY?D z1(k@I$ss%X*9;qpItewR`2W5*vbncHAiHaP0+RxExpgjJf3(Jd*^EGY_5>^~B-#8G zfe~{QP+}p6s^~zC4AxP=dvSmE4}Jx~Sa$w4WLc9>nFXTt-M(U`NQ*+k{%iMW><9co z5&r?yJoX(>N~mf@mQH4|nmuXoH@n%B00bv5sPs?1AdA3)DxiT42P**T*keG7nl$hQ mi)Sl90G&7l5RAjKEq`0y0;d8vOGj`m@W4|4;HVy}4)hnWn!D%# diff --git a/fml/install/src/main/java/com/example/examplemod/ExampleMod.java b/fml/install/src/main/java/com/example/examplemod/ExampleMod.java index 4245c7e920..82123bc37b 100644 --- a/fml/install/src/main/java/com/example/examplemod/ExampleMod.java +++ b/fml/install/src/main/java/com/example/examplemod/ExampleMod.java @@ -1,9 +1,9 @@ package com.example.examplemod; import net.minecraft.init.Blocks; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; @Mod(modid = ExampleMod.MODID, version = ExampleMod.VERSION) public class ExampleMod diff --git a/fml/jsons/1.8-dev.json b/fml/jsons/1.8-dev.json index c69f165d1e..703ad487dd 100644 --- a/fml/jsons/1.8-dev.json +++ b/fml/jsons/1.8-dev.json @@ -3,7 +3,7 @@ "time": "@timestamp@", "releaseTime": "1960-01-01T00:00:00-0700", "type": "release", - "minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker", + "minecraftArguments": "--version FML_DEV --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker", "libraries": [ { "name": "net.minecraft:launchwrapper:1.11" diff --git a/fml/jsons/1.8-rel.json b/fml/jsons/1.8-rel.json new file mode 100644 index 0000000000..7d04455820 --- /dev/null +++ b/fml/jsons/1.8-rel.json @@ -0,0 +1,120 @@ +{ +"install": { + "profileName": "@project@", + "target":"@minecraft_version@-@project@@version@", + "path":"@artifact@", + "version":"@project@ @version@", + "filePath":"@universal_jar@", + "welcome":"Welcome to the simple @project@ installer.", + "minecraft":"@minecraft_version@", + "mirrorList" : "http://files.minecraftforge.net/mirror-brand.list", + "logo":"/big_logo.png" +}, +"versionInfo": { + "id": "@minecraft_version@-@project@@version@", + "time": "@timestamp@", + "releaseTime": "1960-01-01T00:00:00-0700", + "type": "release", + "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker", + "mainClass": "net.minecraft.launchwrapper.Launch", + "minimumLauncherVersion": 14, + "assets": "1.8", + "inheritsFrom": "1.8", + "jar": "1.8", + "libraries": [ + { + "name": "@artifact@", + "url": "http://files.minecraftforge.net/maven/" + }, + { + "name": "net.minecraft:launchwrapper:1.11", + "serverreq":true + }, + { + "name": "org.ow2.asm:asm-all:5.0.3", + "serverreq":true + }, + { + "name": "com.typesafe.akka:akka-actor_2.11:2.3.3", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "com.typesafe:config:1.2.1", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang:scala-actors-migration_2.11:1.1.0", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang:scala-compiler:2.11.1", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang:scala-library:2.11.1", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang:scala-reflect:2.11.1", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang:scala-swing_2.11:1.0.1", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "org.scala-lang:scala-xml_2.11:1.0.2", + "url" : "http://files.minecraftforge.net/maven/", + "checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ], + "serverreq":true, + "clientreq":true + }, + { + "name": "lzma:lzma:0.0.1", + "serverreq":true + } + ] +} +} \ No newline at end of file diff --git a/fml/patches/minecraft/net/minecraft/block/Block.java.patch b/fml/patches/minecraft/net/minecraft/block/Block.java.patch index 83e8d09f5f..2fc80defda 100644 --- a/fml/patches/minecraft/net/minecraft/block/Block.java.patch +++ b/fml/patches/minecraft/net/minecraft/block/Block.java.patch @@ -5,7 +5,7 @@ { private static final ResourceLocation field_176230_a = new ResourceLocation("air"); - public static final RegistryNamespacedDefaultedByKey field_149771_c = new RegistryNamespacedDefaultedByKey(field_176230_a); -+ public static final RegistryNamespacedDefaultedByKey field_149771_c = cpw.mods.fml.common.registry.GameData.getBlockRegistry(); ++ public static final RegistryNamespacedDefaultedByKey field_149771_c = net.minecraftforge.fml.common.registry.GameData.getBlockRegistry(); public static final ObjectIntIdentityMap field_176229_d = new ObjectIntIdentityMap(); private CreativeTabs field_149772_a; public static final Block.SoundType field_149769_e = new Block.SoundType("stone", 1.0F, 1.0F); @@ -13,8 +13,8 @@ private String field_149770_b; private static final String __OBFID = "CL_00000199"; -+ public final cpw.mods.fml.common.registry.RegistryDelegate delegate = -+ ((cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry)field_149771_c).getDelegate(this, Block.class); ++ public final net.minecraftforge.fml.common.registry.RegistryDelegate delegate = ++ ((net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry)field_149771_c).getDelegate(this, Block.class); + public static int func_149682_b(Block p_149682_0_) { diff --git a/fml/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch b/fml/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch index 92d47b97e1..d046aa4a52 100644 --- a/fml/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch @@ -5,6 +5,6 @@ public static String getClientModName() { - return "vanilla"; -+ return cpw.mods.fml.common.FMLCommonHandler.instance().getModName(); ++ return net.minecraftforge.fml.common.FMLCommonHandler.instance().getModName(); } } diff --git a/fml/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch b/fml/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch index 34647b6fc8..9cbf230859 100644 --- a/fml/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch @@ -6,7 +6,7 @@ + try + { -+ if (!cpw.mods.fml.client.FMLClientHandler.instance().handleLoadingScreen(scaledresolution)) //FML Don't render while FML's pre-screen is rendering ++ if (!net.minecraftforge.fml.client.FMLClientHandler.instance().handleLoadingScreen(scaledresolution)) //FML Don't render while FML's pre-screen is rendering + { Tessellator tessellator = Tessellator.func_178181_a(); WorldRenderer worldrenderer = tessellator.func_178180_c(); diff --git a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch index b101e7c48e..e2c272a11a 100644 --- a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -1,38 +1,38 @@ --- ../src-base/minecraft/net/minecraft/client/Minecraft.java +++ ../src-work/minecraft/net/minecraft/client/Minecraft.java -@@ -410,7 +410,7 @@ +@@ -411,7 +411,7 @@ this.field_110451_am = new SimpleReloadableResourceManager(this.field_110452_an); this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab); this.field_110451_am.func_110542_a(this.field_135017_as); - this.func_110436_a(); -+ cpw.mods.fml.client.FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am); this.field_71446_o = new TextureManager(this.field_110451_am); this.field_110451_am.func_110542_a(this.field_71446_o); this.func_180510_a(this.field_71446_o); -@@ -482,12 +482,13 @@ +@@ -483,12 +483,13 @@ this.field_71458_u = new GuiAchievement(this); GlStateManager.func_179083_b(0, 0, this.field_71443_c, this.field_71440_d); this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o); -+ cpw.mods.fml.client.FMLClientHandler.instance().finishMinecraftLoading(); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().finishMinecraftLoading(); this.func_71361_d("Post startup"); this.field_71456_v = new GuiIngame(this); if (this.field_71475_ae != null) { - this.func_147108_a(new GuiConnecting(new GuiMainMenu(), this, this.field_71475_ae, this.field_71477_af)); -+ cpw.mods.fml.client.FMLClientHandler.instance().connectToServerAtStartup(this.field_71475_ae, this.field_71477_af); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().connectToServerAtStartup(this.field_71475_ae, this.field_71477_af); } else { -@@ -503,6 +504,7 @@ +@@ -504,6 +505,7 @@ this.func_71352_k(); } -+ cpw.mods.fml.client.FMLClientHandler.instance().onInitializationComplete(); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().onInitializationComplete(); try { Display.setVSyncEnabled(this.field_71474_y.field_74352_v); -@@ -681,21 +683,23 @@ +@@ -682,21 +684,23 @@ File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt"); Bootstrap.func_179870_a(p_71377_1_.func_71502_e()); @@ -55,52 +55,52 @@ - System.exit(-2); + retVal = -2; } -+ cpw.mods.fml.common.FMLCommonHandler.instance().handleExit(retVal); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleExit(retVal); } public boolean func_152349_b() -@@ -1034,9 +1038,11 @@ +@@ -1035,9 +1039,11 @@ if (!this.field_71454_w) { -+ cpw.mods.fml.common.FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_74281_c); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_74281_c); this.field_71424_I.func_76318_c("gameRenderer"); this.field_71460_t.func_78480_b(this.field_71428_T.field_74281_c); this.field_71424_I.func_76319_b(); -+ cpw.mods.fml.common.FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_74281_c); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_74281_c); } this.field_71424_I.func_76319_b(); -@@ -1591,6 +1597,8 @@ +@@ -1592,6 +1598,8 @@ --this.field_71467_ac; } -+ cpw.mods.fml.common.FMLCommonHandler.instance().onPreClientTick(); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreClientTick(); + this.field_71424_I.func_76320_a("gui"); if (!this.field_71445_n) -@@ -1744,6 +1752,7 @@ +@@ -1745,6 +1753,7 @@ this.field_71462_r.func_146274_d(); } } -+ cpw.mods.fml.common.FMLCommonHandler.instance().fireMouseInput(); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().fireMouseInput(); } if (this.field_71429_W > 0) -@@ -1920,6 +1929,7 @@ +@@ -1921,6 +1930,7 @@ } } } -+ cpw.mods.fml.common.FMLCommonHandler.instance().fireKeyInput(); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().fireKeyInput(); } for (i = 0; i < 9; ++i) -@@ -2120,12 +2130,15 @@ +@@ -2121,12 +2131,15 @@ this.field_71453_ak.func_74428_b(); } -+ cpw.mods.fml.common.FMLCommonHandler.instance().onPostClientTick(); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostClientTick(); + this.field_71424_I.func_76319_b(); this.field_71423_H = func_71386_F(); @@ -108,15 +108,15 @@ public void func_71371_a(String p_71371_1_, String p_71371_2_, WorldSettings p_71371_3_) { -+ cpw.mods.fml.client.FMLClientHandler.instance().startIntegratedServer(p_71371_1_, p_71371_2_, p_71371_3_); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().startIntegratedServer(p_71371_1_, p_71371_2_, p_71371_3_); this.func_71403_a((WorldClient)null); System.gc(); ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false); -@@ -2161,6 +2174,12 @@ +@@ -2162,6 +2175,12 @@ while (!this.field_71437_Z.func_71200_ad()) { -+ if (!cpw.mods.fml.common.StartupQuery.check()) ++ if (!net.minecraftforge.fml.common.StartupQuery.check()) + { + func_71403_a(null); + func_147108_a(null); @@ -125,7 +125,7 @@ String s2 = this.field_71437_Z.func_71195_b_(); if (s2 != null) -@@ -2186,7 +2205,7 @@ +@@ -2187,7 +2206,7 @@ SocketAddress socketaddress = this.field_71437_Z.func_147137_ag().func_151270_a(); NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress); networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null)); @@ -134,11 +134,11 @@ networkmanager.func_179290_a(new C00PacketLoginStart(this.func_110432_I().func_148256_e())); this.field_71453_ak = networkmanager; } -@@ -2237,6 +2256,7 @@ +@@ -2238,6 +2257,7 @@ this.func_71351_a((ServerData)null); this.field_71455_al = false; -+ cpw.mods.fml.client.FMLClientHandler.instance().handleClientWorldClosing(this.field_71441_e); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().handleClientWorldClosing(this.field_71441_e); } this.field_147127_av.func_147690_c(); diff --git a/fml/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch index d968b09eb5..d459e649f0 100644 --- a/fml/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch @@ -17,7 +17,7 @@ this.field_146297_k.func_147108_a(new GuiShareToLan(this)); + break; + case 12: -+ cpw.mods.fml.client.FMLClientHandler.instance().showInGameModOptions(this); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().showInGameModOptions(this); + break; } } diff --git a/fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch index 7c5cc291c9..229de180d8 100644 --- a/fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch @@ -18,7 +18,7 @@ + if (p_146284_1_.field_146127_k == 6) + { -+ this.field_146297_k.func_147108_a(new cpw.mods.fml.client.GuiModList(this)); ++ this.field_146297_k.func_147108_a(new net.minecraftforge.fml.client.GuiModList(this)); + } + if (p_146284_1_.field_146127_k == 11) @@ -29,7 +29,7 @@ } - this.func_73731_b(this.field_146289_q, s, 2, this.field_146295_m - 10, -1); -+ java.util.List brandings = com.google.common.collect.Lists.reverse(cpw.mods.fml.common.FMLCommonHandler.instance().getBrandings(true)); ++ java.util.List brandings = com.google.common.collect.Lists.reverse(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(true)); + for (int i = 0; i < brandings.size(); i++) + { + String brd = brandings.get(i); diff --git a/fml/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch index 6ae5f0742f..b3e441a5e3 100644 --- a/fml/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch @@ -4,7 +4,7 @@ public GuiMultiplayer(GuiScreen p_i1040_1_) { this.field_146798_g = p_i1040_1_; -+ cpw.mods.fml.client.FMLClientHandler.instance().setupServerList(); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().setupServerList(); } public void func_73866_w_() @@ -13,7 +13,7 @@ private void func_146791_a(ServerData p_146791_1_) { - this.field_146297_k.func_147108_a(new GuiConnecting(this, this.field_146297_k, p_146791_1_)); -+ cpw.mods.fml.client.FMLClientHandler.instance().connectToServer(this, p_146791_1_); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().connectToServer(this, p_146791_1_); } public void func_146790_a(int p_146790_1_) diff --git a/fml/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch index a83260a162..dc555d6512 100644 --- a/fml/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch @@ -5,7 +5,7 @@ ArrayList arraylist = Lists.newArrayList(new String[] {String.format("Java: %s %dbit", new Object[]{System.getProperty("java.version"), Integer.valueOf(this.field_175242_a.func_147111_S() ? 64 : 32)}), String.format("Mem: % 2d%% %03d/%03dMB", new Object[]{Long.valueOf(l * 100L / i), Long.valueOf(func_175240_a(l)), Long.valueOf(func_175240_a(i))}), String.format("Allocated: % 2d%% %03dMB", new Object[]{Long.valueOf(j * 100L / i), Long.valueOf(func_175240_a(j))}), "", String.format("Display: %dx%d (%s)", new Object[]{Integer.valueOf(Display.getWidth()), Integer.valueOf(Display.getHeight()), GL11.glGetString(GL11.GL_VENDOR)}), GL11.glGetString(GL11.GL_RENDERER), GL11.glGetString(GL11.GL_VERSION)}); + arraylist.add(""); -+ arraylist.addAll(cpw.mods.fml.common.FMLCommonHandler.instance().getBrandings(false)); ++ arraylist.addAll(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(false)); + if (this.func_175236_d()) { diff --git a/fml/patches/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch index 50d6e10dda..d4be0db7ad 100644 --- a/fml/patches/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch @@ -5,7 +5,7 @@ if (this.field_146297_k.func_71359_d().func_90033_f(s)) { - this.field_146297_k.func_71371_a(s, s1, (WorldSettings)null); -+ cpw.mods.fml.client.FMLClientHandler.instance().tryLoadExistingWorld(this, s, s1); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().tryLoadExistingWorld(this, s, s1); } } } diff --git a/fml/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch index 629a05d9be..90dfde34b2 100644 --- a/fml/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch @@ -5,7 +5,7 @@ boolean flag3 = flag1 || flag2; this.field_148300_d.field_71466_p.func_78276_b(this.field_148301_e.field_78847_a, p_180790_2_ + 32 + 3, p_180790_3_ + 1, 16777215); - List list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_180790_4_ - 32 - 2); -+ List list = this.field_148300_d.field_71466_p.func_78271_c(cpw.mods.fml.client.FMLClientHandler.instance().fixDescription(this.field_148301_e.field_78843_d), p_180790_4_ - 48 - 2); ++ List list = this.field_148300_d.field_71466_p.func_78271_c(net.minecraftforge.fml.client.FMLClientHandler.instance().fixDescription(this.field_148301_e.field_78843_d), p_180790_4_ - 48 - 2); for (int l1 = 0; l1 < Math.min(list.size(), 2); ++l1) { @@ -13,7 +13,7 @@ int k2 = p_180790_6_ - p_180790_2_; int l2 = p_180790_7_ - p_180790_3_; -+ String tooltip = cpw.mods.fml.client.FMLClientHandler.instance().enhanceServerListEntry(this, this.field_148301_e, p_180790_2_, p_180790_4_, p_180790_3_, k2, l2); ++ String tooltip = net.minecraftforge.fml.client.FMLClientHandler.instance().enhanceServerListEntry(this, this.field_148301_e, p_180790_2_, p_180790_4_, p_180790_3_, k2, l2); + if (tooltip != null) + { + this.field_148303_c.func_146793_a(tooltip); diff --git a/fml/patches/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java.patch b/fml/patches/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java.patch index 42321a3713..1b37230bf0 100644 --- a/fml/patches/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java.patch @@ -4,7 +4,7 @@ public void func_147383_a(C00Handshake p_147383_1_) { -+ if (!cpw.mods.fml.common.FMLCommonHandler.instance().handleServerHandshake(p_147383_1_, this.field_147384_b)) return; ++ if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerHandshake(p_147383_1_, this.field_147384_b)) return; this.field_147384_b.func_150723_a(p_147383_1_.func_149594_c()); this.field_147384_b.func_150719_a(new NetHandlerLoginServer(this.field_147385_a, this.field_147384_b)); } diff --git a/fml/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch b/fml/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch index 5c94777025..0b265296ca 100644 --- a/fml/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch @@ -5,10 +5,10 @@ this.field_175091_e = p_147390_1_.func_179730_a(); this.field_147393_d.func_150723_a(EnumConnectionState.PLAY); - this.field_147393_d.func_150719_a(new NetHandlerPlayClient(this.field_147394_b, this.field_147395_c, this.field_147393_d, this.field_175091_e)); -+ cpw.mods.fml.common.network.internal.FMLNetworkHandler.fmlClientHandshake(this.field_147393_d); ++ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.fmlClientHandshake(this.field_147393_d); + NetHandlerPlayClient nhpc = new NetHandlerPlayClient(this.field_147394_b, this.field_147395_c, this.field_147393_d, this.field_175091_e); + this.field_147393_d.func_150719_a(nhpc); -+ cpw.mods.fml.client.FMLClientHandler.instance().setPlayClient(nhpc); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().setPlayClient(nhpc); } public void func_147231_a(IChatComponent p_147231_1_) diff --git a/fml/patches/minecraft/net/minecraft/client/network/OldServerPinger.java.patch b/fml/patches/minecraft/net/minecraft/client/network/OldServerPinger.java.patch index 7e23e00ac2..f85c95d04d 100644 --- a/fml/patches/minecraft/net/minecraft/client/network/OldServerPinger.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/network/OldServerPinger.java.patch @@ -4,7 +4,7 @@ p_147224_1_.func_147407_a((String)null); } -+ cpw.mods.fml.client.FMLClientHandler.instance().bindServerListData(p_147224_1_, serverstatusresponse); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().bindServerListData(p_147224_1_, serverstatusresponse); this.field_175092_e = Minecraft.func_71386_F(); networkmanager.func_179290_a(new C01PacketPing(this.field_175092_e)); this.field_147403_d = true; diff --git a/fml/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java.patch b/fml/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java.patch index f0d36567d5..899e6b69b7 100644 --- a/fml/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java.patch @@ -5,7 +5,7 @@ return field_110906_m; default: - return field_110903_f; -+ return cpw.mods.fml.common.registry.VillagerRegistry.getVillagerSkin(p_110775_1_.func_70946_n(), field_110903_f); ++ return net.minecraftforge.fml.common.registry.VillagerRegistry.getVillagerSkin(p_110775_1_.func_70946_n(), field_110903_f); } } diff --git a/fml/patches/minecraft/net/minecraft/client/resources/LanguageManager.java.patch b/fml/patches/minecraft/net/minecraft/client/resources/LanguageManager.java.patch index 281aaedd0b..de7ea2b62d 100644 --- a/fml/patches/minecraft/net/minecraft/client/resources/LanguageManager.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/resources/LanguageManager.java.patch @@ -4,7 +4,7 @@ } field_135049_a.func_135022_a(p_110549_1_, arraylist); -+ cpw.mods.fml.common.registry.LanguageRegistry.instance().mergeLanguageTable(field_135049_a.field_135032_a, this.field_135048_c); ++ net.minecraftforge.fml.common.registry.LanguageRegistry.instance().mergeLanguageTable(field_135049_a.field_135032_a, this.field_135048_c); StringTranslate.func_135063_a(field_135049_a.field_135032_a); } diff --git a/fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch b/fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch index 8aaa86d16c..74702821a1 100644 --- a/fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch @@ -4,7 +4,7 @@ public void func_74303_b() { -+ if (cpw.mods.fml.client.FMLClientHandler.instance().isLoading()) return; ++ if (net.minecraftforge.fml.client.FMLClientHandler.instance().isLoading()) return; try { PrintWriter printwriter = new PrintWriter(new FileWriter(this.field_74354_ai)); diff --git a/fml/patches/minecraft/net/minecraft/crash/CrashReport.java.patch b/fml/patches/minecraft/net/minecraft/crash/CrashReport.java.patch index cc885067d0..0e8441a1dc 100644 --- a/fml/patches/minecraft/net/minecraft/crash/CrashReport.java.patch +++ b/fml/patches/minecraft/net/minecraft/crash/CrashReport.java.patch @@ -4,7 +4,7 @@ return IntCache.func_85144_b(); } }); -+ cpw.mods.fml.common.FMLCommonHandler.instance().enhanceCrashReport(this, this.field_85061_c); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().enhanceCrashReport(this, this.field_85061_c); } public String func_71501_a() diff --git a/fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch b/fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch index 675eca8cba..494d91dd7d 100644 --- a/fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch +++ b/fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch @@ -22,7 +22,7 @@ + } + catch (Exception e) + { -+ cpw.mods.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e, ++ net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e, + "An Entity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author", + p_75615_0_.func_74779_i("id"), oclass.getName()); + entity = null; diff --git a/fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch b/fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch index 30f1bcaf8e..abade62f5f 100644 --- a/fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch +++ b/fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch @@ -4,7 +4,7 @@ public void func_72786_a(Entity p_72786_1_) { -+ if (cpw.mods.fml.common.registry.EntityRegistry.instance().tryTrackingEntity(this, p_72786_1_)) return; ++ if (net.minecraftforge.fml.common.registry.EntityRegistry.instance().tryTrackingEntity(this, p_72786_1_)) return; + if (p_72786_1_ instanceof EntityPlayerMP) { diff --git a/fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch b/fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch index d35b170331..35e4a50b37 100644 --- a/fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch +++ b/fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch @@ -9,7 +9,7 @@ + int posZ = MathHelper.func_76128_c(this.field_73132_a.field_70161_v * 32.0D); + if (posX != this.field_73128_d || posY != this.field_73129_e || posZ != this.field_73126_f) + { -+ cpw.mods.fml.common.network.internal.FMLNetworkHandler.makeEntitySpawnAdjustment(this.field_73132_a, p_73117_1_, this.field_73128_d, this.field_73129_e, this.field_73126_f); ++ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.makeEntitySpawnAdjustment(this.field_73132_a, p_73117_1_, this.field_73128_d, this.field_73129_e, this.field_73126_f); + } + if (this.field_73143_t && !(packet instanceof S0FPacketSpawnMob)) @@ -19,7 +19,7 @@ field_151262_p.warn("Fetching addPacket for removed entity"); } -+ Packet pkt = cpw.mods.fml.common.network.internal.FMLNetworkHandler.getEntitySpawningPacket(this.field_73132_a); ++ Packet pkt = net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.getEntitySpawningPacket(this.field_73132_a); + if (pkt != null) return pkt; + if (this.field_73132_a instanceof EntityItem) diff --git a/fml/patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch b/fml/patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch index 5d9aca653d..ee9c56e4c4 100644 --- a/fml/patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch +++ b/fml/patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch @@ -1,8 +1,8 @@ --- ../src-base/minecraft/net/minecraft/entity/boss/IBossDisplayData.java +++ ../src-work/minecraft/net/minecraft/entity/boss/IBossDisplayData.java @@ -4,7 +4,6 @@ - import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.util.IChatComponent; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; -@SideOnly(Side.CLIENT) public interface IBossDisplayData diff --git a/fml/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch b/fml/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch index b4a5f611e2..df3a42a3cd 100644 --- a/fml/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch +++ b/fml/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch @@ -4,7 +4,7 @@ } } -+ cpw.mods.fml.common.FMLCommonHandler.instance().firePlayerItemPickupEvent(p_70100_1_, this); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerItemPickupEvent(p_70100_1_, this); if (!this.func_174814_R()) { this.field_70170_p.func_72956_a(p_70100_1_, "random.pop", 0.2F, ((this.field_70146_Z.nextFloat() - this.field_70146_Z.nextFloat()) * 0.7F + 1.0F) * 2.0F); diff --git a/fml/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch b/fml/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch index e45513c0d0..ddd2ac0652 100644 --- a/fml/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch +++ b/fml/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch @@ -29,7 +29,7 @@ { p_180482_2_ = super.func_180482_a(p_180482_1_, p_180482_2_); - this.func_70938_b(this.field_70170_p.field_73012_v.nextInt(5)); -+ cpw.mods.fml.common.registry.VillagerRegistry.setRandomProfession(this, this.field_70170_p.field_73012_v); ++ net.minecraftforge.fml.common.registry.VillagerRegistry.setRandomProfession(this, this.field_70170_p.field_73012_v); this.func_175552_ct(); return p_180482_2_; } diff --git a/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch b/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch index 23de5973fa..4b36387308 100644 --- a/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch +++ b/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch @@ -4,7 +4,7 @@ public void func_70071_h_() { -+ cpw.mods.fml.common.FMLCommonHandler.instance().onPlayerPreTick(this); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPlayerPreTick(this); this.field_70145_X = this.func_175149_v(); if (this.func_175149_v()) @@ -12,7 +12,7 @@ { this.func_70107_b(d3, this.field_70163_u, d4); } -+ cpw.mods.fml.common.FMLCommonHandler.instance().onPlayerPostTick(this); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPlayerPostTick(this); } public int func_82145_z() @@ -33,7 +33,7 @@ + */ + public void openGui(Object mod, int modGuiId, World world, int x, int y, int z) + { -+ cpw.mods.fml.common.network.internal.FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z); ++ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z); + } + public static enum EnumChatVisibility diff --git a/fml/patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch b/fml/patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch index a88aa191d3..e95cd2fe56 100644 --- a/fml/patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch +++ b/fml/patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch @@ -4,7 +4,7 @@ public void func_82870_a(EntityPlayer p_82870_1_, ItemStack p_82870_2_) { -+ cpw.mods.fml.common.FMLCommonHandler.instance().firePlayerCraftingEvent(p_82870_1_, p_82870_2_, field_75239_a); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerCraftingEvent(p_82870_1_, p_82870_2_, field_75239_a); this.func_75208_c(p_82870_2_); ItemStack[] aitemstack = CraftingManager.func_77594_a().func_180303_b(this.field_75239_a, p_82870_1_.field_70170_p); diff --git a/fml/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java.patch b/fml/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java.patch index 84538eae20..e0dda7760b 100644 --- a/fml/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java.patch +++ b/fml/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java.patch @@ -4,7 +4,7 @@ this.field_75228_b = 0; -+ cpw.mods.fml.common.FMLCommonHandler.instance().firePlayerSmeltedEvent(field_75229_a, p_75208_1_); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerSmeltedEvent(field_75229_a, p_75208_1_); + if (p_75208_1_.func_77973_b() == Items.field_151042_j) { diff --git a/fml/patches/minecraft/net/minecraft/item/Item.java.patch b/fml/patches/minecraft/net/minecraft/item/Item.java.patch index d420475614..c1115d8ff1 100644 --- a/fml/patches/minecraft/net/minecraft/item/Item.java.patch +++ b/fml/patches/minecraft/net/minecraft/item/Item.java.patch @@ -5,7 +5,7 @@ public class Item { - public static final RegistryNamespaced field_150901_e = new RegistryNamespaced(); -+ public static final RegistryNamespaced field_150901_e = cpw.mods.fml.common.registry.GameData.getItemRegistry(); ++ public static final RegistryNamespaced field_150901_e = net.minecraftforge.fml.common.registry.GameData.getItemRegistry(); private static final Map field_179220_a = Maps.newHashMap(); protected static final UUID field_111210_e = UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF"); private CreativeTabs field_77701_a; @@ -13,8 +13,8 @@ private String field_77774_bZ; private static final String __OBFID = "CL_00000041"; -+ public final cpw.mods.fml.common.registry.RegistryDelegate delegate = -+ ((cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry)field_150901_e).getDelegate(this, Item.class); ++ public final net.minecraftforge.fml.common.registry.RegistryDelegate delegate = ++ ((net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry)field_150901_e).getDelegate(this, Item.class); + public static int func_150891_b(Item p_150891_0_) { diff --git a/fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch b/fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch index 3d5e04a3b6..64974a7520 100644 --- a/fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch +++ b/fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch @@ -4,7 +4,7 @@ private boolean field_179551_k; private static final String __OBFID = "CL_00000043"; -+ private cpw.mods.fml.common.registry.RegistryDelegate delegate; ++ private net.minecraftforge.fml.common.registry.RegistryDelegate delegate; public ItemStack(Block p_i1876_1_) { this(p_i1876_1_, 1); diff --git a/fml/patches/minecraft/net/minecraft/network/NetworkManager.java.patch b/fml/patches/minecraft/net/minecraft/network/NetworkManager.java.patch index 142443ec0c..b37433cda3 100644 --- a/fml/patches/minecraft/net/minecraft/network/NetworkManager.java.patch +++ b/fml/patches/minecraft/net/minecraft/network/NetworkManager.java.patch @@ -17,7 +17,7 @@ final EnumConnectionState enumconnectionstate1 = (EnumConnectionState)this.field_150746_k.attr(field_150739_c).get(); - if (enumconnectionstate1 != enumconnectionstate) -+ if (enumconnectionstate1 != enumconnectionstate && !( p_150732_1_ instanceof cpw.mods.fml.common.network.internal.FMLProxyPacket)) ++ if (enumconnectionstate1 != enumconnectionstate && !( p_150732_1_ instanceof net.minecraftforge.fml.common.network.internal.FMLProxyPacket)) { field_150735_g.debug("Disabled auto read"); this.field_150746_k.config().setAutoRead(false); @@ -26,7 +26,7 @@ if (this.field_150746_k.eventLoop().inEventLoop()) { - if (enumconnectionstate != enumconnectionstate1) -+ if (enumconnectionstate != enumconnectionstate1 && !( p_150732_1_ instanceof cpw.mods.fml.common.network.internal.FMLProxyPacket)) ++ if (enumconnectionstate != enumconnectionstate1 && !( p_150732_1_ instanceof net.minecraftforge.fml.common.network.internal.FMLProxyPacket)) { this.func_150723_a(enumconnectionstate); } @@ -35,7 +35,7 @@ public void run() { - if (enumconnectionstate != enumconnectionstate1) -+ if (enumconnectionstate != enumconnectionstate1 && !( p_150732_1_ instanceof cpw.mods.fml.common.network.internal.FMLProxyPacket)) ++ if (enumconnectionstate != enumconnectionstate1 && !( p_150732_1_ instanceof net.minecraftforge.fml.common.network.internal.FMLProxyPacket)) { NetworkManager.this.func_150723_a(enumconnectionstate); } diff --git a/fml/patches/minecraft/net/minecraft/network/NetworkSystem.java.patch b/fml/patches/minecraft/net/minecraft/network/NetworkSystem.java.patch index c0216a150f..9452bc6bca 100644 --- a/fml/patches/minecraft/net/minecraft/network/NetworkSystem.java.patch +++ b/fml/patches/minecraft/net/minecraft/network/NetworkSystem.java.patch @@ -5,7 +5,7 @@ } - p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(30)).addLast("legacy_query", new PingResponseHandler(NetworkSystem.this)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer(EnumPacketDirection.SERVERBOUND)).addLast("prepender", new MessageSerializer2()).addLast("encoder", new MessageSerializer(EnumPacketDirection.CLIENTBOUND)); -+ p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(cpw.mods.fml.common.network.internal.FMLNetworkHandler.READ_TIMEOUT)).addLast("legacy_query", new PingResponseHandler(NetworkSystem.this)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer(EnumPacketDirection.SERVERBOUND)).addLast("prepender", new MessageSerializer2()).addLast("encoder", new MessageSerializer(EnumPacketDirection.CLIENTBOUND)); ++ p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.READ_TIMEOUT)).addLast("legacy_query", new PingResponseHandler(NetworkSystem.this)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer(EnumPacketDirection.SERVERBOUND)).addLast("prepender", new MessageSerializer2()).addLast("encoder", new MessageSerializer(EnumPacketDirection.CLIENTBOUND)); NetworkManager networkmanager = new NetworkManager(EnumPacketDirection.SERVERBOUND); NetworkSystem.this.field_151272_f.add(networkmanager); p_initChannel_1_.pipeline().addLast("packet_handler", networkmanager); diff --git a/fml/patches/minecraft/net/minecraft/network/ServerStatusResponse.java.patch b/fml/patches/minecraft/net/minecraft/network/ServerStatusResponse.java.patch index 9b8d904745..ad72405fe2 100644 --- a/fml/patches/minecraft/net/minecraft/network/ServerStatusResponse.java.patch +++ b/fml/patches/minecraft/net/minecraft/network/ServerStatusResponse.java.patch @@ -4,7 +4,7 @@ serverstatusresponse.func_151320_a(JsonUtils.func_151200_h(jsonobject, "favicon")); } -+ cpw.mods.fml.client.FMLClientHandler.instance().captureAdditionalData(serverstatusresponse, jsonobject); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().captureAdditionalData(serverstatusresponse, jsonobject); return serverstatusresponse; } @@ -12,7 +12,7 @@ jsonobject.addProperty("favicon", p_serialize_1_.func_151316_d()); } -+ cpw.mods.fml.common.network.internal.FMLNetworkHandler.enhanceStatusQuery(jsonobject); ++ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.enhanceStatusQuery(jsonobject); return jsonobject; } diff --git a/fml/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch b/fml/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch index f23ad51c9d..0e3324da77 100644 --- a/fml/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch +++ b/fml/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch @@ -4,7 +4,7 @@ try { -+ cpw.mods.fml.client.FMLClientHandler.instance().connectToRealmsServer(p_connect_1_, p_connect_2_); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().connectToRealmsServer(p_connect_1_, p_connect_2_); inetaddress = InetAddress.getByName(p_connect_1_); if (RealmsConnect.this.aborted) diff --git a/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch index 69a0c8ab77..450fde291b 100644 --- a/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch +++ b/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch @@ -5,7 +5,7 @@ public void func_71260_j() { - if (!this.field_71290_O) -+ if (!this.field_71290_O && cpw.mods.fml.common.Loader.instance().hasReachedState(cpw.mods.fml.common.LoaderState.SERVER_STARTED) && !field_71316_v) // make sure the save is valid and we don't save twice ++ if (!this.field_71290_O && net.minecraftforge.fml.common.Loader.instance().hasReachedState(net.minecraftforge.fml.common.LoaderState.SERVER_STARTED) && !field_71316_v) // make sure the save is valid and we don't save twice { field_147145_h.info("Stopping server"); @@ -13,7 +13,7 @@ { if (this.func_71197_b()) { -+ cpw.mods.fml.common.FMLCommonHandler.instance().handleServerStarted(); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStarted(); this.field_175591_ab = func_130071_aq(); long i = 0L; this.field_147147_p.func_151315_a(new ChatComponentText(this.field_71286_C)); @@ -21,19 +21,19 @@ Thread.sleep(Math.max(1L, 50L - i)); this.field_71296_Q = true; } -+ cpw.mods.fml.common.FMLCommonHandler.instance().handleServerStopping(); -+ cpw.mods.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStopping(); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions } else { -+ cpw.mods.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions this.func_71228_a((CrashReport)null); } } -+ catch (cpw.mods.fml.common.StartupQuery.AbortedException e) ++ catch (net.minecraftforge.fml.common.StartupQuery.AbortedException e) + { + // ignore silently -+ cpw.mods.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions + } catch (Throwable throwable1) { @@ -42,7 +42,7 @@ field_147145_h.error("We were unable to save this crash report to disk."); } -+ cpw.mods.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions this.func_71228_a(crashreport); } finally @@ -50,7 +50,7 @@ } finally { -+ cpw.mods.fml.common.FMLCommonHandler.instance().handleServerStopped(); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStopped(); + this.field_71316_v = true; this.func_71240_o(); } @@ -59,7 +59,7 @@ public void func_71217_p() { long i = System.nanoTime(); -+ cpw.mods.fml.common.FMLCommonHandler.instance().onPreServerTick(); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreServerTick(); ++this.field_71315_w; if (this.field_71295_T) @@ -67,7 +67,7 @@ this.field_71304_b.func_76319_b(); this.field_71304_b.func_76319_b(); -+ cpw.mods.fml.common.FMLCommonHandler.instance().onPostServerTick(); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostServerTick(); } public void func_71190_q() @@ -75,7 +75,7 @@ } this.field_71304_b.func_76320_a("tick"); -+ cpw.mods.fml.common.FMLCommonHandler.instance().onPreWorldTick(worldserver); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreWorldTick(worldserver); CrashReport crashreport; try @@ -83,7 +83,7 @@ throw new ReportedException(crashreport); } -+ cpw.mods.fml.common.FMLCommonHandler.instance().onPostWorldTick(worldserver); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostWorldTick(worldserver); this.field_71304_b.func_76319_b(); this.field_71304_b.func_76320_a("tracker"); worldserver.func_73039_n().func_72788_a(); @@ -91,7 +91,7 @@ public void func_71256_s() { -+ cpw.mods.fml.common.StartupQuery.reset(); ++ net.minecraftforge.fml.common.StartupQuery.reset(); this.field_175590_aa = new Thread(this, "Server thread"); this.field_175590_aa.start(); } @@ -100,7 +100,7 @@ public String getServerModName() { - return "vanilla"; -+ return cpw.mods.fml.common.FMLCommonHandler.instance().getModName(); ++ return net.minecraftforge.fml.common.FMLCommonHandler.instance().getModName(); } public CrashReport func_71230_b(CrashReport p_71230_1_) diff --git a/fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch b/fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch index 5fc8c0d571..1af800c171 100644 --- a/fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch +++ b/fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch @@ -12,7 +12,7 @@ field_155771_h.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); } -+ cpw.mods.fml.common.FMLCommonHandler.instance().onServerStart(this); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().onServerStart(this); + field_155771_h.info("Loading properties"); this.field_71340_o = new PropertyManager(new File("server.properties")); @@ -21,7 +21,7 @@ } else { -+ cpw.mods.fml.common.FMLCommonHandler.instance().onServerStarted(); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().onServerStarted(); this.func_152361_a(new DedicatedPlayerList(this)); long j = System.nanoTime(); @@ -29,7 +29,7 @@ this.func_71191_d((this.func_71207_Z() + 8) / 16 * 16); this.func_71191_d(MathHelper.func_76125_a(this.func_71207_Z(), 64, 256)); this.field_71340_o.func_73667_a("max-build-height", Integer.valueOf(this.func_71207_Z())); -+ if (!cpw.mods.fml.common.FMLCommonHandler.instance().handleServerAboutToStart(this)) return false; ++ if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerAboutToStart(this)) return false; field_155771_h.info("Preparing level \"" + this.func_71270_I() + "\""); this.func_71247_a(this.func_71270_I(), this.func_71270_I(), k, worldtype, s2); long i1 = System.nanoTime() - j; @@ -38,7 +38,7 @@ } - return true; -+ return cpw.mods.fml.common.FMLCommonHandler.instance().handleServerStarting(this); ++ return net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStarting(this); } } } diff --git a/fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch b/fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch index b0a4d64b1e..d08b9dada3 100644 --- a/fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch +++ b/fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch @@ -4,11 +4,11 @@ this.func_71245_h(true); field_147148_h.info("Generating keypair"); this.func_71253_a(CryptManager.func_75891_b()); -+ if (!cpw.mods.fml.common.FMLCommonHandler.instance().handleServerAboutToStart(this)) return false; ++ if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerAboutToStart(this)) return false; this.func_71247_a(this.func_71270_I(), this.func_71221_J(), this.field_71350_m.func_77160_d(), this.field_71350_m.func_77165_h(), this.field_71350_m.func_82749_j()); this.func_71205_p(this.func_71214_G() + " - " + this.field_71305_c[0].func_72912_H().func_76065_j()); - return true; -+ return cpw.mods.fml.common.FMLCommonHandler.instance().handleServerStarting(this); ++ return net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStarting(this); } public void func_71217_p() diff --git a/fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch b/fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch index b8df093714..6c80950f95 100644 --- a/fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch +++ b/fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch @@ -22,7 +22,7 @@ p_72355_2_.func_71116_b(); -+ cpw.mods.fml.common.FMLCommonHandler.instance().firePlayerLoggedIn(p_72355_2_); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerLoggedIn(p_72355_2_); if (nbttagcompound != null && nbttagcompound.func_150297_b("Riding", 10)) { Entity entity = EntityList.func_75615_a(nbttagcompound.func_74775_l("Riding"), worldserver); @@ -39,7 +39,7 @@ public void func_72367_e(EntityPlayerMP p_72367_1_) { -+ cpw.mods.fml.common.FMLCommonHandler.instance().firePlayerLoggedOut(p_72367_1_); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerLoggedOut(p_72367_1_); p_72367_1_.func_71029_a(StatList.field_75947_j); this.func_72391_b(p_72367_1_); WorldServer worldserver = p_72367_1_.func_71121_q(); @@ -47,7 +47,7 @@ this.field_177454_f.put(entityplayermp1.func_110124_au(), entityplayermp1); entityplayermp1.func_71116_b(); entityplayermp1.func_70606_j(entityplayermp1.func_110143_aJ()); -+ cpw.mods.fml.common.FMLCommonHandler.instance().firePlayerRespawnEvent(entityplayermp1); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerRespawnEvent(entityplayermp1); return entityplayermp1; } @@ -55,7 +55,7 @@ PotionEffect potioneffect = (PotionEffect)iterator.next(); p_72356_1_.field_71135_a.func_147359_a(new S1DPacketEntityEffect(p_72356_1_.func_145782_y(), potioneffect)); } -+ cpw.mods.fml.common.FMLCommonHandler.instance().firePlayerChangedDimensionEvent(p_72356_1_, j, p_72356_2_); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerChangedDimensionEvent(p_72356_1_, j, p_72356_2_); } public void func_82448_a(Entity p_82448_1_, int p_82448_2_, WorldServer p_82448_3_, WorldServer p_82448_4_) diff --git a/fml/patches/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java.patch b/fml/patches/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java.patch index 2a60716271..855a224f4e 100644 --- a/fml/patches/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java.patch +++ b/fml/patches/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java.patch @@ -4,7 +4,7 @@ public void func_147383_a(C00Handshake p_147383_1_) { -+ if (!cpw.mods.fml.common.FMLCommonHandler.instance().handleServerHandshake(p_147383_1_, this.field_147386_b)) return; ++ if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerHandshake(p_147383_1_, this.field_147386_b)) return; + switch (NetHandlerHandshakeTCP.SwitchEnumConnectionState.field_151291_a[p_147383_1_.func_149594_c().ordinal()]) { diff --git a/fml/patches/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java.patch b/fml/patches/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java.patch index 9f03f53e40..b77bfc330c 100644 --- a/fml/patches/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java.patch +++ b/fml/patches/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java.patch @@ -5,7 +5,7 @@ } - if (this.field_147336_h++ == 600) -+ if (this.field_147336_h++ == cpw.mods.fml.common.network.internal.FMLNetworkHandler.LOGIN_TIMEOUT) ++ if (this.field_147336_h++ == net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.LOGIN_TIMEOUT) { this.func_147322_a("Took too long to log in"); } @@ -14,7 +14,7 @@ this.field_147333_a.func_179290_a(new S02PacketLoginSuccess(this.field_147337_i)); - this.field_147327_f.func_71203_ab().func_72355_a(this.field_147333_a, this.field_147327_f.func_71203_ab().func_148545_a(this.field_147337_i)); -+ cpw.mods.fml.common.network.internal.FMLNetworkHandler.fmlServerHandshake(this.field_147327_f.func_71203_ab(), this.field_147333_a, this.field_147327_f.func_71203_ab().func_148545_a(this.field_147337_i)); ++ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.fmlServerHandshake(this.field_147327_f.func_71203_ab(), this.field_147333_a, this.field_147327_f.func_71203_ab().func_148545_a(this.field_147337_i)); } } diff --git a/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch b/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch index f7f12bd7a8..7d8e858376 100644 --- a/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch +++ b/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch @@ -22,7 +22,7 @@ + } + catch (Exception ex) + { -+ cpw.mods.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, ex, ++ net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, ex, + "A TileEntity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author", + p_145827_0_.func_74779_i("id"), oclass.getName()); + tileentity = null; diff --git a/fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch b/fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch index b19a35bb39..244db3b500 100644 --- a/fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch +++ b/fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch @@ -13,7 +13,7 @@ + if (item == Items.field_151129_at) return 20000; + if (item == Item.func_150898_a(Blocks.field_150345_g)) return 100; + if (item == Items.field_151072_bj) return 2400; -+ return cpw.mods.fml.common.registry.GameRegistry.getFuelValue(p_145952_0_); ++ return net.minecraftforge.fml.common.registry.GameRegistry.getFuelValue(p_145952_0_); } } diff --git a/fml/patches/minecraft/net/minecraft/util/ResourceLocation.java.patch b/fml/patches/minecraft/net/minecraft/util/ResourceLocation.java.patch index 94370f1948..ba29817311 100644 --- a/fml/patches/minecraft/net/minecraft/util/ResourceLocation.java.patch +++ b/fml/patches/minecraft/net/minecraft/util/ResourceLocation.java.patch @@ -3,8 +3,8 @@ @@ -1,7 +1,5 @@ package net.minecraft.util; --import cpw.mods.fml.relauncher.Side; --import cpw.mods.fml.relauncher.SideOnly; +-import net.minecraftforge.fml.relauncher.Side; +-import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.Validate; public class ResourceLocation diff --git a/fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch b/fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch index 4a9a7aaac9..4c35a20803 100644 --- a/fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch +++ b/fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch @@ -1,20 +1,6 @@ --- ../src-base/minecraft/net/minecraft/util/StringTranslate.java +++ ../src-work/minecraft/net/minecraft/util/StringTranslate.java -@@ -3,10 +3,13 @@ - import com.google.common.base.Splitter; - import com.google.common.collect.Iterables; - import com.google.common.collect.Maps; -+ -+import cpw.mods.fml.common.registry.LanguageRegistry; - import cpw.mods.fml.relauncher.Side; - import cpw.mods.fml.relauncher.SideOnly; - import java.io.IOException; - import java.io.InputStream; -+import java.util.HashMap; - import java.util.IllegalFormatException; - import java.util.Iterator; - import java.util.Map; -@@ -18,16 +21,35 @@ +@@ -18,16 +18,35 @@ { private static final Pattern field_111053_a = Pattern.compile("%(\\d+\\$)?[\\d\\.]*[df]"); private static final Splitter field_135065_b = Splitter.on('=').limit(2); @@ -38,21 +24,21 @@ + + private static void inject(StringTranslate inst, InputStream inputstream) + { -+ HashMap map = parseLangFile(inputstream); ++ java.util.HashMap map = parseLangFile(inputstream); + inst.field_74816_c.putAll(map); + inst.field_150511_e = System.currentTimeMillis(); + } + -+ public static HashMap parseLangFile(InputStream inputstream) ++ public static java.util.HashMap parseLangFile(InputStream inputstream) + { -+ HashMap table = Maps.newHashMap(); ++ java.util.HashMap table = Maps.newHashMap(); try { - InputStream inputstream = StringTranslate.class.getResourceAsStream("/assets/minecraft/lang/en_US.lang"); Iterator iterator = IOUtils.readLines(inputstream, Charsets.UTF_8).iterator(); while (iterator.hasNext()) -@@ -42,17 +64,17 @@ +@@ -42,17 +61,17 @@ { String s1 = astring[0]; String s2 = field_111053_a.matcher(astring[1]).replaceAll("%$1s"); diff --git a/fml/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch b/fml/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch index ffb08ae993..01d1962a65 100644 --- a/fml/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch +++ b/fml/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch @@ -14,7 +14,7 @@ + } + catch (Exception e) + { -+ cpw.mods.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e, ++ net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e, + "An Entity type %s has thrown an exception trying to write state. It will not persist. Report this to the mod author", + entity.getClass().getName()); + } @@ -32,7 +32,7 @@ + } + catch (Exception e) + { -+ cpw.mods.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e, ++ net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e, + "A TileEntity type %s has throw an exception trying to write state. It will not persist. Report this to the mod author", + tileentity.getClass().getName()); + } diff --git a/fml/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch b/fml/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch index ced3ded496..931c0bc1d6 100644 --- a/fml/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch +++ b/fml/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch @@ -4,7 +4,7 @@ if (this.field_73246_d != null) { this.field_73246_d.func_73153_a(p_73153_1_, p_73153_2_, p_73153_3_); -+ cpw.mods.fml.common.registry.GameRegistry.generateWorld(p_73153_2_, p_73153_3_, field_73251_h, field_73246_d, p_73153_1_); ++ net.minecraftforge.fml.common.registry.GameRegistry.generateWorld(p_73153_2_, p_73153_3_, field_73251_h, field_73246_d, p_73153_1_); chunk.func_76630_e(); } } diff --git a/fml/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch b/fml/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch index 8f62daa21d..0050eacf05 100644 --- a/fml/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch +++ b/fml/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch @@ -4,7 +4,7 @@ arraylist.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.Field2.class, 3, MathHelper.func_76136_a(p_75084_0_, 2 + p_75084_1_, 4 + p_75084_1_ * 2))); arraylist.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.House2.class, 15, MathHelper.func_76136_a(p_75084_0_, 0, 1 + p_75084_1_))); arraylist.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.House3.class, 8, MathHelper.func_76136_a(p_75084_0_, 0 + p_75084_1_, 3 + p_75084_1_ * 2))); -+ cpw.mods.fml.common.registry.VillagerRegistry.addExtraVillageComponents(arraylist, p_75084_0_, p_75084_1_); ++ net.minecraftforge.fml.common.registry.VillagerRegistry.addExtraVillageComponents(arraylist, p_75084_0_, p_75084_1_); + Iterator iterator = arraylist.iterator(); @@ -15,7 +15,7 @@ } + else + { -+ object = cpw.mods.fml.common.registry.VillagerRegistry.getVillageComponent(p_176065_1_, p_176065_0_ , p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_); ++ object = net.minecraftforge.fml.common.registry.VillagerRegistry.getVillageComponent(p_176065_1_, p_176065_0_ , p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_); + } return (StructureVillagePieces.Village)object; diff --git a/fml/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch b/fml/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch index d47a6097e3..a8f9313fd6 100644 --- a/fml/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch +++ b/fml/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch @@ -13,10 +13,10 @@ nbttagcompound = CompressedStreamTools.func_74796_a(new FileInputStream(file1)); nbttagcompound1 = nbttagcompound.func_74775_l("Data"); + worldInfo = new WorldInfo(nbttagcompound1); -+ cpw.mods.fml.common.FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound); return new WorldInfo(nbttagcompound1); } -+ catch (cpw.mods.fml.common.StartupQuery.AbortedException e) ++ catch (net.minecraftforge.fml.common.StartupQuery.AbortedException e) + { + throw e; + } @@ -26,7 +26,7 @@ } } -+ cpw.mods.fml.common.FMLCommonHandler.instance().confirmBackupLevelDatUse(this); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().confirmBackupLevelDatUse(this); file1 = new File(this.field_75770_b, "level.dat_old"); if (file1.exists()) @@ -36,10 +36,10 @@ nbttagcompound1 = nbttagcompound.func_74775_l("Data"); - return new WorldInfo(nbttagcompound1); + worldInfo = new WorldInfo(nbttagcompound1); -+ cpw.mods.fml.common.FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound); + return worldInfo; + } -+ catch (cpw.mods.fml.common.StartupQuery.AbortedException e) ++ catch (net.minecraftforge.fml.common.StartupQuery.AbortedException e) + { + throw e; } @@ -49,7 +49,7 @@ NBTTagCompound nbttagcompound2 = new NBTTagCompound(); nbttagcompound2.func_74782_a("Data", nbttagcompound1); -+ cpw.mods.fml.common.FMLCommonHandler.instance().handleWorldDataSave(this, p_75755_1_, nbttagcompound2); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataSave(this, p_75755_1_, nbttagcompound2); + try { @@ -58,7 +58,7 @@ NBTTagCompound nbttagcompound1 = new NBTTagCompound(); nbttagcompound1.func_74782_a("Data", nbttagcompound); -+ cpw.mods.fml.common.FMLCommonHandler.instance().handleWorldDataSave(this, p_75761_1_, nbttagcompound1); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataSave(this, p_75761_1_, nbttagcompound1); + try { diff --git a/fml/src/main/java/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java b/fml/src/main/java/net/minecraftforge/fml/client/CustomModLoadingErrorDisplayException.java similarity index 91% rename from fml/src/main/java/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java rename to fml/src/main/java/net/minecraftforge/fml/client/CustomModLoadingErrorDisplayException.java index ffba8e51a8..9d6c15aa6d 100644 --- a/fml/src/main/java/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/CustomModLoadingErrorDisplayException.java @@ -10,13 +10,13 @@ * cpw - implementation */ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiErrorScreen; -import cpw.mods.fml.common.IFMLHandledException; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.IFMLHandledException; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * If a mod throws this exception during loading, it will be called back to render diff --git a/fml/src/main/java/cpw/mods/fml/client/ExtendedServerListData.java b/fml/src/main/java/net/minecraftforge/fml/client/ExtendedServerListData.java similarity index 92% rename from fml/src/main/java/cpw/mods/fml/client/ExtendedServerListData.java rename to fml/src/main/java/net/minecraftforge/fml/client/ExtendedServerListData.java index d204d4e6bc..ed3b86095c 100644 --- a/fml/src/main/java/cpw/mods/fml/client/ExtendedServerListData.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/ExtendedServerListData.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import java.util.Map; diff --git a/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java b/fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java rename to fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java index 48d572fdc0..64e3338662 100644 --- a/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java @@ -10,7 +10,7 @@ * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import java.io.File; import java.io.FileInputStream; @@ -58,6 +58,28 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.WorldSettings; import net.minecraft.world.storage.SaveFormatOld; +import net.minecraftforge.fml.client.registry.RenderingRegistry; +import net.minecraftforge.fml.common.DummyModContainer; +import net.minecraftforge.fml.common.DuplicateModsFoundException; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.IFMLSidedHandler; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.LoaderException; +import net.minecraftforge.fml.common.MetadataCollection; +import net.minecraftforge.fml.common.MissingModsException; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.ModMetadata; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.fml.common.StartupQuery; +import net.minecraftforge.fml.common.WrongMinecraftVersionException; +import net.minecraftforge.fml.common.eventhandler.EventBus; +import net.minecraftforge.fml.common.network.FMLNetworkEvent; +import net.minecraftforge.fml.common.network.internal.FMLNetworkHandler; +import net.minecraftforge.fml.common.registry.GameData; +import net.minecraftforge.fml.common.registry.LanguageRegistry; +import net.minecraftforge.fml.common.toposort.ModSortingException; +import net.minecraftforge.fml.relauncher.Side; import org.apache.logging.log4j.Level; import org.lwjgl.input.Mouse; @@ -74,29 +96,6 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.DummyModContainer; -import cpw.mods.fml.common.DuplicateModsFoundException; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.IFMLSidedHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.LoaderException; -import cpw.mods.fml.common.MetadataCollection; -import cpw.mods.fml.common.MissingModsException; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.ModMetadata; -import cpw.mods.fml.common.ObfuscationReflectionHelper; -import cpw.mods.fml.common.StartupQuery; -import cpw.mods.fml.common.WrongMinecraftVersionException; -import cpw.mods.fml.common.eventhandler.EventBus; -import cpw.mods.fml.common.network.FMLNetworkEvent; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; -import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.common.toposort.ModSortingException; -import cpw.mods.fml.relauncher.Side; - /** * Handles primary communication from hooked code into the system diff --git a/fml/src/main/java/cpw/mods/fml/client/FMLConfigGuiFactory.java b/fml/src/main/java/net/minecraftforge/fml/client/FMLConfigGuiFactory.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/client/FMLConfigGuiFactory.java rename to fml/src/main/java/net/minecraftforge/fml/client/FMLConfigGuiFactory.java index 4fbe53ec35..b1a66baf7e 100644 --- a/fml/src/main/java/cpw/mods/fml/client/FMLConfigGuiFactory.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/FMLConfigGuiFactory.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import java.util.ArrayList; import java.util.List; @@ -7,18 +7,18 @@ import java.util.regex.Pattern; import com.google.common.collect.ImmutableSet; -import cpw.mods.fml.client.config.ConfigGuiType; -import cpw.mods.fml.client.config.DummyConfigElement; -import cpw.mods.fml.client.config.GuiConfig; -import cpw.mods.fml.client.config.GuiConfigEntries.NumberSliderEntry; -import cpw.mods.fml.client.config.IConfigElement; -import cpw.mods.fml.client.config.DummyConfigElement.DummyCategoryElement; -import cpw.mods.fml.client.config.DummyConfigElement.DummyListElement; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; +import net.minecraftforge.fml.client.config.ConfigGuiType; +import net.minecraftforge.fml.client.config.DummyConfigElement; +import net.minecraftforge.fml.client.config.GuiConfig; +import net.minecraftforge.fml.client.config.IConfigElement; +import net.minecraftforge.fml.client.config.DummyConfigElement.DummyCategoryElement; +import net.minecraftforge.fml.client.config.DummyConfigElement.DummyListElement; +import net.minecraftforge.fml.client.config.GuiConfigEntries.NumberSliderEntry; public class FMLConfigGuiFactory implements IModGuiFactory { diff --git a/fml/src/main/java/cpw/mods/fml/client/FMLFileResourcePack.java b/fml/src/main/java/net/minecraftforge/fml/client/FMLFileResourcePack.java similarity index 92% rename from fml/src/main/java/cpw/mods/fml/client/FMLFileResourcePack.java rename to fml/src/main/java/net/minecraftforge/fml/client/FMLFileResourcePack.java index 50ad1b144e..9ea3c43e78 100644 --- a/fml/src/main/java/cpw/mods/fml/client/FMLFileResourcePack.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/FMLFileResourcePack.java @@ -1,20 +1,20 @@ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; + import org.apache.logging.log4j.Level; import javax.imageio.ImageIO; import net.minecraft.client.resources.FileResourcePack; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.ModContainer; import com.google.common.base.Charsets; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.ModContainer; - public class FMLFileResourcePack extends FileResourcePack { private ModContainer container; diff --git a/fml/src/main/java/cpw/mods/fml/client/FMLFolderResourcePack.java b/fml/src/main/java/net/minecraftforge/fml/client/FMLFolderResourcePack.java similarity index 93% rename from fml/src/main/java/cpw/mods/fml/client/FMLFolderResourcePack.java rename to fml/src/main/java/net/minecraftforge/fml/client/FMLFolderResourcePack.java index cdb7fcac75..a3e7a2413e 100644 --- a/fml/src/main/java/cpw/mods/fml/client/FMLFolderResourcePack.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/FMLFolderResourcePack.java @@ -1,20 +1,20 @@ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; + import org.apache.logging.log4j.Level; import javax.imageio.ImageIO; import net.minecraft.client.resources.FolderResourcePack; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.ModContainer; import com.google.common.base.Charsets; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.ModContainer; - public class FMLFolderResourcePack extends FolderResourcePack { private ModContainer container; diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiAccessDenied.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiAccessDenied.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/client/GuiAccessDenied.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiAccessDenied.java index 1951353ba6..b24171bfb1 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiAccessDenied.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiAccessDenied.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiBackupFailed.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiBackupFailed.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/client/GuiBackupFailed.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiBackupFailed.java index fa0624aeec..6bbb6f1ab2 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiBackupFailed.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiBackupFailed.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import java.io.File; import net.minecraft.client.gui.GuiButton; diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiConfirmation.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiConfirmation.java similarity index 90% rename from fml/src/main/java/cpw/mods/fml/client/GuiConfirmation.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiConfirmation.java index 6f3e1fa622..f1e6fb8b47 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiConfirmation.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiConfirmation.java @@ -1,9 +1,9 @@ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiOptionButton; import net.minecraft.client.resources.I18n; -import cpw.mods.fml.common.StartupQuery; +import net.minecraftforge.fml.common.StartupQuery; public class GuiConfirmation extends GuiNotification { diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiCustomModLoadingErrorScreen.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiCustomModLoadingErrorScreen.java index 894cdba226..53a85f01b9 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiCustomModLoadingErrorScreen.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import net.minecraft.client.gui.GuiErrorScreen; diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiDupesFound.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiDupesFound.java similarity index 91% rename from fml/src/main/java/cpw/mods/fml/client/GuiDupesFound.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiDupesFound.java index 410e12d233..c31006fe00 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiDupesFound.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiDupesFound.java @@ -10,14 +10,14 @@ * cpw - implementation */ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import java.io.File; import java.util.Map.Entry; import net.minecraft.client.gui.GuiErrorScreen; -import cpw.mods.fml.common.DuplicateModsFoundException; -import cpw.mods.fml.common.ModContainer; +import net.minecraftforge.fml.common.DuplicateModsFoundException; +import net.minecraftforge.fml.common.ModContainer; public class GuiDupesFound extends GuiErrorScreen { diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiIngameModOptions.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiIngameModOptions.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/client/GuiIngameModOptions.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiIngameModOptions.java index 2b65d83f50..8ae3f5b62e 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiIngameModOptions.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiIngameModOptions.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiModList.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiModList.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/client/GuiModList.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiModList.java index e635a02693..a68e2e55e1 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiModList.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiModList.java @@ -12,7 +12,7 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import java.awt.Dimension; import java.awt.image.BufferedImage; @@ -33,17 +33,16 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.IResourcePack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.ModContainer.Disableable; import org.apache.logging.log4j.Level; import org.lwjgl.opengl.GL11; import com.google.common.base.Strings; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.ModContainer.Disableable; - /** * @author cpw * diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiModOptionList.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiModOptionList.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/client/GuiModOptionList.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiModOptionList.java index e0b4bb6462..645a251698 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiModOptionList.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiModOptionList.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import net.minecraft.client.renderer.Tessellator; diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiModsMissing.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissing.java similarity index 90% rename from fml/src/main/java/cpw/mods/fml/client/GuiModsMissing.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissing.java index 9edb54fcea..313ccf1370 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiModsMissing.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissing.java @@ -10,12 +10,12 @@ * cpw - implementation */ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import net.minecraft.client.gui.GuiErrorScreen; -import cpw.mods.fml.common.MissingModsException; -import cpw.mods.fml.common.versioning.ArtifactVersion; -import cpw.mods.fml.common.versioning.DefaultArtifactVersion; +import net.minecraftforge.fml.common.MissingModsException; +import net.minecraftforge.fml.common.versioning.ArtifactVersion; +import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion; public class GuiModsMissing extends GuiErrorScreen { diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiModsMissingForServer.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissingForServer.java similarity index 93% rename from fml/src/main/java/cpw/mods/fml/client/GuiModsMissingForServer.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissingForServer.java index 69d4f16464..bc2b35206f 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiModsMissingForServer.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissingForServer.java @@ -10,13 +10,13 @@ * cpw - implementation */ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; -import cpw.mods.fml.common.MissingModsException; -import cpw.mods.fml.common.versioning.ArtifactVersion; +import net.minecraftforge.fml.common.MissingModsException; +import net.minecraftforge.fml.common.versioning.ArtifactVersion; public class GuiModsMissingForServer extends GuiScreen { diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiNotification.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiNotification.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/client/GuiNotification.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiNotification.java index ffbcc6bc1e..33690b5000 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiNotification.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiNotification.java @@ -1,9 +1,9 @@ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; -import cpw.mods.fml.common.StartupQuery; +import net.minecraftforge.fml.common.StartupQuery; public class GuiNotification extends GuiScreen { diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiOldSaveLoadConfirm.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiOldSaveLoadConfirm.java similarity index 93% rename from fml/src/main/java/cpw/mods/fml/client/GuiOldSaveLoadConfirm.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiOldSaveLoadConfirm.java index 666a40f1b1..9335f0e277 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiOldSaveLoadConfirm.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiOldSaveLoadConfirm.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import java.io.File; import java.io.IOException; @@ -10,14 +10,13 @@ import net.minecraft.client.gui.GuiSelectWorld; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.world.WorldSettings; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.fml.common.StartupQuery; +import net.minecraftforge.fml.common.ZipperUtil; import org.apache.logging.log4j.Level; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.ObfuscationReflectionHelper; -import cpw.mods.fml.common.StartupQuery; -import cpw.mods.fml.common.ZipperUtil; - public class GuiOldSaveLoadConfirm extends GuiYesNo implements GuiYesNoCallback { private String dirName; diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiScrollingList.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/client/GuiScrollingList.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java index 6b10dea5e8..2798e437ce 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiScrollingList.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import java.util.List; diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiSlotModList.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiSlotModList.java similarity index 93% rename from fml/src/main/java/cpw/mods/fml/client/GuiSlotModList.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiSlotModList.java index 021d4ed6fb..69c489f212 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiSlotModList.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiSlotModList.java @@ -10,15 +10,14 @@ * cpw - implementation */ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import java.util.ArrayList; import net.minecraft.client.renderer.Tessellator; - -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.LoaderState.ModState; -import cpw.mods.fml.common.ModContainer; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.LoaderState.ModState; /** * @author cpw diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiSortingProblem.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiSortingProblem.java similarity index 87% rename from fml/src/main/java/cpw/mods/fml/client/GuiSortingProblem.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiSortingProblem.java index bd9a1936e6..ed0159570d 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiSortingProblem.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiSortingProblem.java @@ -1,9 +1,9 @@ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import net.minecraft.client.gui.GuiScreen; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.toposort.ModSortingException; -import cpw.mods.fml.common.toposort.ModSortingException.SortingExceptionData; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.toposort.ModSortingException; +import net.minecraftforge.fml.common.toposort.ModSortingException.SortingExceptionData; public class GuiSortingProblem extends GuiScreen { private SortingExceptionData failedList; diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiWrongMinecraft.java similarity index 92% rename from fml/src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java rename to fml/src/main/java/net/minecraftforge/fml/client/GuiWrongMinecraft.java index e3586dccfb..c2f995678b 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiWrongMinecraft.java @@ -10,11 +10,11 @@ * cpw - implementation */ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import net.minecraft.client.gui.GuiErrorScreen; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.WrongMinecraftVersionException; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.WrongMinecraftVersionException; public class GuiWrongMinecraft extends GuiErrorScreen { diff --git a/fml/src/main/java/cpw/mods/fml/client/IModGuiFactory.java b/fml/src/main/java/net/minecraftforge/fml/client/IModGuiFactory.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/client/IModGuiFactory.java rename to fml/src/main/java/net/minecraftforge/fml/client/IModGuiFactory.java index b9307e8dfe..552f52273c 100644 --- a/fml/src/main/java/cpw/mods/fml/client/IModGuiFactory.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/IModGuiFactory.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.client; +package net.minecraftforge.fml.client; import java.util.List; import java.util.Set; diff --git a/fml/src/main/java/cpw/mods/fml/client/config/ConfigGuiType.java b/fml/src/main/java/net/minecraftforge/fml/client/config/ConfigGuiType.java similarity index 91% rename from fml/src/main/java/cpw/mods/fml/client/config/ConfigGuiType.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/ConfigGuiType.java index 68d471209c..fb9d941861 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/ConfigGuiType.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/ConfigGuiType.java @@ -10,7 +10,7 @@ * bspkrs - implementation */ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; public enum ConfigGuiType { diff --git a/fml/src/main/java/cpw/mods/fml/client/config/DummyConfigElement.java b/fml/src/main/java/net/minecraftforge/fml/client/config/DummyConfigElement.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/client/config/DummyConfigElement.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/DummyConfigElement.java index 1f8078d73e..746e27c2e1 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/DummyConfigElement.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/DummyConfigElement.java @@ -10,17 +10,16 @@ * bspkrs - implementation */ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; -import cpw.mods.fml.client.config.GuiConfigEntries.IConfigEntry; -import cpw.mods.fml.client.config.GuiEditArrayEntries.IArrayEntry; - import net.minecraft.client.resources.I18n; +import net.minecraftforge.fml.client.config.GuiConfigEntries.IConfigEntry; +import net.minecraftforge.fml.client.config.GuiEditArrayEntries.IArrayEntry; /** diff --git a/fml/src/main/java/cpw/mods/fml/client/config/GuiButtonExt.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiButtonExt.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/client/config/GuiButtonExt.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/GuiButtonExt.java index b9f24a0fd9..71a3ef9d49 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/GuiButtonExt.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiButtonExt.java @@ -10,7 +10,7 @@ * bspkrs - implementation */ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; diff --git a/fml/src/main/java/cpw/mods/fml/client/config/GuiCheckBox.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiCheckBox.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/client/config/GuiCheckBox.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/GuiCheckBox.java index dd55984317..21df35cb4b 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/GuiCheckBox.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiCheckBox.java @@ -10,7 +10,7 @@ * bspkrs - implementation */ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; diff --git a/fml/src/main/java/cpw/mods/fml/client/config/GuiConfig.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/client/config/GuiConfig.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java index 24cf72facb..f22563125b 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/GuiConfig.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java @@ -10,10 +10,10 @@ * bspkrs - implementation */ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; -import static cpw.mods.fml.client.config.GuiUtils.RESET_CHAR; -import static cpw.mods.fml.client.config.GuiUtils.UNDO_CHAR; +import static net.minecraftforge.fml.client.config.GuiUtils.RESET_CHAR; +import static net.minecraftforge.fml.client.config.GuiUtils.UNDO_CHAR; import java.io.IOException; import java.util.ArrayList; @@ -24,17 +24,16 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.ChatComponentText; +import net.minecraftforge.fml.client.config.GuiConfigEntries.IConfigEntry; +import net.minecraftforge.fml.client.event.ConfigChangedEvent; +import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; +import net.minecraftforge.fml.client.event.ConfigChangedEvent.PostConfigChangedEvent; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.eventhandler.Event.Result; import org.lwjgl.input.Keyboard; -import cpw.mods.fml.client.config.GuiConfigEntries.IConfigEntry; -import cpw.mods.fml.client.event.ConfigChangedEvent; -import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; -import cpw.mods.fml.client.event.ConfigChangedEvent.PostConfigChangedEvent; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.Event.Result; - /** * This class is the base GuiScreen for all config GUI screens. It can be extended by mods to provide the top-level config screen * that will be called when the Config button is clicked from the Main Menu Mods list. diff --git a/fml/src/main/java/cpw/mods/fml/client/config/GuiConfigEntries.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/client/config/GuiConfigEntries.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java index 5ddb4f01c2..75368bc7aa 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/GuiConfigEntries.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java @@ -9,10 +9,10 @@ * Contributors (this class): * bspkrs - implementation */ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; -import static cpw.mods.fml.client.config.GuiUtils.RESET_CHAR; -import static cpw.mods.fml.client.config.GuiUtils.UNDO_CHAR; +import static net.minecraftforge.fml.client.config.GuiUtils.RESET_CHAR; +import static net.minecraftforge.fml.client.config.GuiUtils.UNDO_CHAR; import java.util.ArrayList; import java.util.Arrays; @@ -27,13 +27,12 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.resources.I18n; import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModContainer; import org.lwjgl.input.Keyboard; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; - /** * This class implements the scrolling list functionality of the config GUI screens. It also provides all the default control handlers * for the various property types. diff --git a/fml/src/main/java/cpw/mods/fml/client/config/GuiEditArray.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/client/config/GuiEditArray.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java index dbfb9870b0..ca7426361b 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/GuiEditArray.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java @@ -10,7 +10,7 @@ * bspkrs - implementation */ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; import java.io.IOException; import java.util.ArrayList; @@ -22,8 +22,8 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.EnumChatFormatting; -import static cpw.mods.fml.client.config.GuiUtils.RESET_CHAR; -import static cpw.mods.fml.client.config.GuiUtils.UNDO_CHAR; +import static net.minecraftforge.fml.client.config.GuiUtils.RESET_CHAR; +import static net.minecraftforge.fml.client.config.GuiUtils.UNDO_CHAR; import org.lwjgl.input.Keyboard; diff --git a/fml/src/main/java/cpw/mods/fml/client/config/GuiEditArrayEntries.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/client/config/GuiEditArrayEntries.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java index ba26381a5f..b77d19fee0 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/GuiEditArrayEntries.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java @@ -10,7 +10,7 @@ * bspkrs - implementation */ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; import java.util.ArrayList; import java.util.Arrays; @@ -22,14 +22,13 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.resources.I18n; import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fml.client.config.GuiConfigEntries.ArrayEntry; +import net.minecraftforge.fml.common.FMLLog; import org.lwjgl.input.Keyboard; -import static cpw.mods.fml.client.config.GuiUtils.INVALID; -import static cpw.mods.fml.client.config.GuiUtils.VALID; - -import cpw.mods.fml.client.config.GuiConfigEntries.ArrayEntry; -import cpw.mods.fml.common.FMLLog; +import static net.minecraftforge.fml.client.config.GuiUtils.INVALID; +import static net.minecraftforge.fml.client.config.GuiUtils.VALID; /** * This class implements the scrolling list functionality of the GuiEditList screen. It also provides all the default controls diff --git a/fml/src/main/java/cpw/mods/fml/client/config/GuiMessageDialog.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiMessageDialog.java similarity index 93% rename from fml/src/main/java/cpw/mods/fml/client/config/GuiMessageDialog.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/GuiMessageDialog.java index 6c0b17eeb8..ad19e786f9 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/GuiMessageDialog.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiMessageDialog.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; import net.minecraft.client.gui.GuiDisconnected; import net.minecraft.client.gui.GuiButton; diff --git a/fml/src/main/java/cpw/mods/fml/client/config/GuiSelectString.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectString.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/client/config/GuiSelectString.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectString.java index ec68cd05bf..004d65b71d 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/GuiSelectString.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectString.java @@ -10,7 +10,7 @@ * bspkrs - implementation */ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; import java.util.ArrayList; import java.util.List; @@ -21,9 +21,8 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.EnumChatFormatting; - -import static cpw.mods.fml.client.config.GuiUtils.RESET_CHAR; -import static cpw.mods.fml.client.config.GuiUtils.UNDO_CHAR; +import static net.minecraftforge.fml.client.config.GuiUtils.RESET_CHAR; +import static net.minecraftforge.fml.client.config.GuiUtils.UNDO_CHAR; /** * This class provides a screen that allows the user to select a value from a list. diff --git a/fml/src/main/java/cpw/mods/fml/client/config/GuiSelectStringEntries.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectStringEntries.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/client/config/GuiSelectStringEntries.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectStringEntries.java index d3a4d0cf40..054475f870 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/GuiSelectStringEntries.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectStringEntries.java @@ -10,7 +10,7 @@ * bspkrs - implementation */ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; import java.util.ArrayList; import java.util.Collections; @@ -23,7 +23,7 @@ import java.util.Map.Entry; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiListExtended; import net.minecraft.client.renderer.Tessellator; -import cpw.mods.fml.client.config.GuiConfigEntries.SelectValueEntry; +import net.minecraftforge.fml.client.config.GuiConfigEntries.SelectValueEntry; /** * This class implements the scrolling list functionality of the GuiSelectString screen. diff --git a/fml/src/main/java/cpw/mods/fml/client/config/GuiSlider.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSlider.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/client/config/GuiSlider.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/GuiSlider.java index 4eeaab9b03..d35c5b597e 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/GuiSlider.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSlider.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; import net.minecraft.client.Minecraft; diff --git a/fml/src/main/java/cpw/mods/fml/client/config/GuiUnicodeGlyphButton.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiUnicodeGlyphButton.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/client/config/GuiUnicodeGlyphButton.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/GuiUnicodeGlyphButton.java index 323a0f20fa..bf07650ff0 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/GuiUnicodeGlyphButton.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiUnicodeGlyphButton.java @@ -10,7 +10,7 @@ * bspkrs - implementation */ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; import net.minecraft.client.Minecraft; diff --git a/fml/src/main/java/cpw/mods/fml/client/config/GuiUtils.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/client/config/GuiUtils.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java index 4dbbd1ad6b..d2c55c4ec5 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/GuiUtils.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java @@ -10,7 +10,7 @@ * bspkrs - implementation */ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/fml/src/main/java/cpw/mods/fml/client/config/HoverChecker.java b/fml/src/main/java/net/minecraftforge/fml/client/config/HoverChecker.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/client/config/HoverChecker.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/HoverChecker.java index ed816c6045..a2cad08600 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/HoverChecker.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/HoverChecker.java @@ -10,7 +10,7 @@ * bspkrs - implementation */ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; import net.minecraft.client.gui.GuiButton; diff --git a/fml/src/main/java/cpw/mods/fml/client/config/IConfigElement.java b/fml/src/main/java/net/minecraftforge/fml/client/config/IConfigElement.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/client/config/IConfigElement.java rename to fml/src/main/java/net/minecraftforge/fml/client/config/IConfigElement.java index c1a792c16b..a17fff0c1e 100644 --- a/fml/src/main/java/cpw/mods/fml/client/config/IConfigElement.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/IConfigElement.java @@ -10,13 +10,13 @@ * bspkrs - implementation */ -package cpw.mods.fml.client.config; +package net.minecraftforge.fml.client.config; import java.util.List; import java.util.regex.Pattern; -import cpw.mods.fml.client.config.GuiConfigEntries.IConfigEntry; -import cpw.mods.fml.client.config.GuiEditArrayEntries.IArrayEntry; +import net.minecraftforge.fml.client.config.GuiConfigEntries.IConfigEntry; +import net.minecraftforge.fml.client.config.GuiEditArrayEntries.IArrayEntry; /** * This interface provides the information needed by GuiConfig and GuiConfigEntries to display config elements for editing. diff --git a/fml/src/main/java/cpw/mods/fml/client/event/ConfigChangedEvent.java b/fml/src/main/java/net/minecraftforge/fml/client/event/ConfigChangedEvent.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/client/event/ConfigChangedEvent.java rename to fml/src/main/java/net/minecraftforge/fml/client/event/ConfigChangedEvent.java index 17ee6911c4..ddab3aa8d1 100644 --- a/fml/src/main/java/cpw/mods/fml/client/event/ConfigChangedEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/event/ConfigChangedEvent.java @@ -10,10 +10,10 @@ * bspkrs - implementation */ -package cpw.mods.fml.client.event; +package net.minecraftforge.fml.client.event; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.eventhandler.Event.HasResult; +import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.Event.HasResult; /** * These events are posted from the GuiConfig screen when the done button is pressed. The events are only posted diff --git a/fml/src/main/java/cpw/mods/fml/client/registry/ClientRegistry.java b/fml/src/main/java/net/minecraftforge/fml/client/registry/ClientRegistry.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/client/registry/ClientRegistry.java rename to fml/src/main/java/net/minecraftforge/fml/client/registry/ClientRegistry.java index 82e1da31db..1f3ceaa6af 100644 --- a/fml/src/main/java/cpw/mods/fml/client/registry/ClientRegistry.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/registry/ClientRegistry.java @@ -10,16 +10,16 @@ * cpw - implementation */ -package cpw.mods.fml.client.registry; +package net.minecraftforge.fml.client.registry; import org.apache.commons.lang3.ArrayUtils; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.settings.KeyBinding; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ClientRegistry { diff --git a/fml/src/main/java/cpw/mods/fml/client/registry/RenderingRegistry.java b/fml/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/client/registry/RenderingRegistry.java rename to fml/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java index 902b9ee9b6..ea0912907f 100644 --- a/fml/src/main/java/cpw/mods/fml/client/registry/RenderingRegistry.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.client.registry; +package net.minecraftforge.fml.client.registry; import java.util.List; import java.util.Map; diff --git a/fml/src/main/java/cpw/mods/fml/common/API.java b/fml/src/main/java/net/minecraftforge/fml/common/API.java similarity index 89% rename from fml/src/main/java/cpw/mods/fml/common/API.java rename to fml/src/main/java/net/minecraftforge/fml/common/API.java index b8a2b4b28a..9bc8b09630 100644 --- a/fml/src/main/java/cpw/mods/fml/common/API.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/API.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/fml/src/main/java/cpw/mods/fml/common/BukkitPluginRef.java b/fml/src/main/java/net/minecraftforge/fml/common/BukkitPluginRef.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/BukkitPluginRef.java rename to fml/src/main/java/net/minecraftforge/fml/common/BukkitPluginRef.java index 593aa564e2..ccebf4e6ed 100644 --- a/fml/src/main/java/cpw/mods/fml/common/BukkitPluginRef.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/BukkitPluginRef.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/fml/src/main/java/cpw/mods/fml/common/BukkitProxy.java b/fml/src/main/java/net/minecraftforge/fml/common/BukkitProxy.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/BukkitProxy.java rename to fml/src/main/java/net/minecraftforge/fml/common/BukkitProxy.java index 20f0b3cf1c..5af5f56fad 100644 --- a/fml/src/main/java/cpw/mods/fml/common/BukkitProxy.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/BukkitProxy.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; /** * A marker interface for retrieving a proxy to a bukkit plugin. diff --git a/fml/src/main/java/cpw/mods/fml/common/CertificateHelper.java b/fml/src/main/java/net/minecraftforge/fml/common/CertificateHelper.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/CertificateHelper.java rename to fml/src/main/java/net/minecraftforge/fml/common/CertificateHelper.java index 1a1cee28f5..3e18b9c4af 100644 --- a/fml/src/main/java/cpw/mods/fml/common/CertificateHelper.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/CertificateHelper.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.nio.ByteBuffer; import java.security.MessageDigest; diff --git a/fml/src/main/java/cpw/mods/fml/common/DummyModContainer.java b/fml/src/main/java/net/minecraftforge/fml/common/DummyModContainer.java similarity index 93% rename from fml/src/main/java/cpw/mods/fml/common/DummyModContainer.java rename to fml/src/main/java/net/minecraftforge/fml/common/DummyModContainer.java index b77e137351..d2c567ff03 100644 --- a/fml/src/main/java/cpw/mods/fml/common/DummyModContainer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/DummyModContainer.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.io.File; import java.security.cert.Certificate; @@ -19,13 +19,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.minecraftforge.fml.common.versioning.ArtifactVersion; +import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion; +import net.minecraftforge.fml.common.versioning.VersionRange; + import com.google.common.collect.ImmutableList; import com.google.common.eventbus.EventBus; -import cpw.mods.fml.common.versioning.ArtifactVersion; -import cpw.mods.fml.common.versioning.DefaultArtifactVersion; -import cpw.mods.fml.common.versioning.VersionRange; - public class DummyModContainer implements ModContainer { private ModMetadata md; diff --git a/fml/src/main/java/cpw/mods/fml/common/DuplicateModsFoundException.java b/fml/src/main/java/net/minecraftforge/fml/common/DuplicateModsFoundException.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/DuplicateModsFoundException.java rename to fml/src/main/java/net/minecraftforge/fml/common/DuplicateModsFoundException.java index f067605ff8..92d28d12d2 100644 --- a/fml/src/main/java/cpw/mods/fml/common/DuplicateModsFoundException.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/DuplicateModsFoundException.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.io.File; diff --git a/fml/src/main/java/cpw/mods/fml/common/FMLCommonHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/FMLCommonHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java index 127c7919c5..263f2effd6 100644 --- a/fml/src/main/java/cpw/mods/fml/common/FMLCommonHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.io.File; import java.lang.ref.WeakReference; @@ -38,6 +38,14 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import net.minecraft.world.storage.SaveHandler; import net.minecraft.world.storage.WorldInfo; +import net.minecraftforge.fml.common.eventhandler.EventBus; +import net.minecraftforge.fml.common.gameevent.InputEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.server.FMLServerHandler; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; @@ -52,15 +60,6 @@ import com.google.common.collect.MapMaker; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import cpw.mods.fml.common.eventhandler.EventBus; -import cpw.mods.fml.common.gameevent.InputEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.server.FMLServerHandler; - /** * The main class for non-obfuscated hook handling code diff --git a/fml/src/main/java/cpw/mods/fml/common/FMLContainer.java b/fml/src/main/java/net/minecraftforge/fml/common/FMLContainer.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/FMLContainer.java rename to fml/src/main/java/net/minecraftforge/fml/common/FMLContainer.java index 14c05ac8fe..f1351d1df9 100644 --- a/fml/src/main/java/cpw/mods/fml/common/FMLContainer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/FMLContainer.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.io.File; import java.security.cert.Certificate; @@ -27,6 +27,15 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.storage.SaveHandler; import net.minecraft.world.storage.WorldInfo; +import net.minecraftforge.fml.client.FMLFileResourcePack; +import net.minecraftforge.fml.client.FMLFolderResourcePack; +import net.minecraftforge.fml.common.asm.FMLSanityChecker; +import net.minecraftforge.fml.common.event.FMLConstructionEvent; +import net.minecraftforge.fml.common.network.NetworkCheckHandler; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.internal.FMLNetworkHandler; +import net.minecraftforge.fml.common.registry.GameData; +import net.minecraftforge.fml.relauncher.Side; import org.apache.logging.log4j.Level; @@ -36,16 +45,6 @@ import com.google.common.collect.Sets; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; -import cpw.mods.fml.client.FMLFileResourcePack; -import cpw.mods.fml.client.FMLFolderResourcePack; -import cpw.mods.fml.common.asm.FMLSanityChecker; -import cpw.mods.fml.common.event.FMLConstructionEvent; -import cpw.mods.fml.common.network.NetworkCheckHandler; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; -import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.relauncher.Side; - /** * @author cpw * @@ -312,7 +311,7 @@ public class FMLContainer extends DummyModContainer implements WorldAccessContai @Override public String getGuiClassName() { - return "cpw.mods.fml.client.FMLConfigGuiFactory"; + return "net.minecraftforge.fml.client.FMLConfigGuiFactory"; } @Override diff --git a/fml/src/main/java/cpw/mods/fml/common/FMLLog.java b/fml/src/main/java/net/minecraftforge/fml/common/FMLLog.java similarity index 92% rename from fml/src/main/java/cpw/mods/fml/common/FMLLog.java rename to fml/src/main/java/net/minecraftforge/fml/common/FMLLog.java index 462fa86a85..5da139baeb 100644 --- a/fml/src/main/java/cpw/mods/fml/common/FMLLog.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/FMLLog.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; @@ -18,7 +18,7 @@ import org.apache.logging.log4j.Logger; @SuppressWarnings("static-access") public class FMLLog { - private static cpw.mods.fml.relauncher.FMLRelaunchLog coreLog = cpw.mods.fml.relauncher.FMLRelaunchLog.log; + private static net.minecraftforge.fml.relauncher.FMLRelaunchLog coreLog = net.minecraftforge.fml.relauncher.FMLRelaunchLog.log; public static void log(String targetLog, Level level, String format, Object... data) { diff --git a/fml/src/main/java/cpw/mods/fml/common/FMLModContainer.java b/fml/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/FMLModContainer.java rename to fml/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java index 307deeae28..0c06efb939 100644 --- a/fml/src/main/java/cpw/mods/fml/common/FMLModContainer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java @@ -10,7 +10,7 @@ * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.io.File; import java.io.FileInputStream; @@ -24,7 +24,23 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; + +import net.minecraftforge.fml.common.Mod.Instance; +import net.minecraftforge.fml.common.Mod.Metadata; +import net.minecraftforge.fml.common.discovery.ASMDataTable; +import net.minecraftforge.fml.common.discovery.ModCandidate; +import net.minecraftforge.fml.common.discovery.ASMDataTable.ASMData; +import net.minecraftforge.fml.common.event.FMLConstructionEvent; +import net.minecraftforge.fml.common.event.FMLEvent; +import net.minecraftforge.fml.common.event.FMLFingerprintViolationEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.versioning.ArtifactVersion; +import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion; +import net.minecraftforge.fml.common.versioning.VersionParser; +import net.minecraftforge.fml.common.versioning.VersionRange; + import org.apache.logging.log4j.Level; + import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -44,20 +60,6 @@ import com.google.common.collect.Sets; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.Mod.Metadata; -import cpw.mods.fml.common.discovery.ASMDataTable; -import cpw.mods.fml.common.discovery.ASMDataTable.ASMData; -import cpw.mods.fml.common.discovery.ModCandidate; -import cpw.mods.fml.common.event.FMLConstructionEvent; -import cpw.mods.fml.common.event.FMLEvent; -import cpw.mods.fml.common.event.FMLFingerprintViolationEvent; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.versioning.ArtifactVersion; -import cpw.mods.fml.common.versioning.DefaultArtifactVersion; -import cpw.mods.fml.common.versioning.VersionParser; -import cpw.mods.fml.common.versioning.VersionRange; - public class FMLModContainer implements ModContainer { private Object modInstance; @@ -569,7 +571,7 @@ public class FMLModContainer implements ModContainer { try { - return getSource().isDirectory() ? Class.forName("cpw.mods.fml.client.FMLFolderResourcePack", true, getClass().getClassLoader()) : Class.forName("cpw.mods.fml.client.FMLFileResourcePack",true, getClass().getClassLoader()); + return getSource().isDirectory() ? Class.forName("net.minecraftforge.fml.client.FMLFolderResourcePack", true, getClass().getClassLoader()) : Class.forName("net.minecraftforge.fml.client.FMLFileResourcePack",true, getClass().getClassLoader()); } catch (ClassNotFoundException e) { diff --git a/fml/src/main/java/cpw/mods/fml/common/IASMHook.java b/fml/src/main/java/net/minecraftforge/fml/common/IASMHook.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/IASMHook.java rename to fml/src/main/java/net/minecraftforge/fml/common/IASMHook.java index f067ce5ff3..cad89b3cef 100644 --- a/fml/src/main/java/cpw/mods/fml/common/IASMHook.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/IASMHook.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import org.objectweb.asm.tree.ClassNode; diff --git a/fml/src/main/java/cpw/mods/fml/common/ICrashCallable.java b/fml/src/main/java/net/minecraftforge/fml/common/ICrashCallable.java similarity index 92% rename from fml/src/main/java/cpw/mods/fml/common/ICrashCallable.java rename to fml/src/main/java/net/minecraftforge/fml/common/ICrashCallable.java index 90b6cf66ed..f24be0bdff 100644 --- a/fml/src/main/java/cpw/mods/fml/common/ICrashCallable.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/ICrashCallable.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.util.concurrent.Callable; diff --git a/fml/src/main/java/cpw/mods/fml/common/IFMLHandledException.java b/fml/src/main/java/net/minecraftforge/fml/common/IFMLHandledException.java similarity index 91% rename from fml/src/main/java/cpw/mods/fml/common/IFMLHandledException.java rename to fml/src/main/java/net/minecraftforge/fml/common/IFMLHandledException.java index 5fa3e6d1dd..92f09355a8 100644 --- a/fml/src/main/java/cpw/mods/fml/common/IFMLHandledException.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/IFMLHandledException.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; public interface IFMLHandledException { diff --git a/fml/src/main/java/cpw/mods/fml/common/IFMLSidedHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/IFMLSidedHandler.java similarity index 90% rename from fml/src/main/java/cpw/mods/fml/common/IFMLSidedHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/IFMLSidedHandler.java index 3807b73302..6b2614a378 100644 --- a/fml/src/main/java/cpw/mods/fml/common/IFMLSidedHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/IFMLSidedHandler.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.io.File; import java.util.List; @@ -19,8 +19,8 @@ import java.util.Set; import net.minecraft.network.INetHandler; import net.minecraft.network.NetworkManager; import net.minecraft.server.MinecraftServer; -import cpw.mods.fml.common.eventhandler.EventBus; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.eventhandler.EventBus; +import net.minecraftforge.fml.relauncher.Side; public interface IFMLSidedHandler { diff --git a/fml/src/main/java/cpw/mods/fml/common/IFuelHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/IFuelHandler.java similarity index 92% rename from fml/src/main/java/cpw/mods/fml/common/IFuelHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/IFuelHandler.java index b37639c57a..2e7cc1ef1d 100644 --- a/fml/src/main/java/cpw/mods/fml/common/IFuelHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/IFuelHandler.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import net.minecraft.item.ItemStack; diff --git a/fml/src/main/java/cpw/mods/fml/common/ILanguageAdapter.java b/fml/src/main/java/net/minecraftforge/fml/common/ILanguageAdapter.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/common/ILanguageAdapter.java rename to fml/src/main/java/net/minecraftforge/fml/common/ILanguageAdapter.java index 11921ad6f4..ab0b4cb677 100644 --- a/fml/src/main/java/cpw/mods/fml/common/ILanguageAdapter.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/ILanguageAdapter.java @@ -1,11 +1,12 @@ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.apache.logging.log4j.Level; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.Side; + +import org.apache.logging.log4j.Level; public interface ILanguageAdapter { public Object getNewInstance(FMLModContainer container, Class objectClass, ClassLoader classLoader, Method factoryMarkedAnnotation) throws Exception; diff --git a/fml/src/main/java/cpw/mods/fml/common/IWorldGenerator.java b/fml/src/main/java/net/minecraftforge/fml/common/IWorldGenerator.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/IWorldGenerator.java rename to fml/src/main/java/net/minecraftforge/fml/common/IWorldGenerator.java index 51f3c9807e..20b43f83d9 100644 --- a/fml/src/main/java/cpw/mods/fml/common/IWorldGenerator.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/IWorldGenerator.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.util.Random; diff --git a/fml/src/main/java/cpw/mods/fml/common/InjectedModContainer.java b/fml/src/main/java/net/minecraftforge/fml/common/InjectedModContainer.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/InjectedModContainer.java rename to fml/src/main/java/net/minecraftforge/fml/common/InjectedModContainer.java index 5da03c6e53..f5e6e8d564 100644 --- a/fml/src/main/java/cpw/mods/fml/common/InjectedModContainer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/InjectedModContainer.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.io.File; import java.security.cert.Certificate; @@ -18,10 +18,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.google.common.eventbus.EventBus; +import net.minecraftforge.fml.common.versioning.ArtifactVersion; +import net.minecraftforge.fml.common.versioning.VersionRange; -import cpw.mods.fml.common.versioning.ArtifactVersion; -import cpw.mods.fml.common.versioning.VersionRange; +import com.google.common.eventbus.EventBus; public class InjectedModContainer implements ModContainer { diff --git a/fml/src/main/java/cpw/mods/fml/common/LoadController.java b/fml/src/main/java/net/minecraftforge/fml/common/LoadController.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/LoadController.java rename to fml/src/main/java/net/minecraftforge/fml/common/LoadController.java index 6c8b91576b..605782be75 100644 --- a/fml/src/main/java/cpw/mods/fml/common/LoadController.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/LoadController.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.lang.reflect.InvocationTargetException; import java.util.Collection; @@ -18,6 +18,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map.Entry; +import net.minecraftforge.fml.common.LoaderState.ModState; +import net.minecraftforge.fml.common.event.FMLEvent; +import net.minecraftforge.fml.common.event.FMLLoadEvent; +import net.minecraftforge.fml.common.event.FMLModDisabledEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLStateEvent; +import net.minecraftforge.fml.common.functions.ArtifactVersionNameFunction; +import net.minecraftforge.fml.common.versioning.ArtifactVersion; + import org.apache.logging.log4j.Level; import org.apache.logging.log4j.ThreadContext; @@ -36,15 +45,6 @@ import com.google.common.collect.Multimap; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; -import cpw.mods.fml.common.LoaderState.ModState; -import cpw.mods.fml.common.event.FMLEvent; -import cpw.mods.fml.common.event.FMLLoadEvent; -import cpw.mods.fml.common.event.FMLModDisabledEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLStateEvent; -import cpw.mods.fml.common.functions.ArtifactVersionNameFunction; -import cpw.mods.fml.common.versioning.ArtifactVersion; - public class LoadController { private Loader loader; diff --git a/fml/src/main/java/cpw/mods/fml/common/Loader.java b/fml/src/main/java/net/minecraftforge/fml/common/Loader.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/Loader.java rename to fml/src/main/java/net/minecraftforge/fml/common/Loader.java index 38430bbfd6..9d2a78fb99 100644 --- a/fml/src/main/java/cpw/mods/fml/common/Loader.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/Loader.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.io.File; import java.io.FileReader; @@ -26,6 +26,27 @@ import java.util.Map; import java.util.Properties; import java.util.Set; +import net.minecraftforge.fml.common.LoaderState.ModState; +import net.minecraftforge.fml.common.ModContainer.Disableable; +import net.minecraftforge.fml.common.discovery.ModDiscoverer; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLLoadEvent; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; +import net.minecraftforge.fml.common.event.FMLModIdMappingEvent; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent.MissingMapping; +import net.minecraftforge.fml.common.functions.ArtifactVersionNameFunction; +import net.minecraftforge.fml.common.functions.ModIdFunction; +import net.minecraftforge.fml.common.registry.GameData; +import net.minecraftforge.fml.common.registry.ObjectHolderRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry.Type; +import net.minecraftforge.fml.common.toposort.ModSorter; +import net.minecraftforge.fml.common.toposort.ModSortingException; +import net.minecraftforge.fml.common.toposort.TopologicalSort; +import net.minecraftforge.fml.common.toposort.ModSortingException.SortingExceptionData; +import net.minecraftforge.fml.common.versioning.ArtifactVersion; +import net.minecraftforge.fml.common.versioning.VersionParser; +import net.minecraftforge.fml.relauncher.Side; + import org.apache.logging.log4j.Level; import com.google.common.base.CharMatcher; @@ -51,27 +72,6 @@ import com.google.common.collect.SetMultimap; import com.google.common.collect.Sets; import com.google.common.collect.TreeMultimap; -import cpw.mods.fml.common.LoaderState.ModState; -import cpw.mods.fml.common.ModContainer.Disableable; -import cpw.mods.fml.common.discovery.ModDiscoverer; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.event.FMLLoadEvent; -import cpw.mods.fml.common.event.FMLMissingMappingsEvent; -import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; -import cpw.mods.fml.common.event.FMLModIdMappingEvent; -import cpw.mods.fml.common.functions.ArtifactVersionNameFunction; -import cpw.mods.fml.common.functions.ModIdFunction; -import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.common.registry.GameRegistry.Type; -import cpw.mods.fml.common.registry.ObjectHolderRegistry; -import cpw.mods.fml.common.toposort.ModSorter; -import cpw.mods.fml.common.toposort.ModSortingException; -import cpw.mods.fml.common.toposort.ModSortingException.SortingExceptionData; -import cpw.mods.fml.common.toposort.TopologicalSort; -import cpw.mods.fml.common.versioning.ArtifactVersion; -import cpw.mods.fml.common.versioning.VersionParser; -import cpw.mods.fml.relauncher.Side; - /** * The loader class performs the actual loading of the mod code from disk. * diff --git a/fml/src/main/java/cpw/mods/fml/common/LoaderException.java b/fml/src/main/java/net/minecraftforge/fml/common/LoaderException.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/LoaderException.java rename to fml/src/main/java/net/minecraftforge/fml/common/LoaderException.java index 3a0adbf726..edce3d763d 100644 --- a/fml/src/main/java/cpw/mods/fml/common/LoaderException.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/LoaderException.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; public class LoaderException extends RuntimeException { diff --git a/fml/src/main/java/cpw/mods/fml/common/LoaderState.java b/fml/src/main/java/net/minecraftforge/fml/common/LoaderState.java similarity index 79% rename from fml/src/main/java/cpw/mods/fml/common/LoaderState.java rename to fml/src/main/java/net/minecraftforge/fml/common/LoaderState.java index 89d3b0432c..67f3fc4c74 100644 --- a/fml/src/main/java/cpw/mods/fml/common/LoaderState.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/LoaderState.java @@ -10,22 +10,22 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; + +import net.minecraftforge.fml.common.event.FMLConstructionEvent; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; +import net.minecraftforge.fml.common.event.FMLServerStartedEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.common.event.FMLServerStoppedEvent; +import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; +import net.minecraftforge.fml.common.event.FMLStateEvent; import com.google.common.base.Throwables; -import cpw.mods.fml.common.event.FMLConstructionEvent; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLLoadCompleteEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; -import cpw.mods.fml.common.event.FMLServerStartedEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; -import cpw.mods.fml.common.event.FMLServerStoppedEvent; -import cpw.mods.fml.common.event.FMLServerStoppingEvent; -import cpw.mods.fml.common.event.FMLStateEvent; - /** * The state enum used to help track state progression for the loader * @author cpw diff --git a/fml/src/main/java/cpw/mods/fml/common/MCPDummyContainer.java b/fml/src/main/java/net/minecraftforge/fml/common/MCPDummyContainer.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/MCPDummyContainer.java rename to fml/src/main/java/net/minecraftforge/fml/common/MCPDummyContainer.java index 6bf87ce69b..fa9636d4a7 100644 --- a/fml/src/main/java/cpw/mods/fml/common/MCPDummyContainer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/MCPDummyContainer.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import com.google.common.eventbus.EventBus; diff --git a/fml/src/main/java/cpw/mods/fml/common/MetadataCollection.java b/fml/src/main/java/net/minecraftforge/fml/common/MetadataCollection.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/MetadataCollection.java rename to fml/src/main/java/net/minecraftforge/fml/common/MetadataCollection.java index 2555f90cc8..46dbcf6d94 100644 --- a/fml/src/main/java/cpw/mods/fml/common/MetadataCollection.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/MetadataCollection.java @@ -10,12 +10,16 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.Map; + +import net.minecraftforge.fml.common.versioning.ArtifactVersion; +import net.minecraftforge.fml.common.versioning.VersionParser; + import org.apache.logging.log4j.Level; import com.google.common.base.Throwables; @@ -29,8 +33,6 @@ import com.google.gson.JsonParser; import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; -import cpw.mods.fml.common.versioning.ArtifactVersion; -import cpw.mods.fml.common.versioning.VersionParser; public class MetadataCollection { diff --git a/fml/src/main/java/cpw/mods/fml/common/MinecraftDummyContainer.java b/fml/src/main/java/net/minecraftforge/fml/common/MinecraftDummyContainer.java similarity index 84% rename from fml/src/main/java/cpw/mods/fml/common/MinecraftDummyContainer.java rename to fml/src/main/java/net/minecraftforge/fml/common/MinecraftDummyContainer.java index 0ab81d88b8..736cbda0be 100644 --- a/fml/src/main/java/cpw/mods/fml/common/MinecraftDummyContainer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/MinecraftDummyContainer.java @@ -10,10 +10,10 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; -import cpw.mods.fml.common.versioning.VersionParser; -import cpw.mods.fml.common.versioning.VersionRange; +import net.minecraftforge.fml.common.versioning.VersionParser; +import net.minecraftforge.fml.common.versioning.VersionRange; public class MinecraftDummyContainer extends DummyModContainer { diff --git a/fml/src/main/java/cpw/mods/fml/common/MissingModsException.java b/fml/src/main/java/net/minecraftforge/fml/common/MissingModsException.java similarity index 86% rename from fml/src/main/java/cpw/mods/fml/common/MissingModsException.java rename to fml/src/main/java/net/minecraftforge/fml/common/MissingModsException.java index a2b50256b2..80811d94ed 100644 --- a/fml/src/main/java/cpw/mods/fml/common/MissingModsException.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/MissingModsException.java @@ -10,11 +10,11 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.util.Set; -import cpw.mods.fml.common.versioning.ArtifactVersion; +import net.minecraftforge.fml.common.versioning.ArtifactVersion; public class MissingModsException extends RuntimeException { diff --git a/fml/src/main/java/cpw/mods/fml/common/Mod.java b/fml/src/main/java/net/minecraftforge/fml/common/Mod.java similarity index 91% rename from fml/src/main/java/cpw/mods/fml/common/Mod.java rename to fml/src/main/java/net/minecraftforge/fml/common/Mod.java index 1e25d03d92..de29255564 100644 --- a/fml/src/main/java/cpw/mods/fml/common/Mod.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/Mod.java @@ -10,28 +10,28 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import cpw.mods.fml.client.IModGuiFactory; -import cpw.mods.fml.common.event.FMLEvent; -import cpw.mods.fml.common.event.FMLFingerprintViolationEvent; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; -import cpw.mods.fml.common.event.FMLServerStartedEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; -import cpw.mods.fml.common.event.FMLServerStoppedEvent; -import cpw.mods.fml.common.event.FMLServerStoppingEvent; -import cpw.mods.fml.common.network.NetworkCheckHandler; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.client.IModGuiFactory; +import net.minecraftforge.fml.common.event.FMLEvent; +import net.minecraftforge.fml.common.event.FMLFingerprintViolationEvent; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; +import net.minecraftforge.fml.common.event.FMLServerStartedEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.common.event.FMLServerStoppedEvent; +import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCEvent; +import net.minecraftforge.fml.common.network.NetworkCheckHandler; +import net.minecraftforge.fml.common.registry.GameRegistry; /** * This defines a Mod to FML. diff --git a/fml/src/main/java/cpw/mods/fml/common/ModAPIManager.java b/fml/src/main/java/net/minecraftforge/fml/common/ModAPIManager.java similarity index 91% rename from fml/src/main/java/cpw/mods/fml/common/ModAPIManager.java rename to fml/src/main/java/net/minecraftforge/fml/common/ModAPIManager.java index 696b0b4eed..4d361ca64e 100644 --- a/fml/src/main/java/cpw/mods/fml/common/ModAPIManager.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/ModAPIManager.java @@ -1,25 +1,25 @@ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.io.File; import java.util.List; import java.util.Map; import java.util.Set; +import net.minecraftforge.fml.common.asm.transformers.ModAPITransformer; +import net.minecraftforge.fml.common.discovery.ASMDataTable; +import net.minecraftforge.fml.common.discovery.ModCandidate; +import net.minecraftforge.fml.common.discovery.ModDiscoverer; +import net.minecraftforge.fml.common.discovery.ASMDataTable.ASMData; +import net.minecraftforge.fml.common.functions.ModIdFunction; +import net.minecraftforge.fml.common.versioning.ArtifactVersion; +import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion; +import net.minecraftforge.fml.common.versioning.VersionParser; + import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import cpw.mods.fml.common.asm.transformers.ModAPITransformer; -import cpw.mods.fml.common.discovery.ASMDataTable; -import cpw.mods.fml.common.discovery.ASMDataTable.ASMData; -import cpw.mods.fml.common.discovery.ModCandidate; -import cpw.mods.fml.common.discovery.ModDiscoverer; -import cpw.mods.fml.common.functions.ModIdFunction; -import cpw.mods.fml.common.versioning.ArtifactVersion; -import cpw.mods.fml.common.versioning.DefaultArtifactVersion; -import cpw.mods.fml.common.versioning.VersionParser; - public class ModAPIManager { public static final ModAPIManager INSTANCE = new ModAPIManager(); private ModAPITransformer transformer; @@ -128,7 +128,7 @@ public class ModAPIManager { { this.dataTable = dataTable; - Set apiList = dataTable.getAll("cpw.mods.fml.common.API"); + Set apiList = dataTable.getAll("net.minecraftforge.fml.common.API"); apiContainers = Maps.newHashMap(); diff --git a/fml/src/main/java/cpw/mods/fml/common/ModClassLoader.java b/fml/src/main/java/net/minecraftforge/fml/common/ModClassLoader.java similarity index 90% rename from fml/src/main/java/cpw/mods/fml/common/ModClassLoader.java rename to fml/src/main/java/net/minecraftforge/fml/common/ModClassLoader.java index 38714e5995..b7bd56d3e6 100644 --- a/fml/src/main/java/cpw/mods/fml/common/ModClassLoader.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/ModClassLoader.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.io.File; import java.net.MalformedURLException; @@ -19,16 +19,16 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.List; import java.util.Set; + import org.apache.logging.log4j.Level; import net.minecraft.launchwrapper.IClassTransformer; import net.minecraft.launchwrapper.LaunchClassLoader; +import net.minecraftforge.fml.common.asm.transformers.ModAPITransformer; +import net.minecraftforge.fml.common.discovery.ASMDataTable; import com.google.common.collect.ImmutableList; -import cpw.mods.fml.common.asm.transformers.ModAPITransformer; -import cpw.mods.fml.common.discovery.ASMDataTable; - /** * A simple delegating class loader used to load mods into the system * @@ -88,7 +88,7 @@ public class ModClassLoader extends URLClassLoader public ModAPITransformer addModAPITransformer(ASMDataTable dataTable) { - mainClassLoader.registerTransformer("cpw.mods.fml.common.asm.transformers.ModAPITransformer"); + mainClassLoader.registerTransformer("net.minecraftforge.fml.common.asm.transformers.ModAPITransformer"); List transformers = mainClassLoader.getTransformers(); ModAPITransformer modAPI = (ModAPITransformer) transformers.get(transformers.size()-1); modAPI.initTable(dataTable); diff --git a/fml/src/main/java/cpw/mods/fml/common/ModContainer.java b/fml/src/main/java/net/minecraftforge/fml/common/ModContainer.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/ModContainer.java rename to fml/src/main/java/net/minecraftforge/fml/common/ModContainer.java index abed85d410..984b899934 100644 --- a/fml/src/main/java/cpw/mods/fml/common/ModContainer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/ModContainer.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.io.File; import java.security.cert.Certificate; @@ -18,12 +18,12 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.minecraftforge.fml.common.versioning.ArtifactVersion; +import net.minecraftforge.fml.common.versioning.VersionRange; + import com.google.common.collect.ImmutableMap; import com.google.common.eventbus.EventBus; -import cpw.mods.fml.common.versioning.ArtifactVersion; -import cpw.mods.fml.common.versioning.VersionRange; - /** * The container that wraps around mods in the system. *

diff --git a/fml/src/main/java/cpw/mods/fml/common/ModContainerFactory.java b/fml/src/main/java/net/minecraftforge/fml/common/ModContainerFactory.java similarity index 93% rename from fml/src/main/java/cpw/mods/fml/common/ModContainerFactory.java rename to fml/src/main/java/net/minecraftforge/fml/common/ModContainerFactory.java index e922a26f2a..db2cd064e1 100644 --- a/fml/src/main/java/cpw/mods/fml/common/ModContainerFactory.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/ModContainerFactory.java @@ -10,23 +10,23 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.io.File; import java.lang.reflect.Constructor; import java.util.Map; import java.util.regex.Pattern; +import net.minecraftforge.fml.common.discovery.ModCandidate; +import net.minecraftforge.fml.common.discovery.asm.ASMModParser; +import net.minecraftforge.fml.common.discovery.asm.ModAnnotation; + import org.apache.logging.log4j.Level; import org.objectweb.asm.Type; import com.google.common.base.Throwables; import com.google.common.collect.Maps; -import cpw.mods.fml.common.discovery.ModCandidate; -import cpw.mods.fml.common.discovery.asm.ASMModParser; -import cpw.mods.fml.common.discovery.asm.ModAnnotation; - public class ModContainerFactory { public static Map> modTypes = Maps.newHashMap(); diff --git a/fml/src/main/java/cpw/mods/fml/common/ModMetadata.java b/fml/src/main/java/net/minecraftforge/fml/common/ModMetadata.java similarity index 92% rename from fml/src/main/java/cpw/mods/fml/common/ModMetadata.java rename to fml/src/main/java/net/minecraftforge/fml/common/ModMetadata.java index 13f49ad791..add4b37aed 100644 --- a/fml/src/main/java/cpw/mods/fml/common/ModMetadata.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/ModMetadata.java @@ -10,19 +10,19 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.util.List; import java.util.Set; +import net.minecraftforge.fml.common.functions.ModNameFunction; +import net.minecraftforge.fml.common.versioning.ArtifactVersion; + import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.gson.annotations.SerializedName; -import cpw.mods.fml.common.functions.ModNameFunction; -import cpw.mods.fml.common.versioning.ArtifactVersion; - /** * @author cpw * diff --git a/fml/src/main/java/cpw/mods/fml/common/ObfuscationReflectionHelper.java b/fml/src/main/java/net/minecraftforge/fml/common/ObfuscationReflectionHelper.java similarity index 91% rename from fml/src/main/java/cpw/mods/fml/common/ObfuscationReflectionHelper.java rename to fml/src/main/java/net/minecraftforge/fml/common/ObfuscationReflectionHelper.java index 1f2310cf58..9bc66b5a55 100644 --- a/fml/src/main/java/cpw/mods/fml/common/ObfuscationReflectionHelper.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/ObfuscationReflectionHelper.java @@ -10,15 +10,16 @@ * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.util.Arrays; -import org.apache.logging.log4j.Level; -import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.ReflectionHelper.UnableToAccessFieldException; -import cpw.mods.fml.relauncher.ReflectionHelper.UnableToFindFieldException; +import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper.UnableToAccessFieldException; +import net.minecraftforge.fml.relauncher.ReflectionHelper.UnableToFindFieldException; + +import org.apache.logging.log4j.Level; /** * Some reflection helper code. diff --git a/fml/src/main/java/cpw/mods/fml/common/Optional.java b/fml/src/main/java/net/minecraftforge/fml/common/Optional.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/common/Optional.java rename to fml/src/main/java/net/minecraftforge/fml/common/Optional.java index 53860fed87..0aa4658066 100644 --- a/fml/src/main/java/cpw/mods/fml/common/Optional.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/Optional.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/fml/src/main/java/cpw/mods/fml/common/ProxyInjector.java b/fml/src/main/java/net/minecraftforge/fml/common/ProxyInjector.java similarity index 93% rename from fml/src/main/java/cpw/mods/fml/common/ProxyInjector.java rename to fml/src/main/java/net/minecraftforge/fml/common/ProxyInjector.java index 473900739a..63947fdf2f 100644 --- a/fml/src/main/java/cpw/mods/fml/common/ProxyInjector.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/ProxyInjector.java @@ -10,19 +10,20 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Set; + +import net.minecraftforge.fml.common.discovery.ASMDataTable; +import net.minecraftforge.fml.common.discovery.ASMDataTable.ASMData; +import net.minecraftforge.fml.relauncher.Side; + import org.apache.logging.log4j.Level; import com.google.common.base.Strings; -import cpw.mods.fml.common.discovery.ASMDataTable; -import cpw.mods.fml.common.discovery.ASMDataTable.ASMData; -import cpw.mods.fml.relauncher.Side; - /** * @author cpw * diff --git a/fml/src/main/java/cpw/mods/fml/common/SaveInspectionHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/SaveInspectionHandler.java similarity index 91% rename from fml/src/main/java/cpw/mods/fml/common/SaveInspectionHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/SaveInspectionHandler.java index 4c339e0b78..23f90023dd 100644 --- a/fml/src/main/java/cpw/mods/fml/common/SaveInspectionHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/SaveInspectionHandler.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/fml/src/main/java/cpw/mods/fml/common/SidedProxy.java b/fml/src/main/java/net/minecraftforge/fml/common/SidedProxy.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/common/SidedProxy.java rename to fml/src/main/java/net/minecraftforge/fml/common/SidedProxy.java index 6b4b102dfd..472df0067e 100644 --- a/fml/src/main/java/cpw/mods/fml/common/SidedProxy.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/SidedProxy.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/fml/src/main/java/cpw/mods/fml/common/StartupQuery.java b/fml/src/main/java/net/minecraftforge/fml/common/StartupQuery.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/common/StartupQuery.java rename to fml/src/main/java/net/minecraftforge/fml/common/StartupQuery.java index 07d138983c..f75e7fd644 100644 --- a/fml/src/main/java/cpw/mods/fml/common/StartupQuery.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/StartupQuery.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/fml/src/main/java/cpw/mods/fml/common/TracingPrintStream.java b/fml/src/main/java/net/minecraftforge/fml/common/TracingPrintStream.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/TracingPrintStream.java rename to fml/src/main/java/net/minecraftforge/fml/common/TracingPrintStream.java index eb7a83d6f8..90e4b13d5f 100644 --- a/fml/src/main/java/cpw/mods/fml/common/TracingPrintStream.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/TracingPrintStream.java @@ -7,7 +7,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.io.PrintStream; diff --git a/fml/src/main/java/cpw/mods/fml/common/WorldAccessContainer.java b/fml/src/main/java/net/minecraftforge/fml/common/WorldAccessContainer.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/WorldAccessContainer.java rename to fml/src/main/java/net/minecraftforge/fml/common/WorldAccessContainer.java index 622f4b6748..59a18071ea 100644 --- a/fml/src/main/java/cpw/mods/fml/common/WorldAccessContainer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/WorldAccessContainer.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.util.Map; diff --git a/fml/src/main/java/cpw/mods/fml/common/WrongMinecraftVersionException.java b/fml/src/main/java/net/minecraftforge/fml/common/WrongMinecraftVersionException.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/WrongMinecraftVersionException.java rename to fml/src/main/java/net/minecraftforge/fml/common/WrongMinecraftVersionException.java index 77cbb07514..36a5e04487 100644 --- a/fml/src/main/java/cpw/mods/fml/common/WrongMinecraftVersionException.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/WrongMinecraftVersionException.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; public class WrongMinecraftVersionException extends RuntimeException { diff --git a/fml/src/main/java/cpw/mods/fml/common/ZipperUtil.java b/fml/src/main/java/net/minecraftforge/fml/common/ZipperUtil.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/common/ZipperUtil.java rename to fml/src/main/java/net/minecraftforge/fml/common/ZipperUtil.java index b4943b166b..62185b473e 100644 --- a/fml/src/main/java/cpw/mods/fml/common/ZipperUtil.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/ZipperUtil.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common; +package net.minecraftforge.fml.common; import java.io.Closeable; import java.io.File; diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/FMLSanityChecker.java similarity index 93% rename from fml/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java rename to fml/src/main/java/net/minecraftforge/fml/common/asm/FMLSanityChecker.java index 0246205c20..6e71362d1b 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/FMLSanityChecker.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.asm; +package net.minecraftforge.fml.common.asm; import java.io.File; import java.io.IOException; @@ -20,22 +20,22 @@ import java.security.cert.Certificate; import java.util.Map; import java.util.jar.JarEntry; import java.util.jar.JarFile; + import org.apache.logging.log4j.Level; import net.minecraft.launchwrapper.LaunchClassLoader; +import net.minecraftforge.fml.common.CertificateHelper; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; +import net.minecraftforge.fml.common.patcher.ClassPatchManager; +import net.minecraftforge.fml.relauncher.FMLLaunchHandler; +import net.minecraftforge.fml.relauncher.FMLRelaunchLog; +import net.minecraftforge.fml.relauncher.IFMLCallHook; +import net.minecraftforge.fml.relauncher.Side; import com.google.common.base.Charsets; import com.google.common.io.ByteStreams; -import cpw.mods.fml.common.CertificateHelper; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; -import cpw.mods.fml.common.patcher.ClassPatchManager; -import cpw.mods.fml.relauncher.FMLLaunchHandler; -import cpw.mods.fml.relauncher.FMLRelaunchLog; -import cpw.mods.fml.relauncher.IFMLCallHook; -import cpw.mods.fml.relauncher.Side; - public class FMLSanityChecker implements IFMLCallHook { 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(":", ""); diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/ReobfuscationMarker.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/ReobfuscationMarker.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/asm/ReobfuscationMarker.java rename to fml/src/main/java/net/minecraftforge/fml/common/asm/ReobfuscationMarker.java index b30fef263b..0b464f3b1a 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/ReobfuscationMarker.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/ReobfuscationMarker.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.asm; +package net.minecraftforge.fml.common.asm; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java rename to fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java index c428896c6f..ea571baf49 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.asm.transformers; +package net.minecraftforge.fml.common.asm.transformers; import static org.objectweb.asm.Opcodes.ACC_FINAL; import static org.objectweb.asm.Opcodes.ACC_PRIVATE; @@ -36,6 +36,7 @@ import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraftforge.fml.relauncher.FMLRelaunchLog; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; @@ -55,8 +56,6 @@ import com.google.common.io.CharSource; import com.google.common.io.LineProcessor; import com.google.common.io.Resources; -import cpw.mods.fml.relauncher.FMLRelaunchLog; - public class AccessTransformer implements IClassTransformer { private static final boolean DEBUG = Boolean.parseBoolean(System.getProperty("fml.debugAccessTransformer", "false")); diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/DeobfuscationTransformer.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/DeobfuscationTransformer.java similarity index 87% rename from fml/src/main/java/cpw/mods/fml/common/asm/transformers/DeobfuscationTransformer.java rename to fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/DeobfuscationTransformer.java index 34f45f69d5..aecd94d357 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/DeobfuscationTransformer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/DeobfuscationTransformer.java @@ -10,18 +10,17 @@ * cpw - implementation */ -package cpw.mods.fml.common.asm.transformers; +package net.minecraftforge.fml.common.asm.transformers; import net.minecraft.launchwrapper.IClassNameTransformer; import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; +import net.minecraftforge.fml.common.asm.transformers.deobf.FMLRemappingAdapter; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.commons.RemappingClassAdapter; -import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; -import cpw.mods.fml.common.asm.transformers.deobf.FMLRemappingAdapter; - public class DeobfuscationTransformer implements IClassTransformer, IClassNameTransformer { @Override diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/EventSubscriptionTransformer.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java rename to fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/EventSubscriptionTransformer.java index 9d76e27189..440f71a9f0 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/EventSubscriptionTransformer.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.asm.transformers; +package net.minecraftforge.fml.common.asm.transformers; import static org.objectweb.asm.ClassWriter.COMPUTE_FRAMES; import static org.objectweb.asm.ClassWriter.COMPUTE_MAXS; @@ -23,6 +23,7 @@ import static org.objectweb.asm.Type.getMethodDescriptor; import java.util.List; import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraftforge.fml.common.eventhandler.Event; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; @@ -39,8 +40,6 @@ import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.tree.TypeInsnNode; import org.objectweb.asm.tree.VarInsnNode; -import cpw.mods.fml.common.eventhandler.Event; - public class EventSubscriptionTransformer implements IClassTransformer { public EventSubscriptionTransformer() @@ -50,7 +49,7 @@ public class EventSubscriptionTransformer implements IClassTransformer @Override public byte[] transform(String name, String transformedName, byte[] bytes) { - if (bytes == null || name.equals("cpw.mods.fml.common.eventhandler.Event") || name.startsWith("net.minecraft.") || name.indexOf('.') == -1) + if (bytes == null || name.equals("net.minecraftforge.fml.common.eventhandler.Event") || name.startsWith("net.minecraft.") || name.indexOf('.') == -1) { return bytes; } @@ -92,7 +91,7 @@ public class EventSubscriptionTransformer implements IClassTransformer boolean hasGetListenerList = false; boolean hasDefaultCtr = false; - Class listenerListClazz = Class.forName("cpw.mods.fml.common.eventhandler.ListenerList", false, getClass().getClassLoader()); + Class listenerListClazz = Class.forName("net.minecraftforge.fml.common.eventhandler.ListenerList", false, getClass().getClassLoader()); Type tList = Type.getType(listenerListClazz); for (MethodNode method : (List)classNode.methods) diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/ItemStackTransformer.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/ItemStackTransformer.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/common/asm/transformers/ItemStackTransformer.java rename to fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/ItemStackTransformer.java index dd6ab2d7af..68b540775c 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/ItemStackTransformer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/ItemStackTransformer.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.asm.transformers; +package net.minecraftforge.fml.common.asm.transformers; import java.util.ListIterator; diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/MarkerTransformer.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java rename to fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/MarkerTransformer.java index 8f05923dca..1fcfcb1aea 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/MarkerTransformer.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.asm.transformers; +package net.minecraftforge.fml.common.asm.transformers; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/ModAPITransformer.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/ModAPITransformer.java similarity index 90% rename from fml/src/main/java/cpw/mods/fml/common/asm/transformers/ModAPITransformer.java rename to fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/ModAPITransformer.java index 4f01d0c0b4..bc0ede023c 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/ModAPITransformer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/ModAPITransformer.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.asm.transformers; +package net.minecraftforge.fml.common.asm.transformers; import java.util.Iterator; import java.util.List; @@ -7,6 +7,11 @@ import java.util.Map; import java.util.Set; import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModAPIManager; +import net.minecraftforge.fml.common.discovery.ASMDataTable; +import net.minecraftforge.fml.common.discovery.ASMDataTable.ASMData; +import net.minecraftforge.fml.relauncher.FMLRelaunchLog; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; @@ -17,12 +22,6 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Sets; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModAPIManager; -import cpw.mods.fml.common.discovery.ASMDataTable; -import cpw.mods.fml.common.discovery.ASMDataTable.ASMData; -import cpw.mods.fml.relauncher.FMLRelaunchLog; - public class ModAPITransformer implements IClassTransformer { private static final boolean logDebugInfo = Boolean.valueOf(System.getProperty("fml.debugAPITransformer", "true")); @@ -126,11 +125,11 @@ public class ModAPITransformer implements IClassTransformer { public void initTable(ASMDataTable dataTable) { optionals = ArrayListMultimap.create(); - Set interfaceLists = dataTable.getAll("cpw.mods.fml.common.Optional$InterfaceList"); + Set interfaceLists = dataTable.getAll("net.minecraftforge.fml.common.Optional$InterfaceList"); addData(unpackInterfaces(interfaceLists)); - Set interfaces = dataTable.getAll("cpw.mods.fml.common.Optional$Interface"); + Set interfaces = dataTable.getAll("net.minecraftforge.fml.common.Optional$Interface"); addData(interfaces); - Set methods = dataTable.getAll("cpw.mods.fml.common.Optional$Method"); + Set methods = dataTable.getAll("net.minecraftforge.fml.common.Optional$Method"); addData(methods); } diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/ModAccessTransformer.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/ModAccessTransformer.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/asm/transformers/ModAccessTransformer.java rename to fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/ModAccessTransformer.java index c9a88965c1..b44a234154 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/ModAccessTransformer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/ModAccessTransformer.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.asm.transformers; +package net.minecraftforge.fml.common.asm.transformers; import java.io.IOException; import java.io.InputStream; @@ -7,11 +7,13 @@ import java.util.Map; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.Manifest; + +import net.minecraftforge.fml.relauncher.FMLRelaunchLog; + import com.google.common.base.Charsets; import com.google.common.collect.Maps; import com.google.common.io.ByteSource; import com.google.common.io.CharSource; -import cpw.mods.fml.relauncher.FMLRelaunchLog; public class ModAccessTransformer extends AccessTransformer { private static Map embedded = Maps.newHashMap(); //Needs to be primitive so that both classloaders get the same class. diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/PatchingTransformer.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/PatchingTransformer.java similarity index 72% rename from fml/src/main/java/cpw/mods/fml/common/asm/transformers/PatchingTransformer.java rename to fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/PatchingTransformer.java index 5b44e7c20d..7b457298ff 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/PatchingTransformer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/PatchingTransformer.java @@ -1,7 +1,7 @@ -package cpw.mods.fml.common.asm.transformers; +package net.minecraftforge.fml.common.asm.transformers; import net.minecraft.launchwrapper.IClassTransformer; -import cpw.mods.fml.common.patcher.ClassPatchManager; +import net.minecraftforge.fml.common.patcher.ClassPatchManager; public class PatchingTransformer implements IClassTransformer { @Override diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/SideTransformer.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/SideTransformer.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/asm/transformers/SideTransformer.java rename to fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/SideTransformer.java index 3f45115ee1..36235f3367 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/SideTransformer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/SideTransformer.java @@ -10,12 +10,14 @@ * cpw - implementation */ -package cpw.mods.fml.common.asm.transformers; +package net.minecraftforge.fml.common.asm.transformers; import java.util.Iterator; import java.util.List; import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraftforge.fml.relauncher.FMLLaunchHandler; +import net.minecraftforge.fml.relauncher.SideOnly; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; @@ -25,9 +27,6 @@ import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.FieldNode; import org.objectweb.asm.tree.MethodNode; -import cpw.mods.fml.relauncher.FMLLaunchHandler; -import cpw.mods.fml.relauncher.SideOnly; - public class SideTransformer implements IClassTransformer { private static String SIDE = FMLLaunchHandler.side().name(); diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/TerminalTransformer.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/TerminalTransformer.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/asm/transformers/TerminalTransformer.java rename to fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/TerminalTransformer.java index aaf82f5e4d..fdef38f6c8 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/TerminalTransformer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/TerminalTransformer.java @@ -1,10 +1,10 @@ -package cpw.mods.fml.common.asm.transformers; +package net.minecraftforge.fml.common.asm.transformers; import org.objectweb.asm.*; -import cpw.mods.fml.relauncher.FMLRelaunchLog; -import cpw.mods.fml.relauncher.FMLSecurityManager.ExitTrappedException; import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraftforge.fml.relauncher.FMLRelaunchLog; +import net.minecraftforge.fml.relauncher.FMLSecurityManager.ExitTrappedException; public class TerminalTransformer implements IClassTransformer { @@ -133,7 +133,7 @@ public class TerminalTransformer implements IClassTransformer String callingClass = cause.length > 2 ? cause[3].getClassName() : "none"; String callingParent = cause.length > 3 ? cause[4].getClassName() : "none"; // FML is allowed to call system exit and the Minecraft applet (from the quit button), and the dedicated server (from itself) - if (!(callingClass.startsWith("cpw.mods.fml.") || + if (!(callingClass.startsWith("net.minecraftforge.fml.") || ("net.minecraft.client.Minecraft".equals(callingClass) && "net.minecraft.client.Minecraft".equals(callingParent)) || ("net.minecraft.server.gui.MinecraftServerGui$1".equals(callingClass) && "java.awt.AWTEventMulticaster".equals(callingParent)) || ("net.minecraft.server.dedicated.DedicatedServer".equals(callingClass) && "net.minecraft.server.MinecraftServer".equals(callingParent))) diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java rename to fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java index 3fb6a14858..4698bfe944 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.asm.transformers.deobf; +package net.minecraftforge.fml.common.asm.transformers.deobf; import java.io.File; import java.io.FileInputStream; @@ -22,6 +22,8 @@ import java.util.Map; import java.util.Set; import net.minecraft.launchwrapper.LaunchClassLoader; +import net.minecraftforge.fml.common.patcher.ClassPatchManager; +import net.minecraftforge.fml.relauncher.FMLRelaunchLog; import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassReader; @@ -44,9 +46,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.io.CharSource; -import cpw.mods.fml.common.patcher.ClassPatchManager; -import cpw.mods.fml.relauncher.FMLRelaunchLog; - public class FMLDeobfuscatingRemapper extends Remapper { public static final FMLDeobfuscatingRemapper INSTANCE = new FMLDeobfuscatingRemapper(); diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java rename to fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java index f312560e0f..1dc2040551 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.asm.transformers.deobf; +package net.minecraftforge.fml.common.asm.transformers.deobf; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.MethodVisitor; diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/LZMAInputSupplier.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/LZMAInputSupplier.java similarity index 93% rename from fml/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/LZMAInputSupplier.java rename to fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/LZMAInputSupplier.java index 9bc6e39e71..4fe8d526ed 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/LZMAInputSupplier.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/LZMAInputSupplier.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.asm.transformers.deobf; +package net.minecraftforge.fml.common.asm.transformers.deobf; import java.io.IOException; import java.io.InputStream; diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/ASMDataTable.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/ASMDataTable.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/discovery/ASMDataTable.java rename to fml/src/main/java/net/minecraftforge/fml/common/discovery/ASMDataTable.java index ce180102f1..aa82dd0b6a 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/ASMDataTable.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/ASMDataTable.java @@ -10,12 +10,14 @@ * cpw - implementation */ -package cpw.mods.fml.common.discovery; +package net.minecraftforge.fml.common.discovery; import java.util.List; import java.util.Map; import java.util.Set; +import net.minecraftforge.fml.common.ModContainer; + import com.google.common.base.Predicate; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMap; @@ -25,8 +27,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; -import cpw.mods.fml.common.ModContainer; - public class ASMDataTable { public final static class ASMData implements Cloneable diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/ContainerType.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/ContainerType.java similarity index 90% rename from fml/src/main/java/cpw/mods/fml/common/discovery/ContainerType.java rename to fml/src/main/java/net/minecraftforge/fml/common/discovery/ContainerType.java index cd82f899b9..2a9e14b00c 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/ContainerType.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/ContainerType.java @@ -10,13 +10,13 @@ * cpw - implementation */ -package cpw.mods.fml.common.discovery; +package net.minecraftforge.fml.common.discovery; import java.util.List; -import com.google.common.base.Throwables; +import net.minecraftforge.fml.common.ModContainer; -import cpw.mods.fml.common.ModContainer; +import com.google.common.base.Throwables; public enum ContainerType { diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/DirectoryDiscoverer.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java similarity index 91% rename from fml/src/main/java/cpw/mods/fml/common/discovery/DirectoryDiscoverer.java rename to fml/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java index 199ec600fd..4608233bdf 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/DirectoryDiscoverer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.discovery; +package net.minecraftforge.fml.common.discovery; import java.io.File; import java.io.FileFilter; @@ -19,18 +19,18 @@ import java.util.Arrays; import java.util.List; import java.util.regex.Matcher; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.LoaderException; +import net.minecraftforge.fml.common.MetadataCollection; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.ModContainerFactory; +import net.minecraftforge.fml.common.discovery.asm.ASMModParser; + import org.apache.logging.log4j.Level; import com.google.common.base.Throwables; import com.google.common.collect.Lists; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.LoaderException; -import cpw.mods.fml.common.MetadataCollection; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.ModContainerFactory; -import cpw.mods.fml.common.discovery.asm.ASMModParser; - public class DirectoryDiscoverer implements ITypeDiscoverer { private class ClassFilter implements FileFilter diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/ITypeDiscoverer.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/ITypeDiscoverer.java similarity index 86% rename from fml/src/main/java/cpw/mods/fml/common/discovery/ITypeDiscoverer.java rename to fml/src/main/java/net/minecraftforge/fml/common/discovery/ITypeDiscoverer.java index e194469534..144526a727 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/ITypeDiscoverer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/ITypeDiscoverer.java @@ -10,12 +10,12 @@ * cpw - implementation */ -package cpw.mods.fml.common.discovery; +package net.minecraftforge.fml.common.discovery; import java.util.List; import java.util.regex.Pattern; -import cpw.mods.fml.common.ModContainer; +import net.minecraftforge.fml.common.ModContainer; public interface ITypeDiscoverer { diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/JarDiscoverer.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/JarDiscoverer.java similarity index 91% rename from fml/src/main/java/cpw/mods/fml/common/discovery/JarDiscoverer.java rename to fml/src/main/java/net/minecraftforge/fml/common/discovery/JarDiscoverer.java index 7b331f1dff..6c83c69665 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/JarDiscoverer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/JarDiscoverer.java @@ -10,24 +10,26 @@ * cpw - implementation */ -package cpw.mods.fml.common.discovery; +package net.minecraftforge.fml.common.discovery; import java.util.Collections; import java.util.List; import java.util.jar.JarFile; + +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.LoaderException; +import net.minecraftforge.fml.common.MetadataCollection; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.ModContainerFactory; +import net.minecraftforge.fml.common.discovery.asm.ASMModParser; + import org.apache.logging.log4j.Level; + import java.util.regex.Matcher; import java.util.zip.ZipEntry; import com.google.common.collect.Lists; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.LoaderException; -import cpw.mods.fml.common.MetadataCollection; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.ModContainerFactory; -import cpw.mods.fml.common.discovery.asm.ASMModParser; - public class JarDiscoverer implements ITypeDiscoverer { @Override diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/ModCandidate.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/ModCandidate.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/discovery/ModCandidate.java rename to fml/src/main/java/net/minecraftforge/fml/common/discovery/ModCandidate.java index 7581f67ca5..2c8d366af6 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/ModCandidate.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/ModCandidate.java @@ -10,19 +10,19 @@ * cpw - implementation */ -package cpw.mods.fml.common.discovery; +package net.minecraftforge.fml.common.discovery; import java.io.File; import java.util.List; import java.util.Set; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.discovery.asm.ASMModParser; + import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.discovery.asm.ASMModParser; - public class ModCandidate { diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/ModDiscoverer.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/ModDiscoverer.java similarity index 92% rename from fml/src/main/java/cpw/mods/fml/common/discovery/ModDiscoverer.java rename to fml/src/main/java/net/minecraftforge/fml/common/discovery/ModDiscoverer.java index a1fb9812d0..e1a9d84ead 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/ModDiscoverer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/ModDiscoverer.java @@ -10,26 +10,28 @@ * cpw - implementation */ -package cpw.mods.fml.common.discovery; +package net.minecraftforge.fml.common.discovery; import java.io.File; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; + +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.LoaderException; +import net.minecraftforge.fml.common.ModClassLoader; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.relauncher.CoreModManager; +import net.minecraftforge.fml.relauncher.FileListHelper; +import net.minecraftforge.fml.relauncher.ModListHelper; + import org.apache.logging.log4j.Level; + import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.ObjectArrays; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.LoaderException; -import cpw.mods.fml.common.ModClassLoader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.relauncher.CoreModManager; -import cpw.mods.fml.relauncher.FileListHelper; -import cpw.mods.fml.relauncher.ModListHelper; - public class ModDiscoverer { private static Pattern zipJar = Pattern.compile("(.+).(zip|jar)$"); diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ASMModParser.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ASMModParser.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/discovery/asm/ASMModParser.java rename to fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ASMModParser.java index 9e2ad80906..a7bc19c89a 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ASMModParser.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ASMModParser.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.discovery.asm; +package net.minecraftforge.fml.common.discovery.asm; import java.io.IOException; import java.io.InputStream; @@ -18,6 +18,11 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.LoaderException; +import net.minecraftforge.fml.common.discovery.ASMDataTable; +import net.minecraftforge.fml.common.discovery.ModCandidate; + import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassReader; import org.objectweb.asm.Type; @@ -26,11 +31,6 @@ import com.google.common.base.Objects; import com.google.common.base.Strings; import com.google.common.collect.Lists; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.LoaderException; -import cpw.mods.fml.common.discovery.ASMDataTable; -import cpw.mods.fml.common.discovery.ModCandidate; - public class ASMModParser { diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotation.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ModAnnotation.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotation.java rename to fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ModAnnotation.java index 33c15c8c55..927a28cd04 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotation.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ModAnnotation.java @@ -10,19 +10,19 @@ * cpw - implementation */ -package cpw.mods.fml.common.discovery.asm; +package net.minecraftforge.fml.common.discovery.asm; import java.util.ArrayList; import java.util.Map; +import net.minecraftforge.fml.common.discovery.asm.ASMModParser.AnnotationType; + import org.objectweb.asm.Type; import com.google.common.base.Objects; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import cpw.mods.fml.common.discovery.asm.ASMModParser.AnnotationType; - public class ModAnnotation { public class EnumHolder diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotationVisitor.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ModAnnotationVisitor.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotationVisitor.java rename to fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ModAnnotationVisitor.java index 64d12384da..e748f0d283 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotationVisitor.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ModAnnotationVisitor.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.discovery.asm; +package net.minecraftforge.fml.common.discovery.asm; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.Opcodes; diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModClassVisitor.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ModClassVisitor.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModClassVisitor.java rename to fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ModClassVisitor.java index 97d7f85e39..1c078ca170 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModClassVisitor.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ModClassVisitor.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.discovery.asm; +package net.minecraftforge.fml.common.discovery.asm; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.ClassVisitor; diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModFieldVisitor.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ModFieldVisitor.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModFieldVisitor.java rename to fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ModFieldVisitor.java index dba33cb255..a436344552 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModFieldVisitor.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ModFieldVisitor.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.discovery.asm; +package net.minecraftforge.fml.common.discovery.asm; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.FieldVisitor; diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ModMethodVisitor.java similarity index 93% rename from fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java rename to fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ModMethodVisitor.java index cf9fe0eabe..e497894eec 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/asm/ModMethodVisitor.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.discovery.asm; +package net.minecraftforge.fml.common.discovery.asm; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.MethodVisitor; diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLConstructionEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLConstructionEvent.java similarity index 85% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLConstructionEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLConstructionEvent.java index a54898d545..9d259bcc33 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLConstructionEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLConstructionEvent.java @@ -10,14 +10,14 @@ * cpw - implementation */ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; + +import net.minecraftforge.fml.common.ModClassLoader; +import net.minecraftforge.fml.common.LoaderState.ModState; +import net.minecraftforge.fml.common.discovery.ASMDataTable; import com.google.common.collect.ListMultimap; -import cpw.mods.fml.common.LoaderState.ModState; -import cpw.mods.fml.common.ModClassLoader; -import cpw.mods.fml.common.discovery.ASMDataTable; - public class FMLConstructionEvent extends FMLStateEvent { private ModClassLoader modClassLoader; diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLEvent.java similarity index 85% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLEvent.java index 18c204be8d..686fa88d12 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLEvent.java @@ -10,9 +10,9 @@ * cpw - implementation */ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; -import cpw.mods.fml.common.ModContainer; +import net.minecraftforge.fml.common.ModContainer; public class FMLEvent { diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLFingerprintViolationEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLFingerprintViolationEvent.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLFingerprintViolationEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLFingerprintViolationEvent.java index bf09278c46..e13280ee58 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLFingerprintViolationEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLFingerprintViolationEvent.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; import java.io.File; import java.util.Set; diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLInitializationEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLInitializationEvent.java similarity index 85% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLInitializationEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLInitializationEvent.java index e38af5c4d7..19c6968d04 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLInitializationEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLInitializationEvent.java @@ -10,9 +10,9 @@ * cpw - implementation */ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; -import cpw.mods.fml.common.LoaderState.ModState; +import net.minecraftforge.fml.common.LoaderState.ModState; public class FMLInitializationEvent extends FMLStateEvent { diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLInterModComms.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLInterModComms.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLInterModComms.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLInterModComms.java index 00542a50e5..dcbc80cbfa 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLInterModComms.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLInterModComms.java @@ -10,21 +10,20 @@ * cpw - implementation */ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.LoaderState; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.Mod.Instance; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.LoaderState; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.ModContainer; - /** * Simple intermod communications to receive simple messages directed at you * from other mods diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLLoadCompleteEvent.java similarity index 85% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLLoadCompleteEvent.java index 2007ad79e8..45cf932163 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLLoadCompleteEvent.java @@ -10,9 +10,9 @@ * cpw - implementation */ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; -import cpw.mods.fml.common.LoaderState.ModState; +import net.minecraftforge.fml.common.LoaderState.ModState; public class FMLLoadCompleteEvent extends FMLStateEvent { diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLLoadEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLLoadEvent.java similarity index 89% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLLoadEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLLoadEvent.java index c788b9de63..33dfca0443 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLLoadEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLLoadEvent.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; public class FMLLoadEvent { diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLMissingMappingsEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLMissingMappingsEvent.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLMissingMappingsEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLMissingMappingsEvent.java index 94ea8e3eaa..055bb1b6e0 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLMissingMappingsEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLMissingMappingsEvent.java @@ -1,17 +1,16 @@ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.Item; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.registry.GameData; +import net.minecraftforge.fml.common.registry.GameRegistry; import com.google.common.collect.ImmutableList; import com.google.common.collect.ListMultimap; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.common.registry.GameRegistry; - /** * This event is fired if a world is loaded that has block and item mappings referring the mod that are not * in existence. diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLModDisabledEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLModDisabledEvent.java similarity index 55% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLModDisabledEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLModDisabledEvent.java index 621bf16885..d3054f9c0e 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLModDisabledEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLModDisabledEvent.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; public class FMLModDisabledEvent extends FMLEvent { } diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLModIdMappingEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLModIdMappingEvent.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLModIdMappingEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLModIdMappingEvent.java index b25671c6f1..8bb74d0281 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLModIdMappingEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLModIdMappingEvent.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; import java.util.Collections; import java.util.Comparator; diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLPostInitializationEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLPostInitializationEvent.java similarity index 88% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLPostInitializationEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLPostInitializationEvent.java index 2efaac25d1..f281b4e8e5 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLPostInitializationEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLPostInitializationEvent.java @@ -10,13 +10,13 @@ * cpw - implementation */ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; + +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.LoaderState.ModState; import com.google.common.base.Throwables; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.LoaderState.ModState; - public class FMLPostInitializationEvent extends FMLStateEvent { public FMLPostInitializationEvent(Object... data) diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLPreInitializationEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLPreInitializationEvent.java similarity index 91% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLPreInitializationEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLPreInitializationEvent.java index 1851b2fdb1..b8e803caed 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLPreInitializationEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLPreInitializationEvent.java @@ -10,22 +10,22 @@ * cpw - implementation */ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; import java.io.File; import java.security.CodeSource; import java.security.cert.Certificate; import java.util.Properties; +import net.minecraftforge.fml.common.FMLModContainer; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.ModMetadata; +import net.minecraftforge.fml.common.LoaderState.ModState; +import net.minecraftforge.fml.common.discovery.ASMDataTable; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import cpw.mods.fml.common.LoaderState.ModState; -import cpw.mods.fml.common.FMLModContainer; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.ModMetadata; -import cpw.mods.fml.common.discovery.ASMDataTable; - public class FMLPreInitializationEvent extends FMLStateEvent { private ModMetadata modMetadata; diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLServerAboutToStartEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLServerAboutToStartEvent.java similarity index 88% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLServerAboutToStartEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLServerAboutToStartEvent.java index 14979e89fd..b58c80b438 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLServerAboutToStartEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLServerAboutToStartEvent.java @@ -10,10 +10,10 @@ * cpw - implementation */ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; import net.minecraft.server.MinecraftServer; -import cpw.mods.fml.common.LoaderState.ModState; +import net.minecraftforge.fml.common.LoaderState.ModState; public class FMLServerAboutToStartEvent extends FMLStateEvent { diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLServerStartedEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLServerStartedEvent.java similarity index 85% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLServerStartedEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLServerStartedEvent.java index 32854acdc3..c0fddc92fd 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLServerStartedEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLServerStartedEvent.java @@ -10,9 +10,9 @@ * cpw - implementation */ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; -import cpw.mods.fml.common.LoaderState.ModState; +import net.minecraftforge.fml.common.LoaderState.ModState; public class FMLServerStartedEvent extends FMLStateEvent { diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLServerStartingEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLServerStartingEvent.java similarity index 91% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLServerStartingEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLServerStartingEvent.java index c63c54c6d4..fd0131cbcf 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLServerStartingEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLServerStartingEvent.java @@ -10,12 +10,12 @@ * cpw - implementation */ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; import net.minecraft.command.CommandHandler; import net.minecraft.command.ICommand; import net.minecraft.server.MinecraftServer; -import cpw.mods.fml.common.LoaderState.ModState; +import net.minecraftforge.fml.common.LoaderState.ModState; public class FMLServerStartingEvent extends FMLStateEvent { diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLServerStoppedEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLServerStoppedEvent.java similarity index 85% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLServerStoppedEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLServerStoppedEvent.java index 3361227581..6a5200e9fc 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLServerStoppedEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLServerStoppedEvent.java @@ -10,9 +10,9 @@ * cpw - implementation */ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; -import cpw.mods.fml.common.LoaderState.ModState; +import net.minecraftforge.fml.common.LoaderState.ModState; public class FMLServerStoppedEvent extends FMLStateEvent { diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLServerStoppingEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLServerStoppingEvent.java similarity index 85% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLServerStoppingEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLServerStoppingEvent.java index 933fc3da58..ea95654305 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLServerStoppingEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLServerStoppingEvent.java @@ -10,9 +10,9 @@ * cpw - implementation */ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; -import cpw.mods.fml.common.LoaderState.ModState; +import net.minecraftforge.fml.common.LoaderState.ModState; public class FMLServerStoppingEvent extends FMLStateEvent { diff --git a/fml/src/main/java/cpw/mods/fml/common/event/FMLStateEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLStateEvent.java similarity index 75% rename from fml/src/main/java/cpw/mods/fml/common/event/FMLStateEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/event/FMLStateEvent.java index 3d0a3ed714..c2a8cc529f 100644 --- a/fml/src/main/java/cpw/mods/fml/common/event/FMLStateEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLStateEvent.java @@ -10,11 +10,11 @@ * cpw - implementation */ -package cpw.mods.fml.common.event; +package net.minecraftforge.fml.common.event; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.LoaderState.ModState; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.LoaderState.ModState; +import net.minecraftforge.fml.relauncher.Side; public abstract class FMLStateEvent extends FMLEvent { diff --git a/fml/src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/ASMEventHandler.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/eventhandler/ASMEventHandler.java index 7eeb64419e..68b9926705 100644 --- a/fml/src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/ASMEventHandler.java @@ -1,17 +1,18 @@ -package cpw.mods.fml.common.eventhandler; +package net.minecraftforge.fml.common.eventhandler; import static org.objectweb.asm.Opcodes.*; import java.lang.reflect.Method; import java.util.HashMap; +import net.minecraftforge.fml.common.ModContainer; + import org.apache.logging.log4j.ThreadContext; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Type; import com.google.common.collect.Maps; -import cpw.mods.fml.common.ModContainer; public class ASMEventHandler implements IEventListener diff --git a/fml/src/main/java/cpw/mods/fml/common/eventhandler/Cancelable.java b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/Cancelable.java similarity index 83% rename from fml/src/main/java/cpw/mods/fml/common/eventhandler/Cancelable.java rename to fml/src/main/java/net/minecraftforge/fml/common/eventhandler/Cancelable.java index 4b7389615e..635dcaf835 100644 --- a/fml/src/main/java/cpw/mods/fml/common/eventhandler/Cancelable.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/Cancelable.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.eventhandler; +package net.minecraftforge.fml.common.eventhandler; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/fml/src/main/java/cpw/mods/fml/common/eventhandler/Event.java b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/Event.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/common/eventhandler/Event.java rename to fml/src/main/java/net/minecraftforge/fml/common/eventhandler/Event.java index 80ac792406..a1a60df074 100644 --- a/fml/src/main/java/cpw/mods/fml/common/eventhandler/Event.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/Event.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.eventhandler; +package net.minecraftforge.fml.common.eventhandler; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/fml/src/main/java/cpw/mods/fml/common/eventhandler/EventBus.java b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/EventBus.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/eventhandler/EventBus.java rename to fml/src/main/java/net/minecraftforge/fml/common/eventhandler/EventBus.java index d4570b0efb..400c19097f 100644 --- a/fml/src/main/java/cpw/mods/fml/common/eventhandler/EventBus.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/EventBus.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.eventhandler; +package net.minecraftforge.fml.common.eventhandler; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -9,6 +9,10 @@ import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nonnull; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModContainer; + import org.apache.logging.log4j.Level; import com.google.common.base.Preconditions; @@ -16,10 +20,6 @@ import com.google.common.base.Throwables; import com.google.common.collect.MapMaker; import com.google.common.reflect.TypeToken; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; - public class EventBus implements IEventExceptionHandler { private static int maxID = 0; diff --git a/fml/src/main/java/cpw/mods/fml/common/eventhandler/EventPriority.java b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/EventPriority.java similarity index 90% rename from fml/src/main/java/cpw/mods/fml/common/eventhandler/EventPriority.java rename to fml/src/main/java/net/minecraftforge/fml/common/eventhandler/EventPriority.java index e9b54f61e5..65ca207042 100644 --- a/fml/src/main/java/cpw/mods/fml/common/eventhandler/EventPriority.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/EventPriority.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.eventhandler; +package net.minecraftforge.fml.common.eventhandler; public enum EventPriority implements IEventListener { diff --git a/fml/src/main/java/cpw/mods/fml/common/eventhandler/IEventExceptionHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/IEventExceptionHandler.java similarity index 92% rename from fml/src/main/java/cpw/mods/fml/common/eventhandler/IEventExceptionHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/eventhandler/IEventExceptionHandler.java index 7ad0929031..749128b43f 100644 --- a/fml/src/main/java/cpw/mods/fml/common/eventhandler/IEventExceptionHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/IEventExceptionHandler.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.eventhandler; +package net.minecraftforge.fml.common.eventhandler; public interface IEventExceptionHandler { diff --git a/fml/src/main/java/cpw/mods/fml/common/eventhandler/IEventListener.java b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/IEventListener.java similarity index 59% rename from fml/src/main/java/cpw/mods/fml/common/eventhandler/IEventListener.java rename to fml/src/main/java/net/minecraftforge/fml/common/eventhandler/IEventListener.java index f5eefd41b0..2d2630782c 100644 --- a/fml/src/main/java/cpw/mods/fml/common/eventhandler/IEventListener.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/IEventListener.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.eventhandler; +package net.minecraftforge.fml.common.eventhandler; diff --git a/fml/src/main/java/cpw/mods/fml/common/eventhandler/ListenerList.java b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/ListenerList.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/common/eventhandler/ListenerList.java rename to fml/src/main/java/net/minecraftforge/fml/common/eventhandler/ListenerList.java index 4aede806f8..f2590eae94 100644 --- a/fml/src/main/java/cpw/mods/fml/common/eventhandler/ListenerList.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/ListenerList.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.eventhandler; +package net.minecraftforge.fml.common.eventhandler; import java.util.*; import com.google.common.collect.ImmutableList; diff --git a/fml/src/main/java/cpw/mods/fml/common/eventhandler/SubscribeEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/SubscribeEvent.java similarity index 88% rename from fml/src/main/java/cpw/mods/fml/common/eventhandler/SubscribeEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/eventhandler/SubscribeEvent.java index 6effc4240d..09bf79a5bb 100644 --- a/fml/src/main/java/cpw/mods/fml/common/eventhandler/SubscribeEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/eventhandler/SubscribeEvent.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.eventhandler; +package net.minecraftforge.fml.common.eventhandler; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/fml/src/main/java/cpw/mods/fml/common/functions/ArtifactVersionNameFunction.java b/fml/src/main/java/net/minecraftforge/fml/common/functions/ArtifactVersionNameFunction.java similarity index 66% rename from fml/src/main/java/cpw/mods/fml/common/functions/ArtifactVersionNameFunction.java rename to fml/src/main/java/net/minecraftforge/fml/common/functions/ArtifactVersionNameFunction.java index bc67706cf8..6d4b18ce3b 100644 --- a/fml/src/main/java/cpw/mods/fml/common/functions/ArtifactVersionNameFunction.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/functions/ArtifactVersionNameFunction.java @@ -1,9 +1,9 @@ -package cpw.mods.fml.common.functions; +package net.minecraftforge.fml.common.functions; + +import net.minecraftforge.fml.common.versioning.ArtifactVersion; import com.google.common.base.Function; -import cpw.mods.fml.common.versioning.ArtifactVersion; - public class ArtifactVersionNameFunction implements Function { @Override public String apply(ArtifactVersion v) diff --git a/fml/src/main/java/cpw/mods/fml/common/functions/CollectionWrapperFactory.java b/fml/src/main/java/net/minecraftforge/fml/common/functions/CollectionWrapperFactory.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/functions/CollectionWrapperFactory.java rename to fml/src/main/java/net/minecraftforge/fml/common/functions/CollectionWrapperFactory.java index 1211b7f306..aed3a8af6f 100644 --- a/fml/src/main/java/cpw/mods/fml/common/functions/CollectionWrapperFactory.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/functions/CollectionWrapperFactory.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.functions; +package net.minecraftforge.fml.common.functions; import java.util.Collection; import java.util.List; diff --git a/fml/src/main/java/cpw/mods/fml/common/functions/GenericIterableFactory.java b/fml/src/main/java/net/minecraftforge/fml/common/functions/GenericIterableFactory.java similarity index 84% rename from fml/src/main/java/cpw/mods/fml/common/functions/GenericIterableFactory.java rename to fml/src/main/java/net/minecraftforge/fml/common/functions/GenericIterableFactory.java index 85be09b2eb..83534b3def 100644 --- a/fml/src/main/java/cpw/mods/fml/common/functions/GenericIterableFactory.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/functions/GenericIterableFactory.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.functions; +package net.minecraftforge.fml.common.functions; import com.google.common.collect.Iterables; diff --git a/fml/src/main/java/cpw/mods/fml/common/functions/ModIdFunction.java b/fml/src/main/java/net/minecraftforge/fml/common/functions/ModIdFunction.java similarity index 85% rename from fml/src/main/java/cpw/mods/fml/common/functions/ModIdFunction.java rename to fml/src/main/java/net/minecraftforge/fml/common/functions/ModIdFunction.java index 0c63498718..11f19ff644 100644 --- a/fml/src/main/java/cpw/mods/fml/common/functions/ModIdFunction.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/functions/ModIdFunction.java @@ -10,12 +10,12 @@ * cpw - implementation */ -package cpw.mods.fml.common.functions; +package net.minecraftforge.fml.common.functions; + +import net.minecraftforge.fml.common.ModContainer; import com.google.common.base.Function; -import cpw.mods.fml.common.ModContainer; - public final class ModIdFunction implements Function { @Override diff --git a/fml/src/main/java/cpw/mods/fml/common/functions/ModNameFunction.java b/fml/src/main/java/net/minecraftforge/fml/common/functions/ModNameFunction.java similarity index 85% rename from fml/src/main/java/cpw/mods/fml/common/functions/ModNameFunction.java rename to fml/src/main/java/net/minecraftforge/fml/common/functions/ModNameFunction.java index ffe24daf73..ab6970aeef 100644 --- a/fml/src/main/java/cpw/mods/fml/common/functions/ModNameFunction.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/functions/ModNameFunction.java @@ -10,12 +10,12 @@ * cpw - implementation */ -package cpw.mods.fml.common.functions; +package net.minecraftforge.fml.common.functions; + +import net.minecraftforge.fml.common.ModContainer; import com.google.common.base.Function; -import cpw.mods.fml.common.ModContainer; - public class ModNameFunction implements Function { @Override diff --git a/fml/src/main/java/cpw/mods/fml/common/functions/TypeCastFunction.java b/fml/src/main/java/net/minecraftforge/fml/common/functions/TypeCastFunction.java similarity index 86% rename from fml/src/main/java/cpw/mods/fml/common/functions/TypeCastFunction.java rename to fml/src/main/java/net/minecraftforge/fml/common/functions/TypeCastFunction.java index e82a212655..d4110e5ea2 100644 --- a/fml/src/main/java/cpw/mods/fml/common/functions/TypeCastFunction.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/functions/TypeCastFunction.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.functions; +package net.minecraftforge.fml.common.functions; import com.google.common.base.Function; diff --git a/fml/src/main/java/cpw/mods/fml/common/gameevent/InputEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/gameevent/InputEvent.java similarity index 61% rename from fml/src/main/java/cpw/mods/fml/common/gameevent/InputEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/gameevent/InputEvent.java index b9482da018..3165fa3fce 100644 --- a/fml/src/main/java/cpw/mods/fml/common/gameevent/InputEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/gameevent/InputEvent.java @@ -1,6 +1,6 @@ -package cpw.mods.fml.common.gameevent; +package net.minecraftforge.fml.common.gameevent; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.Event; public class InputEvent extends Event { public static class MouseInputEvent extends InputEvent {} diff --git a/fml/src/main/java/cpw/mods/fml/common/gameevent/PlayerEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/gameevent/PlayerEvent.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/gameevent/PlayerEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/gameevent/PlayerEvent.java index 31ba84b502..56f1d01e48 100644 --- a/fml/src/main/java/cpw/mods/fml/common/gameevent/PlayerEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/gameevent/PlayerEvent.java @@ -1,10 +1,10 @@ -package cpw.mods.fml.common.gameevent; +package net.minecraftforge.fml.common.gameevent; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.Event; public class PlayerEvent extends Event { public final EntityPlayer player; diff --git a/fml/src/main/java/cpw/mods/fml/common/gameevent/TickEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/gameevent/TickEvent.java similarity index 92% rename from fml/src/main/java/cpw/mods/fml/common/gameevent/TickEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/gameevent/TickEvent.java index 5cde8051b8..6ec9643a21 100644 --- a/fml/src/main/java/cpw/mods/fml/common/gameevent/TickEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/gameevent/TickEvent.java @@ -1,10 +1,10 @@ -package cpw.mods.fml.common.gameevent; +package net.minecraftforge.fml.common.gameevent; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.fml.relauncher.Side; public class TickEvent extends Event { public enum Type { diff --git a/fml/src/main/java/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java b/fml/src/main/java/net/minecraftforge/fml/common/launcher/FMLDeobfTweaker.java similarity index 73% rename from fml/src/main/java/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java rename to fml/src/main/java/net/minecraftforge/fml/common/launcher/FMLDeobfTweaker.java index 6c738cd639..e8fa787536 100644 --- a/fml/src/main/java/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/launcher/FMLDeobfTweaker.java @@ -1,16 +1,15 @@ -package cpw.mods.fml.common.launcher; +package net.minecraftforge.fml.common.launcher; import java.io.File; import java.lang.reflect.Method; import java.util.List; -import cpw.mods.fml.relauncher.CoreModManager; -import cpw.mods.fml.relauncher.FMLInjectionData; -import cpw.mods.fml.relauncher.FMLRelaunchLog; - import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; +import net.minecraftforge.fml.relauncher.CoreModManager; +import net.minecraftforge.fml.relauncher.FMLInjectionData; +import net.minecraftforge.fml.relauncher.FMLRelaunchLog; public class FMLDeobfTweaker implements ITweaker { @Override @@ -24,19 +23,19 @@ public class FMLDeobfTweaker implements ITweaker { // Deobfuscation transformer, always last, and the access transformer tweaker as well if (!(Boolean)Launch.blackboard.get("fml.deobfuscatedEnvironment")) { - classLoader.registerTransformer("cpw.mods.fml.common.asm.transformers.DeobfuscationTransformer"); + classLoader.registerTransformer("net.minecraftforge.fml.common.asm.transformers.DeobfuscationTransformer"); } // Add all the access transformers now as well for (String transformer : CoreModManager.getAccessTransformers()) { classLoader.registerTransformer(transformer); } - classLoader.registerTransformer("cpw.mods.fml.common.asm.transformers.ModAccessTransformer"); - classLoader.registerTransformer("cpw.mods.fml.common.asm.transformers.ItemStackTransformer"); + classLoader.registerTransformer("net.minecraftforge.fml.common.asm.transformers.ModAccessTransformer"); + classLoader.registerTransformer("net.minecraftforge.fml.common.asm.transformers.ItemStackTransformer"); try { FMLRelaunchLog.fine("Validating minecraft"); - Class loaderClazz = Class.forName("cpw.mods.fml.common.Loader", true, classLoader); + Class loaderClazz = Class.forName("net.minecraftforge.fml.common.Loader", true, classLoader); Method m = loaderClazz.getMethod("injectData", Object[].class); m.invoke(null, (Object)FMLInjectionData.data()); m = loaderClazz.getMethod("instance"); diff --git a/fml/src/main/java/cpw/mods/fml/common/launcher/FMLInjectionAndSortingTweaker.java b/fml/src/main/java/net/minecraftforge/fml/common/launcher/FMLInjectionAndSortingTweaker.java similarity index 87% rename from fml/src/main/java/cpw/mods/fml/common/launcher/FMLInjectionAndSortingTweaker.java rename to fml/src/main/java/net/minecraftforge/fml/common/launcher/FMLInjectionAndSortingTweaker.java index 42b4b98ddf..9d15ceb58c 100644 --- a/fml/src/main/java/cpw/mods/fml/common/launcher/FMLInjectionAndSortingTweaker.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/launcher/FMLInjectionAndSortingTweaker.java @@ -1,13 +1,12 @@ -package cpw.mods.fml.common.launcher; +package net.minecraftforge.fml.common.launcher; import java.io.File; import java.util.List; -import cpw.mods.fml.relauncher.CoreModManager; - import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; +import net.minecraftforge.fml.relauncher.CoreModManager; /** * This class is to manage the injection of coremods as tweakers into the tweak framework. @@ -33,7 +32,7 @@ public class FMLInjectionAndSortingTweaker implements ITweaker { CoreModManager.sortTweakList(); @SuppressWarnings("unchecked") List newTweaks = (List) Launch.blackboard.get("TweakClasses"); - newTweaks.add("cpw.mods.fml.common.launcher.TerminalTweaker"); + newTweaks.add("net.minecraftforge.fml.common.launcher.TerminalTweaker"); } run = true; } diff --git a/fml/src/main/java/cpw/mods/fml/common/launcher/FMLServerTweaker.java b/fml/src/main/java/net/minecraftforge/fml/common/launcher/FMLServerTweaker.java similarity index 66% rename from fml/src/main/java/cpw/mods/fml/common/launcher/FMLServerTweaker.java rename to fml/src/main/java/net/minecraftforge/fml/common/launcher/FMLServerTweaker.java index 2c24296249..6e38da8c53 100644 --- a/fml/src/main/java/cpw/mods/fml/common/launcher/FMLServerTweaker.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/launcher/FMLServerTweaker.java @@ -1,7 +1,7 @@ -package cpw.mods.fml.common.launcher; +package net.minecraftforge.fml.common.launcher; -import cpw.mods.fml.relauncher.FMLLaunchHandler; import net.minecraft.launchwrapper.LaunchClassLoader; +import net.minecraftforge.fml.relauncher.FMLLaunchHandler; public class FMLServerTweaker extends FMLTweaker { @Override @@ -16,9 +16,9 @@ public class FMLServerTweaker extends FMLTweaker { // The mojang packages are excluded so the log4j2 queue is correctly visible from // the obfuscated and deobfuscated parts of the code. Without, the UI won't show anything classLoader.addClassLoaderExclusion("com.mojang."); - classLoader.addTransformerExclusion("cpw.mods.fml.repackage."); - classLoader.addTransformerExclusion("cpw.mods.fml.relauncher."); - classLoader.addTransformerExclusion("cpw.mods.fml.common.asm.transformers."); + classLoader.addTransformerExclusion("net.minecraftforge.fml.repackage."); + classLoader.addTransformerExclusion("net.minecraftforge.fml.relauncher."); + classLoader.addTransformerExclusion("net.minecraftforge.fml.common.asm.transformers."); classLoader.addClassLoaderExclusion("LZMA."); FMLLaunchHandler.configureForServerLaunch(classLoader, this); FMLLaunchHandler.appendCoreMods(); diff --git a/fml/src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java b/fml/src/main/java/net/minecraftforge/fml/common/launcher/FMLTweaker.java similarity index 92% rename from fml/src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java rename to fml/src/main/java/net/minecraftforge/fml/common/launcher/FMLTweaker.java index bd1e2e2f3d..19e0e57902 100644 --- a/fml/src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/launcher/FMLTweaker.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.launcher; +package net.minecraftforge.fml.common.launcher; import java.io.File; import java.net.URI; @@ -10,6 +10,8 @@ import java.util.Map.Entry; import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; +import net.minecraftforge.fml.relauncher.FMLLaunchHandler; +import net.minecraftforge.fml.relauncher.FMLSecurityManager; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -18,9 +20,6 @@ import com.google.common.base.Throwables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import cpw.mods.fml.relauncher.FMLLaunchHandler; -import cpw.mods.fml.relauncher.FMLSecurityManager; - public class FMLTweaker implements ITweaker { private File gameDir; private Map launchArgs; @@ -119,9 +118,9 @@ public class FMLTweaker implements ITweaker { { classLoader.addClassLoaderExclusion("org.apache."); classLoader.addClassLoaderExclusion("com.google.common."); - classLoader.addTransformerExclusion("cpw.mods.fml.repackage."); - classLoader.addTransformerExclusion("cpw.mods.fml.relauncher."); - classLoader.addTransformerExclusion("cpw.mods.fml.common.asm.transformers."); + classLoader.addTransformerExclusion("net.minecraftforge.fml.repackage."); + classLoader.addTransformerExclusion("net.minecraftforge.fml.relauncher."); + classLoader.addTransformerExclusion("net.minecraftforge.fml.common.asm.transformers."); classLoader.addClassLoaderExclusion("LZMA."); FMLLaunchHandler.configureForClientLaunch(classLoader, this); FMLLaunchHandler.appendCoreMods(); diff --git a/fml/src/main/java/cpw/mods/fml/common/launcher/TerminalTweaker.java b/fml/src/main/java/net/minecraftforge/fml/common/launcher/TerminalTweaker.java similarity index 79% rename from fml/src/main/java/cpw/mods/fml/common/launcher/TerminalTweaker.java rename to fml/src/main/java/net/minecraftforge/fml/common/launcher/TerminalTweaker.java index 66ea5dc1e4..a53735ba93 100644 --- a/fml/src/main/java/cpw/mods/fml/common/launcher/TerminalTweaker.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/launcher/TerminalTweaker.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.launcher; +package net.minecraftforge.fml.common.launcher; import java.io.File; import java.util.List; @@ -9,7 +9,7 @@ public final class TerminalTweaker implements ITweaker { @Override public void injectIntoClassLoader(LaunchClassLoader classLoader) { - classLoader.registerTransformer("cpw.mods.fml.common.asm.transformers.TerminalTransformer"); + classLoader.registerTransformer("net.minecraftforge.fml.common.asm.transformers.TerminalTransformer"); } @Override diff --git a/fml/src/main/java/cpw/mods/fml/common/launcher/Yggdrasil.java b/fml/src/main/java/net/minecraftforge/fml/common/launcher/Yggdrasil.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/launcher/Yggdrasil.java rename to fml/src/main/java/net/minecraftforge/fml/common/launcher/Yggdrasil.java index f9ee7dc44f..d7cfae1917 100644 --- a/fml/src/main/java/cpw/mods/fml/common/launcher/Yggdrasil.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/launcher/Yggdrasil.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.launcher; +package net.minecraftforge.fml.common.launcher; import java.net.Proxy; import java.util.Map; diff --git a/fml/src/main/java/cpw/mods/fml/common/network/ByteBufUtils.java b/fml/src/main/java/net/minecraftforge/fml/common/network/ByteBufUtils.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/common/network/ByteBufUtils.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/ByteBufUtils.java index 1e2d3124e2..266d3f17ec 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/ByteBufUtils.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/ByteBufUtils.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.network; +package net.minecraftforge.fml.common.network; import java.io.IOException; import net.minecraft.item.ItemStack; diff --git a/fml/src/main/java/cpw/mods/fml/common/network/FMLEmbeddedChannel.java b/fml/src/main/java/net/minecraftforge/fml/common/network/FMLEmbeddedChannel.java similarity index 87% rename from fml/src/main/java/cpw/mods/fml/common/network/FMLEmbeddedChannel.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/FMLEmbeddedChannel.java index a765ee92e0..d430a73a64 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/FMLEmbeddedChannel.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/FMLEmbeddedChannel.java @@ -1,14 +1,16 @@ -package cpw.mods.fml.common.network; +package net.minecraftforge.fml.common.network; import io.netty.channel.ChannelHandler; import io.netty.channel.embedded.EmbeddedChannel; + import java.util.Map.Entry; + import net.minecraft.network.Packet; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.network.FMLOutboundHandler.OutboundTarget; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.network.FMLOutboundHandler.OutboundTarget; +import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; +import net.minecraftforge.fml.relauncher.Side; /** * Utility wrapper around {@link EmbeddedChannel}. Provides some convenience methods diff --git a/fml/src/main/java/cpw/mods/fml/common/network/FMLEventChannel.java b/fml/src/main/java/net/minecraftforge/fml/common/network/FMLEventChannel.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/network/FMLEventChannel.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/FMLEventChannel.java index 9560454017..4b424dccb7 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/FMLEventChannel.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/FMLEventChannel.java @@ -1,16 +1,18 @@ -package cpw.mods.fml.common.network; +package net.minecraftforge.fml.common.network; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; + import java.util.EnumMap; + import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.NetHandlerPlayServer; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.EventBus; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.EventBus; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; +import net.minecraftforge.fml.relauncher.Side; /** * An event driven network channel, using {@link FMLNetworkEvent.CustomPacketEvent} and {@link FMLNetworkEvent.CustomNetworkEvent} diff --git a/fml/src/main/java/cpw/mods/fml/common/network/FMLIndexedMessageToMessageCodec.java b/fml/src/main/java/net/minecraftforge/fml/common/network/FMLIndexedMessageToMessageCodec.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/network/FMLIndexedMessageToMessageCodec.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/FMLIndexedMessageToMessageCodec.java index 1ce75f727f..a81671f033 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/FMLIndexedMessageToMessageCodec.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/FMLIndexedMessageToMessageCodec.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.network; +package net.minecraftforge.fml.common.network; import gnu.trove.map.hash.TByteObjectHashMap; import gnu.trove.map.hash.TObjectByteHashMap; @@ -13,12 +13,11 @@ import java.lang.ref.WeakReference; import java.util.List; import net.minecraft.network.PacketBuffer; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; import org.apache.logging.log4j.Level; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; - @Sharable public abstract class FMLIndexedMessageToMessageCodec extends MessageToMessageCodec { private TByteObjectHashMap> discriminators = new TByteObjectHashMap>(); diff --git a/fml/src/main/java/cpw/mods/fml/common/network/FMLNetworkEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/network/FMLNetworkEvent.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/network/FMLNetworkEvent.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/FMLNetworkEvent.java index 4e3c78156b..5934290be7 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/FMLNetworkEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/FMLNetworkEvent.java @@ -1,14 +1,16 @@ -package cpw.mods.fml.common.network; +package net.minecraftforge.fml.common.network; import java.util.Set; + import com.google.common.collect.ImmutableSet; + import net.minecraft.network.INetHandler; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.INetHandlerPlayClient; import net.minecraft.network.play.INetHandlerPlayServer; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; +import net.minecraftforge.fml.relauncher.Side; public class FMLNetworkEvent extends Event { public final T handler; diff --git a/fml/src/main/java/cpw/mods/fml/common/network/FMLNetworkException.java b/fml/src/main/java/net/minecraftforge/fml/common/network/FMLNetworkException.java similarity index 93% rename from fml/src/main/java/cpw/mods/fml/common/network/FMLNetworkException.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/FMLNetworkException.java index d10b955405..6b31fe3d02 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/FMLNetworkException.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/FMLNetworkException.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.network; +package net.minecraftforge.fml.common.network; public class FMLNetworkException extends RuntimeException { diff --git a/fml/src/main/java/cpw/mods/fml/common/network/FMLOutboundHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/network/FMLOutboundHandler.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/network/FMLOutboundHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/FMLOutboundHandler.java index e03dfcbb6a..e29a7a32ca 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/FMLOutboundHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/FMLOutboundHandler.java @@ -1,21 +1,24 @@ -package cpw.mods.fml.common.network; +package net.minecraftforge.fml.common.network; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOutboundHandlerAdapter; import io.netty.channel.ChannelPromise; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.util.AttributeKey; + import java.util.List; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.NetworkManager; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; +import net.minecraftforge.fml.common.network.handshake.NetworkDispatcher; +import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; +import net.minecraftforge.fml.relauncher.Side; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import cpw.mods.fml.common.network.handshake.NetworkDispatcher; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import cpw.mods.fml.relauncher.Side; public class FMLOutboundHandler extends ChannelOutboundHandlerAdapter { public static final AttributeKey FML_MESSAGETARGET = new AttributeKey("fml:outboundTarget"); diff --git a/fml/src/main/java/cpw/mods/fml/common/network/IGuiHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/network/IGuiHandler.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/network/IGuiHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/IGuiHandler.java index 7214563cca..5e332ececa 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/IGuiHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/IGuiHandler.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.network; +package net.minecraftforge.fml.common.network; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/fml/src/main/java/cpw/mods/fml/common/network/NetworkCheckHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/network/NetworkCheckHandler.java similarity index 92% rename from fml/src/main/java/cpw/mods/fml/common/network/NetworkCheckHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/NetworkCheckHandler.java index f0efa3fd5a..a8bc380b8e 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/NetworkCheckHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/NetworkCheckHandler.java @@ -1,10 +1,11 @@ -package cpw.mods.fml.common.network; +package net.minecraftforge.fml.common.network; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import cpw.mods.fml.relauncher.Side; + +import net.minecraftforge.fml.relauncher.Side; /** * A method annotated with this will be called when a remote network connection is offered. diff --git a/fml/src/main/java/cpw/mods/fml/common/network/NetworkEventFiringHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/network/NetworkEventFiringHandler.java similarity index 88% rename from fml/src/main/java/cpw/mods/fml/common/network/NetworkEventFiringHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/NetworkEventFiringHandler.java index 79a1a30cf8..7f97c7712c 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/NetworkEventFiringHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/NetworkEventFiringHandler.java @@ -1,8 +1,10 @@ -package cpw.mods.fml.common.network; +package net.minecraftforge.fml.common.network; + +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; import org.apache.logging.log4j.Level; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; + import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; diff --git a/fml/src/main/java/cpw/mods/fml/common/network/NetworkHandshakeEstablished.java b/fml/src/main/java/net/minecraftforge/fml/common/network/NetworkHandshakeEstablished.java similarity index 84% rename from fml/src/main/java/cpw/mods/fml/common/network/NetworkHandshakeEstablished.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/NetworkHandshakeEstablished.java index 02dc0f79c2..2b06f9d4dd 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/NetworkHandshakeEstablished.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/NetworkHandshakeEstablished.java @@ -1,8 +1,8 @@ -package cpw.mods.fml.common.network; +package net.minecraftforge.fml.common.network; import net.minecraft.network.INetHandler; -import cpw.mods.fml.common.network.handshake.NetworkDispatcher; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.network.handshake.NetworkDispatcher; +import net.minecraftforge.fml.relauncher.Side; /** * This message is sent through all channels affected by a currently occurring handshake. It is guaranteed to diff --git a/fml/src/main/java/cpw/mods/fml/common/network/NetworkRegistry.java b/fml/src/main/java/net/minecraftforge/fml/common/network/NetworkRegistry.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/network/NetworkRegistry.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/NetworkRegistry.java index a58efcf251..e088250a68 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/NetworkRegistry.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/NetworkRegistry.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.network; +package net.minecraftforge.fml.common.network; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; @@ -21,6 +21,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; import java.util.Set; + import org.apache.logging.log4j.Level; import net.minecraft.entity.player.EntityPlayer; @@ -28,21 +29,20 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraft.network.INetHandler; import net.minecraft.world.World; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.discovery.ASMDataTable; +import net.minecraftforge.fml.common.network.FMLOutboundHandler.OutboundTarget; +import net.minecraftforge.fml.common.network.handshake.NetworkDispatcher; +import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; +import net.minecraftforge.fml.common.network.internal.NetworkModHolder; +import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import net.minecraftforge.fml.relauncher.Side; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.discovery.ASMDataTable; -import cpw.mods.fml.common.network.FMLOutboundHandler.OutboundTarget; -import cpw.mods.fml.common.network.handshake.NetworkDispatcher; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import cpw.mods.fml.common.network.internal.NetworkModHolder; -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import cpw.mods.fml.relauncher.Side; - /** * @author cpw * diff --git a/fml/src/main/java/cpw/mods/fml/common/network/PacketLoggingHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/network/PacketLoggingHandler.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/network/PacketLoggingHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/PacketLoggingHandler.java index 84a04da7bc..46ffd56de2 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/PacketLoggingHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/PacketLoggingHandler.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.network; +package net.minecraftforge.fml.common.network; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -12,13 +12,13 @@ import java.util.List; import org.apache.logging.log4j.Level; -import cpw.mods.fml.common.FMLLog; import net.minecraft.network.EnumPacketDirection; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.util.MessageDeserializer2; import net.minecraft.util.MessageSerializer2; +import net.minecraftforge.fml.common.FMLLog; public class PacketLoggingHandler { diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/ChannelRegistrationHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/ChannelRegistrationHandler.java similarity index 83% rename from fml/src/main/java/cpw/mods/fml/common/network/handshake/ChannelRegistrationHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/handshake/ChannelRegistrationHandler.java index a7c58995be..0e0a6eca9d 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/ChannelRegistrationHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/ChannelRegistrationHandler.java @@ -1,16 +1,20 @@ -package cpw.mods.fml.common.network.handshake; +package net.minecraftforge.fml.common.network.handshake; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; + import java.util.Set; + import net.minecraft.network.NetworkManager; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; +import net.minecraftforge.fml.relauncher.Side; + import org.apache.logging.log4j.Level; + import com.google.common.base.Charsets; import com.google.common.collect.ImmutableSet; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import cpw.mods.fml.relauncher.Side; public class ChannelRegistrationHandler extends SimpleChannelInboundHandler { @Override diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeClientState.java b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeClientState.java similarity index 92% rename from fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeClientState.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeClientState.java index 1f756f3301..98f11f3512 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeClientState.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeClientState.java @@ -1,15 +1,16 @@ -package cpw.mods.fml.common.network.handshake; +package net.minecraftforge.fml.common.network.handshake; import java.util.List; + +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.internal.FMLMessage; +import net.minecraftforge.fml.common.network.internal.FMLNetworkHandler; +import net.minecraftforge.fml.common.registry.GameData; +import net.minecraftforge.fml.relauncher.Side; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.internal.FMLMessage; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; -import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.relauncher.Side; /** * Packet handshake sequence manager- client side (responding to remote server) diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeCodec.java b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeCodec.java similarity index 87% rename from fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeCodec.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeCodec.java index e004876017..806e7b5830 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeCodec.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeCodec.java @@ -1,6 +1,6 @@ -package cpw.mods.fml.common.network.handshake; +package net.minecraftforge.fml.common.network.handshake; -import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; +import net.minecraftforge.fml.common.network.FMLIndexedMessageToMessageCodec; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeMessage.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeMessage.java index 4f590e5cbf..31a3683874 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeMessage.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.network.handshake; +package net.minecraftforge.fml.common.network.handshake; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -10,6 +10,11 @@ import java.util.Map.Entry; import java.util.Set; import net.minecraft.network.PacketBuffer; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.network.ByteBufUtils; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; +import net.minecraftforge.fml.common.registry.GameData; import com.google.common.base.Charsets; import com.google.common.base.Joiner; @@ -17,12 +22,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import cpw.mods.fml.common.registry.GameData; - public abstract class FMLHandshakeMessage { public static FMLProxyPacket makeCustomChannelRegistration(Set channels) { diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeServerState.java b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeServerState.java similarity index 88% rename from fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeServerState.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeServerState.java index 766e334b33..f5a9eee37f 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeServerState.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeServerState.java @@ -1,14 +1,14 @@ -package cpw.mods.fml.common.network.handshake; +package net.minecraftforge.fml.common.network.handshake; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.internal.FMLMessage; +import net.minecraftforge.fml.common.network.internal.FMLNetworkHandler; +import net.minecraftforge.fml.common.registry.GameData; +import net.minecraftforge.fml.relauncher.Side; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.internal.FMLMessage; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; -import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.relauncher.Side; enum FMLHandshakeServerState implements IHandshakeState { diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/HandshakeInjector.java b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/HandshakeInjector.java similarity index 83% rename from fml/src/main/java/cpw/mods/fml/common/network/handshake/HandshakeInjector.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/handshake/HandshakeInjector.java index e17cb13b61..626e772fc3 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/HandshakeInjector.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/HandshakeInjector.java @@ -1,6 +1,6 @@ -package cpw.mods.fml.common.network.handshake; +package net.minecraftforge.fml.common.network.handshake; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; +import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOutboundHandlerAdapter; import io.netty.channel.ChannelPromise; diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/HandshakeMessageHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/HandshakeMessageHandler.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/network/handshake/HandshakeMessageHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/handshake/HandshakeMessageHandler.java index b859d6fcf1..db7deaec8b 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/HandshakeMessageHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/HandshakeMessageHandler.java @@ -1,7 +1,9 @@ -package cpw.mods.fml.common.network.handshake; +package net.minecraftforge.fml.common.network.handshake; + +import net.minecraftforge.fml.common.FMLLog; import org.apache.logging.log4j.Level; -import cpw.mods.fml.common.FMLLog; + import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import io.netty.util.AttributeKey; diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/IHandshakeState.java b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/IHandshakeState.java similarity index 73% rename from fml/src/main/java/cpw/mods/fml/common/network/handshake/IHandshakeState.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/handshake/IHandshakeState.java index 9af1cf62f0..bd2b0951e5 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/IHandshakeState.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/IHandshakeState.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.network.handshake; +package net.minecraftforge.fml.common.network.handshake; import io.netty.channel.ChannelHandlerContext; diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java index 701c1f3cc2..e7171ac60c 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.network.handshake; +package net.minecraftforge.fml.common.network.handshake; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; @@ -35,17 +35,17 @@ import net.minecraft.network.play.server.S3FPacketCustomPayload; import net.minecraft.network.play.server.S40PacketDisconnect; import net.minecraft.server.management.ServerConfigurationManager; import net.minecraft.util.ChatComponentText; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.network.FMLNetworkEvent; -import cpw.mods.fml.common.network.FMLNetworkException; -import cpw.mods.fml.common.network.FMLOutboundHandler; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.PacketLoggingHandler; -import cpw.mods.fml.common.network.internal.FMLMessage; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.network.FMLNetworkEvent; +import net.minecraftforge.fml.common.network.FMLNetworkException; +import net.minecraftforge.fml.common.network.FMLOutboundHandler; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.PacketLoggingHandler; +import net.minecraftforge.fml.common.network.internal.FMLMessage; +import net.minecraftforge.fml.common.network.internal.FMLNetworkHandler; +import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; +import net.minecraftforge.fml.relauncher.Side; public class NetworkDispatcher extends SimpleChannelInboundHandler implements ChannelOutboundHandler { private static boolean DEBUG_HANDSHAKE = Boolean.parseBoolean(System.getProperty("fml.debugNetworkHandshake", "false")); diff --git a/fml/src/main/java/cpw/mods/fml/common/network/internal/EntitySpawnHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/EntitySpawnHandler.java similarity index 86% rename from fml/src/main/java/cpw/mods/fml/common/network/internal/EntitySpawnHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/internal/EntitySpawnHandler.java index fa58405c87..ad9f348e0c 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/internal/EntitySpawnHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/EntitySpawnHandler.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.network.internal; +package net.minecraftforge.fml.common.network.internal; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; @@ -12,20 +12,19 @@ import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.world.World; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.network.internal.FMLMessage.EntityAdjustMessage; +import net.minecraftforge.fml.common.network.internal.FMLMessage.EntityMessage; +import net.minecraftforge.fml.common.registry.EntityRegistry; +import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; +import net.minecraftforge.fml.common.registry.IThrowableEntity; +import net.minecraftforge.fml.common.registry.EntityRegistry.EntityRegistration; import com.google.common.base.Throwables; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.network.internal.FMLMessage.EntityAdjustMessage; -import cpw.mods.fml.common.network.internal.FMLMessage.EntityMessage; -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; -import cpw.mods.fml.common.registry.IThrowableEntity; - public class EntitySpawnHandler extends SimpleChannelInboundHandler { @Override protected void channelRead0(ChannelHandlerContext ctx, EntityMessage msg) throws Exception diff --git a/fml/src/main/java/cpw/mods/fml/common/network/internal/FMLMessage.java b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLMessage.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/network/internal/FMLMessage.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLMessage.java index 56357a7fcd..0a7cd5df4a 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/internal/FMLMessage.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLMessage.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.network.internal; +package net.minecraftforge.fml.common.network.internal; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -15,13 +15,13 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.network.PacketBuffer; import net.minecraft.util.MathHelper; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; -import cpw.mods.fml.common.registry.IThrowableEntity; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.network.ByteBufUtils; +import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; +import net.minecraftforge.fml.common.registry.IThrowableEntity; +import net.minecraftforge.fml.common.registry.EntityRegistry.EntityRegistration; +import net.minecraftforge.fml.relauncher.Side; public abstract class FMLMessage { public static class CompleteHandshake extends FMLMessage { diff --git a/fml/src/main/java/cpw/mods/fml/common/network/internal/FMLNetworkHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java similarity index 87% rename from fml/src/main/java/cpw/mods/fml/common/network/internal/FMLNetworkHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java index 6fd9156526..aed06a4973 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/internal/FMLNetworkHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java @@ -10,15 +10,17 @@ * cpw - implementation */ -package cpw.mods.fml.common.network.internal; +package net.minecraftforge.fml.common.network.internal; import io.netty.channel.ChannelPipeline; import io.netty.channel.embedded.EmbeddedChannel; + import java.util.ArrayList; import java.util.EnumMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -27,26 +29,28 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.server.management.ServerConfigurationManager; import net.minecraft.world.World; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLContainer; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.network.FMLEmbeddedChannel; +import net.minecraftforge.fml.common.network.FMLOutboundHandler; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.FMLOutboundHandler.OutboundTarget; +import net.minecraftforge.fml.common.network.handshake.FMLHandshakeMessage; +import net.minecraftforge.fml.common.network.handshake.NetworkDispatcher; +import net.minecraftforge.fml.common.network.internal.FMLMessage.CompleteHandshake; +import net.minecraftforge.fml.common.registry.EntityRegistry; +import net.minecraftforge.fml.common.registry.EntityRegistry.EntityRegistration; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import org.apache.logging.log4j.core.helpers.Integers; + import com.google.common.collect.Lists; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLContainer; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.network.FMLEmbeddedChannel; -import cpw.mods.fml.common.network.FMLOutboundHandler; -import cpw.mods.fml.common.network.FMLOutboundHandler.OutboundTarget; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.handshake.FMLHandshakeMessage; -import cpw.mods.fml.common.network.handshake.NetworkDispatcher; -import cpw.mods.fml.common.network.internal.FMLMessage.CompleteHandshake; -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class FMLNetworkHandler { diff --git a/fml/src/main/java/cpw/mods/fml/common/network/internal/FMLProxyPacket.java b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLProxyPacket.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/network/internal/FMLProxyPacket.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLProxyPacket.java index b44824b5c8..71537aa125 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/internal/FMLProxyPacket.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLProxyPacket.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.network.internal; +package net.minecraftforge.fml.common.network.internal; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -13,6 +13,11 @@ import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.client.C17PacketCustomPayload; import net.minecraft.network.play.server.S3FPacketCustomPayload; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.network.FMLNetworkException; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.handshake.NetworkDispatcher; +import net.minecraftforge.fml.relauncher.Side; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.helpers.Integers; @@ -23,12 +28,6 @@ import com.google.common.collect.Multiset; import com.google.common.collect.Multiset.Entry; import com.google.common.collect.Multisets; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.network.FMLNetworkException; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.handshake.NetworkDispatcher; -import cpw.mods.fml.relauncher.Side; - public class FMLProxyPacket implements Packet { final String channel; private Side target; diff --git a/fml/src/main/java/cpw/mods/fml/common/network/internal/FMLRuntimeCodec.java b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLRuntimeCodec.java similarity index 82% rename from fml/src/main/java/cpw/mods/fml/common/network/internal/FMLRuntimeCodec.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLRuntimeCodec.java index 5cdf7a33bb..0212fe9f1c 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/internal/FMLRuntimeCodec.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLRuntimeCodec.java @@ -1,12 +1,14 @@ -package cpw.mods.fml.common.network.internal; +package net.minecraftforge.fml.common.network.internal; + +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.network.ByteBufUtils; +import net.minecraftforge.fml.common.network.FMLIndexedMessageToMessageCodec; +import net.minecraftforge.fml.common.network.FMLNetworkException; import com.google.common.base.Splitter; + import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; -import cpw.mods.fml.common.network.FMLNetworkException; public class FMLRuntimeCodec extends FMLIndexedMessageToMessageCodec { public FMLRuntimeCodec() diff --git a/fml/src/main/java/cpw/mods/fml/common/network/internal/HandshakeCompletionHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/HandshakeCompletionHandler.java similarity index 76% rename from fml/src/main/java/cpw/mods/fml/common/network/internal/HandshakeCompletionHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/internal/HandshakeCompletionHandler.java index eb18dbcf56..d9426b47d3 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/internal/HandshakeCompletionHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/HandshakeCompletionHandler.java @@ -1,9 +1,11 @@ -package cpw.mods.fml.common.network.internal; +package net.minecraftforge.fml.common.network.internal; + +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.network.handshake.NetworkDispatcher; +import net.minecraftforge.fml.common.network.internal.FMLMessage.CompleteHandshake; import org.apache.logging.log4j.Level; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.network.handshake.NetworkDispatcher; -import cpw.mods.fml.common.network.internal.FMLMessage.CompleteHandshake; + import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import io.netty.channel.ChannelHandler.Sharable; diff --git a/fml/src/main/java/cpw/mods/fml/common/network/internal/NetworkModHolder.java b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/NetworkModHolder.java similarity index 92% rename from fml/src/main/java/cpw/mods/fml/common/network/internal/NetworkModHolder.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/internal/NetworkModHolder.java index a2f669e121..57270e37df 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/internal/NetworkModHolder.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/NetworkModHolder.java @@ -10,11 +10,22 @@ * cpw - implementation */ -package cpw.mods.fml.common.network.internal; +package net.minecraftforge.fml.common.network.internal; import java.lang.reflect.Method; import java.util.Map; import java.util.Set; + +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.discovery.ASMDataTable; +import net.minecraftforge.fml.common.discovery.ASMDataTable.ASMData; +import net.minecraftforge.fml.common.network.NetworkCheckHandler; +import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion; +import net.minecraftforge.fml.common.versioning.InvalidVersionSpecificationException; +import net.minecraftforge.fml.common.versioning.VersionRange; +import net.minecraftforge.fml.relauncher.Side; + import org.apache.logging.log4j.Level; import com.google.common.base.Preconditions; @@ -23,16 +34,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.SetMultimap; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.discovery.ASMDataTable; -import cpw.mods.fml.common.discovery.ASMDataTable.ASMData; -import cpw.mods.fml.common.network.NetworkCheckHandler; -import cpw.mods.fml.common.versioning.DefaultArtifactVersion; -import cpw.mods.fml.common.versioning.InvalidVersionSpecificationException; -import cpw.mods.fml.common.versioning.VersionRange; -import cpw.mods.fml.relauncher.Side; - public class NetworkModHolder { public abstract class NetworkChecker { diff --git a/fml/src/main/java/cpw/mods/fml/common/network/internal/OpenGuiHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/OpenGuiHandler.java similarity index 78% rename from fml/src/main/java/cpw/mods/fml/common/network/internal/OpenGuiHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/internal/OpenGuiHandler.java index f45206f452..6a5f82eca9 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/internal/OpenGuiHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/OpenGuiHandler.java @@ -1,12 +1,13 @@ -package cpw.mods.fml.common.network.internal; +package net.minecraftforge.fml.common.network.internal; import org.apache.logging.log4j.Level; + import net.minecraft.entity.player.EntityPlayer; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.network.internal.FMLMessage.OpenGui; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.network.internal.FMLMessage.OpenGui; public class OpenGuiHandler extends SimpleChannelInboundHandler { @Override diff --git a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/IMessage.java b/fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/IMessage.java similarity index 88% rename from fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/IMessage.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/IMessage.java index 24ee2c3f92..7f31823646 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/IMessage.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/IMessage.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.network.simpleimpl; +package net.minecraftforge.fml.common.network.simpleimpl; import io.netty.buffer.ByteBuf; diff --git a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/IMessageHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/IMessageHandler.java similarity index 86% rename from fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/IMessageHandler.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/IMessageHandler.java index 11d9126417..ff15fb7be5 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/IMessageHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/IMessageHandler.java @@ -1,9 +1,9 @@ -package cpw.mods.fml.common.network.simpleimpl; +package net.minecraftforge.fml.common.network.simpleimpl; /** * A message handler based on {@link IMessage}. Implement and override {@link #onMessage(IMessage)} to - * process your packet. Supply the class to {@link SimpleNetworkWrapper#registerMessage(Class, Class, byte, cpw.mods.fml.relauncher.Side)} + * process your packet. Supply the class to {@link SimpleNetworkWrapper#registerMessage(Class, Class, byte, net.minecraftforge.fml.relauncher.Side)} * to register both the message type and it's associated handler. * * @author cpw diff --git a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/MessageContext.java b/fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/MessageContext.java similarity index 90% rename from fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/MessageContext.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/MessageContext.java index d9dd88302e..6b4c1f436f 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/MessageContext.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/MessageContext.java @@ -1,9 +1,9 @@ -package cpw.mods.fml.common.network.simpleimpl; +package net.minecraftforge.fml.common.network.simpleimpl; -import cpw.mods.fml.relauncher.Side; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.network.INetHandler; import net.minecraft.network.NetHandlerPlayServer; +import net.minecraftforge.fml.relauncher.Side; /** * Context for the {@link IMessageHandler} diff --git a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java b/fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java similarity index 87% rename from fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java index d82217bf18..742d9ea814 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java @@ -1,15 +1,15 @@ -package cpw.mods.fml.common.network.simpleimpl; +package net.minecraftforge.fml.common.network.simpleimpl; import org.apache.logging.log4j.Level; import net.minecraft.network.INetHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.network.FMLOutboundHandler; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.relauncher.Side; import com.google.common.base.Preconditions; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.network.FMLOutboundHandler; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.relauncher.Side; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; diff --git a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleIndexedCodec.java b/fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/SimpleIndexedCodec.java similarity index 77% rename from fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleIndexedCodec.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/SimpleIndexedCodec.java index ce502a36ca..ab1d387ea3 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleIndexedCodec.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/SimpleIndexedCodec.java @@ -1,8 +1,8 @@ -package cpw.mods.fml.common.network.simpleimpl; +package net.minecraftforge.fml.common.network.simpleimpl; +import net.minecraftforge.fml.common.network.FMLIndexedMessageToMessageCodec; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; public class SimpleIndexedCodec extends FMLIndexedMessageToMessageCodec { @Override diff --git a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleNetworkWrapper.java b/fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/SimpleNetworkWrapper.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleNetworkWrapper.java rename to fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/SimpleNetworkWrapper.java index edd5074b5a..fdce956d6f 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleNetworkWrapper.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/simpleimpl/SimpleNetworkWrapper.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.network.simpleimpl; +package net.minecraftforge.fml.common.network.simpleimpl; import io.netty.channel.ChannelFutureListener; @@ -10,12 +10,12 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.INetHandler; import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.FMLEmbeddedChannel; -import cpw.mods.fml.common.network.FMLOutboundHandler; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.network.FMLEmbeddedChannel; +import net.minecraftforge.fml.common.network.FMLOutboundHandler; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; +import net.minecraftforge.fml.relauncher.Side; /** * This class is a simplified netty wrapper for those not wishing to deal with the full power of netty. diff --git a/fml/src/main/java/cpw/mods/fml/common/patcher/ClassPatch.java b/fml/src/main/java/net/minecraftforge/fml/common/patcher/ClassPatch.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/patcher/ClassPatch.java rename to fml/src/main/java/net/minecraftforge/fml/common/patcher/ClassPatch.java index 833a6ab78e..4014b2880c 100644 --- a/fml/src/main/java/cpw/mods/fml/common/patcher/ClassPatch.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/patcher/ClassPatch.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.patcher; +package net.minecraftforge.fml.common.patcher; public class ClassPatch { public final String name; diff --git a/fml/src/main/java/cpw/mods/fml/common/patcher/ClassPatchManager.java b/fml/src/main/java/net/minecraftforge/fml/common/patcher/ClassPatchManager.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/patcher/ClassPatchManager.java rename to fml/src/main/java/net/minecraftforge/fml/common/patcher/ClassPatchManager.java index 8df8d6d630..353eb0c38d 100644 --- a/fml/src/main/java/cpw/mods/fml/common/patcher/ClassPatchManager.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/patcher/ClassPatchManager.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.patcher; +package net.minecraftforge.fml.common.patcher; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -17,7 +17,9 @@ import java.util.regex.Pattern; import org.apache.logging.log4j.Level; import net.minecraft.launchwrapper.LaunchClassLoader; - +import net.minecraftforge.fml.relauncher.FMLRelaunchLog; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.repackage.com.nothome.delta.GDiffPatcher; import LZMA.LzmaInputStream; import com.google.common.base.Joiner; @@ -30,10 +32,6 @@ import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; import com.google.common.io.Files; -import cpw.mods.fml.relauncher.FMLRelaunchLog; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.repackage.com.nothome.delta.GDiffPatcher; - public class ClassPatchManager { public static final ClassPatchManager INSTANCE = new ClassPatchManager(); diff --git a/fml/src/main/java/cpw/mods/fml/common/patcher/GenDiffSet.java b/fml/src/main/java/net/minecraftforge/fml/common/patcher/GenDiffSet.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/patcher/GenDiffSet.java rename to fml/src/main/java/net/minecraftforge/fml/common/patcher/GenDiffSet.java index d0c86701c1..a97ea12e24 100644 --- a/fml/src/main/java/cpw/mods/fml/common/patcher/GenDiffSet.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/patcher/GenDiffSet.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.patcher; +package net.minecraftforge.fml.common.patcher; import java.io.File; import java.io.IOException; @@ -7,6 +7,10 @@ import java.util.List; import java.util.Locale; import java.util.jar.JarEntry; import java.util.jar.JarFile; + +import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; +import net.minecraftforge.fml.repackage.com.nothome.delta.Delta; + import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -17,9 +21,6 @@ import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import com.google.common.io.Files; -import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; -import cpw.mods.fml.repackage.com.nothome.delta.Delta; - public class GenDiffSet { private static final List RESERVED_NAMES = Arrays.asList("CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"); diff --git a/fml/src/main/java/cpw/mods/fml/common/registry/EntityRegistry.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/EntityRegistry.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/registry/EntityRegistry.java rename to fml/src/main/java/net/minecraftforge/fml/common/registry/EntityRegistry.java index 5d346d0947..6807bdb357 100644 --- a/fml/src/main/java/cpw/mods/fml/common/registry/EntityRegistry.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/EntityRegistry.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.registry; +package net.minecraftforge.fml.common.registry; import java.util.BitSet; import java.util.Iterator; @@ -26,6 +26,11 @@ import net.minecraft.entity.EntityTracker; import net.minecraft.entity.EnumCreatureType; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.network.internal.FMLMessage.EntitySpawnMessage; import com.google.common.base.Function; import com.google.common.collect.ArrayListMultimap; @@ -35,12 +40,6 @@ import com.google.common.collect.ListMultimap; import com.google.common.collect.Maps; import com.google.common.primitives.UnsignedBytes; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.network.internal.FMLMessage.EntitySpawnMessage; - public class EntityRegistry { public class EntityRegistration diff --git a/fml/src/main/java/cpw/mods/fml/common/registry/ExistingSubstitutionException.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/ExistingSubstitutionException.java similarity index 81% rename from fml/src/main/java/cpw/mods/fml/common/registry/ExistingSubstitutionException.java rename to fml/src/main/java/net/minecraftforge/fml/common/registry/ExistingSubstitutionException.java index ec8f614fc8..b0bafa3b18 100644 --- a/fml/src/main/java/cpw/mods/fml/common/registry/ExistingSubstitutionException.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/ExistingSubstitutionException.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.registry; +package net.minecraftforge.fml.common.registry; public class ExistingSubstitutionException extends Exception { public ExistingSubstitutionException(String fromName, Object toReplace) { diff --git a/fml/src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java rename to fml/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java index 62fc9c57e5..26067d0c7a 100644 --- a/fml/src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.registry; +package net.minecraftforge.fml.common.registry; import java.util.ArrayList; import java.util.BitSet; @@ -16,14 +16,13 @@ import net.minecraft.util.ObjectIntIdentityMap; import net.minecraft.util.RegistryNamespaced; import net.minecraft.util.RegistryNamespacedDefaultedByKey; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.functions.GenericIterableFactory; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.ImmutableMap; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.functions.GenericIterableFactory; - public class FMLControlledNamespacedRegistry extends RegistryNamespacedDefaultedByKey { private final Class superType; private Object optionalDefaultKey; diff --git a/fml/src/main/java/cpw/mods/fml/common/registry/GameData.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/GameData.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/common/registry/GameData.java rename to fml/src/main/java/net/minecraftforge/fml/common/registry/GameData.java index 0a3372c2a5..aa0d460e41 100644 --- a/fml/src/main/java/cpw/mods/fml/common/registry/GameData.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/GameData.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.registry; +package net.minecraftforge.fml.common.registry; import java.io.File; import java.io.IOException; @@ -29,6 +29,16 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.StartupQuery; +import net.minecraftforge.fml.common.ZipperUtil; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent.MissingMapping; +import net.minecraftforge.fml.common.registry.GameRegistry.Type; +import net.minecraftforge.fml.common.registry.GameRegistry.UniqueIdentifier; import org.apache.logging.log4j.Level; @@ -46,17 +56,6 @@ import com.google.common.collect.Sets; import com.google.common.collect.Table; import com.google.common.io.Files; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.StartupQuery; -import cpw.mods.fml.common.ZipperUtil; -import cpw.mods.fml.common.event.FMLMissingMappingsEvent; -import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; -import cpw.mods.fml.common.registry.GameRegistry.Type; -import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; - public class GameData { static final int MIN_BLOCK_ID = 0; static final int MAX_BLOCK_ID = 4095; diff --git a/fml/src/main/java/cpw/mods/fml/common/registry/GameRegistry.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/GameRegistry.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/registry/GameRegistry.java rename to fml/src/main/java/net/minecraftforge/fml/common/registry/GameRegistry.java index 6a0c2b29ea..12cc46dbcc 100644 --- a/fml/src/main/java/cpw/mods/fml/common/registry/GameRegistry.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/GameRegistry.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.registry; +package net.minecraftforge.fml.common.registry; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -36,6 +36,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.IFuelHandler; +import net.minecraftforge.fml.common.IWorldGenerator; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.LoaderException; +import net.minecraftforge.fml.common.LoaderState; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.apache.logging.log4j.Level; @@ -47,14 +54,6 @@ import com.google.common.collect.ObjectArrays; import com.google.common.collect.Sets; import com.google.common.primitives.Ints; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.IWorldGenerator; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.LoaderException; -import cpw.mods.fml.common.LoaderState; -import cpw.mods.fml.common.ObfuscationReflectionHelper; - public class GameRegistry { private static Set worldGenerators = Sets.newHashSet(); diff --git a/fml/src/main/java/cpw/mods/fml/common/registry/IEntityAdditionalSpawnData.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/IEntityAdditionalSpawnData.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/registry/IEntityAdditionalSpawnData.java rename to fml/src/main/java/net/minecraftforge/fml/common/registry/IEntityAdditionalSpawnData.java index 434cf9febd..7816cdc324 100644 --- a/fml/src/main/java/cpw/mods/fml/common/registry/IEntityAdditionalSpawnData.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/IEntityAdditionalSpawnData.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.registry; +package net.minecraftforge.fml.common.registry; import io.netty.buffer.ByteBuf; diff --git a/fml/src/main/java/cpw/mods/fml/common/registry/IThrowableEntity.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/IThrowableEntity.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/common/registry/IThrowableEntity.java rename to fml/src/main/java/net/minecraftforge/fml/common/registry/IThrowableEntity.java index 57d0182eee..2afb40dbd3 100644 --- a/fml/src/main/java/cpw/mods/fml/common/registry/IThrowableEntity.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/IThrowableEntity.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.registry; +package net.minecraftforge.fml.common.registry; import net.minecraft.entity.Entity; diff --git a/fml/src/main/java/cpw/mods/fml/common/registry/IncompatibleSubstitutionException.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/IncompatibleSubstitutionException.java similarity index 83% rename from fml/src/main/java/cpw/mods/fml/common/registry/IncompatibleSubstitutionException.java rename to fml/src/main/java/net/minecraftforge/fml/common/registry/IncompatibleSubstitutionException.java index c4d2114acf..cf0a0974e8 100644 --- a/fml/src/main/java/cpw/mods/fml/common/registry/IncompatibleSubstitutionException.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/IncompatibleSubstitutionException.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.registry; +package net.minecraftforge.fml.common.registry; public class IncompatibleSubstitutionException extends RuntimeException { public IncompatibleSubstitutionException(String fromName, Object replacement, Object original) diff --git a/fml/src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java rename to fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java index 8593295c69..7a8bc608b4 100644 --- a/fml/src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.registry; +package net.minecraftforge.fml.common.registry; import java.io.File; import java.io.FileInputStream; @@ -27,21 +27,21 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; + import org.apache.logging.log4j.Level; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StringTranslate; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.relauncher.Side; import com.google.common.base.Charsets; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.relauncher.Side; - public class LanguageRegistry { private static final LanguageRegistry INSTANCE = new LanguageRegistry(); diff --git a/fml/src/main/java/cpw/mods/fml/common/registry/ObjectHolderRef.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/ObjectHolderRef.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/registry/ObjectHolderRef.java rename to fml/src/main/java/net/minecraftforge/fml/common/registry/ObjectHolderRef.java index f94b16a274..a4fcceb1e6 100644 --- a/fml/src/main/java/cpw/mods/fml/common/registry/ObjectHolderRef.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/ObjectHolderRef.java @@ -1,15 +1,18 @@ -package cpw.mods.fml.common.registry; +package net.minecraftforge.fml.common.registry; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; + import org.apache.logging.log4j.Level; + import com.google.common.base.Throwables; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; /** diff --git a/fml/src/main/java/cpw/mods/fml/common/registry/ObjectHolderRegistry.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/ObjectHolderRegistry.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/common/registry/ObjectHolderRegistry.java rename to fml/src/main/java/net/minecraftforge/fml/common/registry/ObjectHolderRegistry.java index b1173e25e4..ca6da54180 100644 --- a/fml/src/main/java/cpw/mods/fml/common/registry/ObjectHolderRegistry.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/ObjectHolderRegistry.java @@ -1,17 +1,19 @@ -package cpw.mods.fml.common.registry; +package net.minecraftforge.fml.common.registry; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.List; import java.util.Map; import java.util.Set; + +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.discovery.ASMDataTable; +import net.minecraftforge.fml.common.discovery.ASMDataTable.ASMData; +import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; + import com.google.common.base.Throwables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.discovery.ASMDataTable; -import cpw.mods.fml.common.discovery.ASMDataTable.ASMData; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; /** * Internal registry for tracking {@link ObjectHolder} references diff --git a/fml/src/main/java/cpw/mods/fml/common/registry/RegistryDelegate.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/RegistryDelegate.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/common/registry/RegistryDelegate.java rename to fml/src/main/java/net/minecraftforge/fml/common/registry/RegistryDelegate.java index 64db87a51c..0052bdec4b 100644 --- a/fml/src/main/java/cpw/mods/fml/common/registry/RegistryDelegate.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/RegistryDelegate.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.common.registry; +package net.minecraftforge.fml.common.registry; import com.google.common.base.Objects; diff --git a/fml/src/main/java/cpw/mods/fml/common/registry/VillagerRegistry.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/common/registry/VillagerRegistry.java rename to fml/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java index c9210026e1..09cc7a0c81 100644 --- a/fml/src/main/java/cpw/mods/fml/common/registry/VillagerRegistry.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.registry; +package net.minecraftforge.fml.common.registry; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -35,16 +35,15 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.Tuple; import net.minecraft.village.MerchantRecipeList; import net.minecraft.world.gen.structure.StructureVillagePieces; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - /** * Registry for villager trading control * diff --git a/fml/src/main/java/cpw/mods/fml/common/toposort/ModSorter.java b/fml/src/main/java/net/minecraftforge/fml/common/toposort/ModSorter.java similarity index 91% rename from fml/src/main/java/cpw/mods/fml/common/toposort/ModSorter.java rename to fml/src/main/java/net/minecraftforge/fml/common/toposort/ModSorter.java index 595bbb0af9..4c0c2a1e25 100644 --- a/fml/src/main/java/cpw/mods/fml/common/toposort/ModSorter.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/toposort/ModSorter.java @@ -10,21 +10,21 @@ * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package cpw.mods.fml.common.toposort; +package net.minecraftforge.fml.common.toposort; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.google.common.collect.Maps; +import net.minecraftforge.fml.common.DummyModContainer; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModAPIManager; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.toposort.TopologicalSort.DirectedGraph; +import net.minecraftforge.fml.common.versioning.ArtifactVersion; -import cpw.mods.fml.common.DummyModContainer; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModAPIManager; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.toposort.TopologicalSort.DirectedGraph; -import cpw.mods.fml.common.versioning.ArtifactVersion; +import com.google.common.collect.Maps; /** * @author cpw diff --git a/fml/src/main/java/cpw/mods/fml/common/toposort/ModSortingException.java b/fml/src/main/java/net/minecraftforge/fml/common/toposort/ModSortingException.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/toposort/ModSortingException.java rename to fml/src/main/java/net/minecraftforge/fml/common/toposort/ModSortingException.java index 218400bb08..78b3e8151a 100644 --- a/fml/src/main/java/cpw/mods/fml/common/toposort/ModSortingException.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/toposort/ModSortingException.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.toposort; +package net.minecraftforge.fml.common.toposort; import java.util.Set; diff --git a/fml/src/main/java/cpw/mods/fml/common/toposort/TopologicalSort.java b/fml/src/main/java/net/minecraftforge/fml/common/toposort/TopologicalSort.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/common/toposort/TopologicalSort.java rename to fml/src/main/java/net/minecraftforge/fml/common/toposort/TopologicalSort.java index d9baffa998..bfaca5b849 100644 --- a/fml/src/main/java/cpw/mods/fml/common/toposort/TopologicalSort.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/toposort/TopologicalSort.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.toposort; +package net.minecraftforge.fml.common.toposort; import java.util.ArrayList; import java.util.Collections; @@ -25,11 +25,11 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; +import net.minecraftforge.fml.common.FMLLog; + import com.google.common.collect.Sets; import com.google.common.collect.Sets.SetView; -import cpw.mods.fml.common.FMLLog; - /** * Topological sort for mod loading * diff --git a/fml/src/main/java/cpw/mods/fml/common/versioning/ArtifactVersion.java b/fml/src/main/java/net/minecraftforge/fml/common/versioning/ArtifactVersion.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/versioning/ArtifactVersion.java rename to fml/src/main/java/net/minecraftforge/fml/common/versioning/ArtifactVersion.java index 1cbf4c73af..d5883911ed 100644 --- a/fml/src/main/java/cpw/mods/fml/common/versioning/ArtifactVersion.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/versioning/ArtifactVersion.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.versioning; +package net.minecraftforge.fml.common.versioning; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/fml/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java b/fml/src/main/java/net/minecraftforge/fml/common/versioning/ComparableVersion.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java rename to fml/src/main/java/net/minecraftforge/fml/common/versioning/ComparableVersion.java index 083aec2d52..1d86ab5cf0 100644 --- a/fml/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/versioning/ComparableVersion.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.versioning; +package net.minecraftforge.fml.common.versioning; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/fml/src/main/java/cpw/mods/fml/common/versioning/DefaultArtifactVersion.java b/fml/src/main/java/net/minecraftforge/fml/common/versioning/DefaultArtifactVersion.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/common/versioning/DefaultArtifactVersion.java rename to fml/src/main/java/net/minecraftforge/fml/common/versioning/DefaultArtifactVersion.java index b34a29a48a..f9f11dd286 100644 --- a/fml/src/main/java/cpw/mods/fml/common/versioning/DefaultArtifactVersion.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/versioning/DefaultArtifactVersion.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.versioning; +package net.minecraftforge.fml.common.versioning; public class DefaultArtifactVersion implements ArtifactVersion { diff --git a/fml/src/main/java/cpw/mods/fml/common/versioning/InvalidVersionSpecificationException.java b/fml/src/main/java/net/minecraftforge/fml/common/versioning/InvalidVersionSpecificationException.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/common/versioning/InvalidVersionSpecificationException.java rename to fml/src/main/java/net/minecraftforge/fml/common/versioning/InvalidVersionSpecificationException.java index 037c5d2951..16339e4f96 100644 --- a/fml/src/main/java/cpw/mods/fml/common/versioning/InvalidVersionSpecificationException.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/versioning/InvalidVersionSpecificationException.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.versioning; +package net.minecraftforge.fml.common.versioning; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/fml/src/main/java/cpw/mods/fml/common/versioning/Restriction.java b/fml/src/main/java/net/minecraftforge/fml/common/versioning/Restriction.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/common/versioning/Restriction.java rename to fml/src/main/java/net/minecraftforge/fml/common/versioning/Restriction.java index e4b7c6fc3a..e3a8511c1f 100644 --- a/fml/src/main/java/cpw/mods/fml/common/versioning/Restriction.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/versioning/Restriction.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.versioning; +package net.minecraftforge.fml.common.versioning; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/fml/src/main/java/cpw/mods/fml/common/versioning/VersionParser.java b/fml/src/main/java/net/minecraftforge/fml/common/versioning/VersionParser.java similarity index 93% rename from fml/src/main/java/cpw/mods/fml/common/versioning/VersionParser.java rename to fml/src/main/java/net/minecraftforge/fml/common/versioning/VersionParser.java index 5b6d0619e1..6d8b9c654e 100644 --- a/fml/src/main/java/cpw/mods/fml/common/versioning/VersionParser.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/versioning/VersionParser.java @@ -10,18 +10,19 @@ * cpw - implementation */ -package cpw.mods.fml.common.versioning; +package net.minecraftforge.fml.common.versioning; import java.util.List; + +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.LoaderException; + import org.apache.logging.log4j.Level; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.Lists; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.LoaderException; - /** * Parses version strings according to the specification here: * http://docs.codehaus.org/display/MAVEN/Versioning diff --git a/fml/src/main/java/cpw/mods/fml/common/versioning/VersionRange.java b/fml/src/main/java/net/minecraftforge/fml/common/versioning/VersionRange.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/common/versioning/VersionRange.java rename to fml/src/main/java/net/minecraftforge/fml/common/versioning/VersionRange.java index 6af8307afa..a249d74004 100644 --- a/fml/src/main/java/cpw/mods/fml/common/versioning/VersionRange.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/versioning/VersionRange.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.common.versioning; +package net.minecraftforge.fml.common.versioning; /* * Modifications by cpw under LGPL 2.1 or later */ diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java b/fml/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java rename to fml/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java index f771366da9..16947e64ad 100644 --- a/fml/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java +++ b/fml/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.relauncher; +package net.minecraftforge.fml.relauncher; import java.io.File; import java.io.FilenameFilter; @@ -27,10 +27,23 @@ import java.util.List; import java.util.Map; import java.util.jar.Attributes; import java.util.jar.JarFile; + import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.asm.transformers.ModAccessTransformer; +import net.minecraftforge.fml.common.launcher.FMLInjectionAndSortingTweaker; +import net.minecraftforge.fml.common.launcher.FMLTweaker; +import net.minecraftforge.fml.common.toposort.TopologicalSort; +import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.DependsOn; +import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.MCVersion; +import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.Name; +import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.SortingIndex; +import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions; + import org.apache.logging.log4j.Level; + import com.google.common.base.Strings; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; @@ -38,22 +51,12 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.ObjectArrays; import com.google.common.primitives.Ints; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.asm.transformers.ModAccessTransformer; -import cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker; -import cpw.mods.fml.common.launcher.FMLTweaker; -import cpw.mods.fml.common.toposort.TopologicalSort; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.DependsOn; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.Name; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.SortingIndex; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions; public class CoreModManager { private static final Attributes.Name COREMODCONTAINSFMLMOD = new Attributes.Name("FMLCorePluginContainsFMLMod"); private static final Attributes.Name MODTYPE = new Attributes.Name("ModType"); private static final Attributes.Name MODSIDE = new Attributes.Name("ModSide"); - private static String[] rootPlugins = { "cpw.mods.fml.relauncher.FMLCorePlugin", "net.minecraftforge.classloading.FMLForgePlugin" }; + private static String[] rootPlugins = { "net.minecraftforge.fml.relauncher.FMLCorePlugin", "net.minecraftforge.classloading.FMLForgePlugin" }; private static List loadedCoremods = Lists.newArrayList(); private static List loadPlugins; private static boolean deobfuscatedEnvironment; @@ -176,10 +179,10 @@ public class CoreModManager { FMLRelaunchLog.fine("Enabling runtime deobfuscation"); } - tweaker.injectCascadingTweak("cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker"); + tweaker.injectCascadingTweak("net.minecraftforge.fml.common.launcher.FMLInjectionAndSortingTweaker"); try { - classLoader.registerTransformer("cpw.mods.fml.common.asm.transformers.PatchingTransformer"); + classLoader.registerTransformer("net.minecraftforge.fml.common.asm.transformers.PatchingTransformer"); } catch (Exception e) { @@ -527,8 +530,8 @@ public class CoreModManager { { Launch.blackboard.put("fml.deobfuscatedEnvironment", deobfuscatedEnvironment); - tweaker.injectCascadingTweak("cpw.mods.fml.common.launcher.FMLDeobfTweaker"); - tweakSorting.put("cpw.mods.fml.common.launcher.FMLDeobfTweaker", Integer.valueOf(1000)); + tweaker.injectCascadingTweak("net.minecraftforge.fml.common.launcher.FMLDeobfTweaker"); + tweakSorting.put("net.minecraftforge.fml.common.launcher.FMLDeobfTweaker", Integer.valueOf(1000)); } public static void injectCoreModTweaks(FMLInjectionAndSortingTweaker fmlInjectionAndSortingTweaker) diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/FMLCorePlugin.java b/fml/src/main/java/net/minecraftforge/fml/relauncher/FMLCorePlugin.java similarity index 61% rename from fml/src/main/java/cpw/mods/fml/relauncher/FMLCorePlugin.java rename to fml/src/main/java/net/minecraftforge/fml/relauncher/FMLCorePlugin.java index 460bdc1eca..f41e74ac1d 100644 --- a/fml/src/main/java/cpw/mods/fml/relauncher/FMLCorePlugin.java +++ b/fml/src/main/java/net/minecraftforge/fml/relauncher/FMLCorePlugin.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.relauncher; +package net.minecraftforge.fml.relauncher; import java.util.Map; @@ -20,27 +20,27 @@ public class FMLCorePlugin implements IFMLLoadingPlugin public String[] getASMTransformerClass() { return new String[] { - "cpw.mods.fml.common.asm.transformers.MarkerTransformer", - "cpw.mods.fml.common.asm.transformers.SideTransformer", - "cpw.mods.fml.common.asm.transformers.EventSubscriptionTransformer", + "net.minecraftforge.fml.common.asm.transformers.MarkerTransformer", + "net.minecraftforge.fml.common.asm.transformers.SideTransformer", + "net.minecraftforge.fml.common.asm.transformers.EventSubscriptionTransformer", }; } @Override public String getAccessTransformerClass() { - return "cpw.mods.fml.common.asm.transformers.AccessTransformer"; + return "net.minecraftforge.fml.common.asm.transformers.AccessTransformer"; } @Override public String getModContainerClass() { - return "cpw.mods.fml.common.FMLContainer"; + return "net.minecraftforge.fml.common.FMLContainer"; } @Override public String getSetupClass() { - return "cpw.mods.fml.common.asm.FMLSanityChecker"; + return "net.minecraftforge.fml.common.asm.FMLSanityChecker"; } @Override diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/FMLInjectionData.java b/fml/src/main/java/net/minecraftforge/fml/relauncher/FMLInjectionData.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/relauncher/FMLInjectionData.java rename to fml/src/main/java/net/minecraftforge/fml/relauncher/FMLInjectionData.java index 558b7da5aa..5c46260868 100644 --- a/fml/src/main/java/cpw/mods/fml/relauncher/FMLInjectionData.java +++ b/fml/src/main/java/net/minecraftforge/fml/relauncher/FMLInjectionData.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.relauncher; +package net.minecraftforge.fml.relauncher; import java.io.File; import java.io.IOException; diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/FMLLaunchHandler.java b/fml/src/main/java/net/minecraftforge/fml/relauncher/FMLLaunchHandler.java similarity index 89% rename from fml/src/main/java/cpw/mods/fml/relauncher/FMLLaunchHandler.java rename to fml/src/main/java/net/minecraftforge/fml/relauncher/FMLLaunchHandler.java index 877c210751..8a2a3031e6 100644 --- a/fml/src/main/java/cpw/mods/fml/relauncher/FMLLaunchHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/relauncher/FMLLaunchHandler.java @@ -10,17 +10,17 @@ * cpw - implementation */ -package cpw.mods.fml.relauncher; +package net.minecraftforge.fml.relauncher; import java.io.File; + import org.apache.logging.log4j.Level; import net.minecraft.launchwrapper.LaunchClassLoader; +import net.minecraftforge.fml.common.launcher.FMLTweaker; import com.google.common.base.Throwables; -import cpw.mods.fml.common.launcher.FMLTweaker; - public class FMLLaunchHandler { private static FMLLaunchHandler INSTANCE; @@ -54,10 +54,10 @@ public class FMLLaunchHandler this.classLoader = launchLoader; this.tweaker = tweaker; this.minecraftHome = tweaker.getGameDir(); - this.classLoader.addClassLoaderExclusion("cpw.mods.fml.relauncher."); + this.classLoader.addClassLoaderExclusion("net.minecraftforge.fml.relauncher."); this.classLoader.addClassLoaderExclusion("net.minecraftforge.classloading."); - this.classLoader.addTransformerExclusion("cpw.mods.fml.common.asm.transformers.deobf."); - this.classLoader.addTransformerExclusion("cpw.mods.fml.common.patcher."); + this.classLoader.addTransformerExclusion("net.minecraftforge.fml.common.asm.transformers.deobf."); + this.classLoader.addTransformerExclusion("net.minecraftforge.fml.common.patcher."); } private void setupClient() diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/FMLRelaunchLog.java b/fml/src/main/java/net/minecraftforge/fml/relauncher/FMLRelaunchLog.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/relauncher/FMLRelaunchLog.java rename to fml/src/main/java/net/minecraftforge/fml/relauncher/FMLRelaunchLog.java index ff7df33478..b2d8604a57 100644 --- a/fml/src/main/java/cpw/mods/fml/relauncher/FMLRelaunchLog.java +++ b/fml/src/main/java/net/minecraftforge/fml/relauncher/FMLRelaunchLog.java @@ -10,18 +10,18 @@ * cpw - implementation */ -package cpw.mods.fml.relauncher; +package net.minecraftforge.fml.relauncher; import java.io.File; import java.util.Locale; +import net.minecraftforge.fml.common.TracingPrintStream; + import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.ThreadContext; -import cpw.mods.fml.common.TracingPrintStream; - public class FMLRelaunchLog { /** diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java b/fml/src/main/java/net/minecraftforge/fml/relauncher/FMLSecurityManager.java similarity index 75% rename from fml/src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java rename to fml/src/main/java/net/minecraftforge/fml/relauncher/FMLSecurityManager.java index 71a0925449..f2cdc06152 100644 --- a/fml/src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java +++ b/fml/src/main/java/net/minecraftforge/fml/relauncher/FMLSecurityManager.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.relauncher; +package net.minecraftforge.fml.relauncher; import java.security.Permission; @@ -20,7 +20,7 @@ public class FMLSecurityManager extends SecurityManager { String callingClass = classContexts.length > 3 ? classContexts[4].getName() : "none"; String callingParent = classContexts.length > 4 ? classContexts[5].getName() : "none"; // FML is allowed to call system exit and the Minecraft applet (from the quit button) - if (!(callingClass.startsWith("cpw.mods.fml.") || ( "net.minecraft.client.Minecraft".equals(callingClass) && "net.minecraft.client.Minecraft".equals(callingParent)) || ("net.minecraft.server.dedicated.DedicatedServer".equals(callingClass) && "net.minecraft.server.MinecraftServer".equals(callingParent)))) + if (!(callingClass.startsWith("net.minecraftforge.fml.") || ( "net.minecraft.client.Minecraft".equals(callingClass) && "net.minecraft.client.Minecraft".equals(callingParent)) || ("net.minecraft.server.dedicated.DedicatedServer".equals(callingClass) && "net.minecraft.server.MinecraftServer".equals(callingParent)))) { throw new ExitTrappedException(); } diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/FileListHelper.java b/fml/src/main/java/net/minecraftforge/fml/relauncher/FileListHelper.java similarity index 94% rename from fml/src/main/java/cpw/mods/fml/relauncher/FileListHelper.java rename to fml/src/main/java/net/minecraftforge/fml/relauncher/FileListHelper.java index eebe34b2ba..71506ed2ce 100644 --- a/fml/src/main/java/cpw/mods/fml/relauncher/FileListHelper.java +++ b/fml/src/main/java/net/minecraftforge/fml/relauncher/FileListHelper.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.relauncher; +package net.minecraftforge.fml.relauncher; import java.io.File; import java.io.FilenameFilter; diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/IFMLCallHook.java b/fml/src/main/java/net/minecraftforge/fml/relauncher/IFMLCallHook.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/relauncher/IFMLCallHook.java rename to fml/src/main/java/net/minecraftforge/fml/relauncher/IFMLCallHook.java index 56deb00d55..9eb35d850b 100644 --- a/fml/src/main/java/cpw/mods/fml/relauncher/IFMLCallHook.java +++ b/fml/src/main/java/net/minecraftforge/fml/relauncher/IFMLCallHook.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.relauncher; +package net.minecraftforge.fml.relauncher; import java.util.Map; import java.util.concurrent.Callable; diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/IFMLLoadingPlugin.java b/fml/src/main/java/net/minecraftforge/fml/relauncher/IFMLLoadingPlugin.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/relauncher/IFMLLoadingPlugin.java rename to fml/src/main/java/net/minecraftforge/fml/relauncher/IFMLLoadingPlugin.java index e83753e625..57eb5d5258 100644 --- a/fml/src/main/java/cpw/mods/fml/relauncher/IFMLLoadingPlugin.java +++ b/fml/src/main/java/net/minecraftforge/fml/relauncher/IFMLLoadingPlugin.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.relauncher; +package net.minecraftforge.fml.relauncher; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/ModListHelper.java b/fml/src/main/java/net/minecraftforge/fml/relauncher/ModListHelper.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/relauncher/ModListHelper.java rename to fml/src/main/java/net/minecraftforge/fml/relauncher/ModListHelper.java index b08b1af250..5ed884d95c 100644 --- a/fml/src/main/java/cpw/mods/fml/relauncher/ModListHelper.java +++ b/fml/src/main/java/net/minecraftforge/fml/relauncher/ModListHelper.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.relauncher; +package net.minecraftforge.fml.relauncher; import java.io.File; import java.io.IOException; diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/ReflectionHelper.java b/fml/src/main/java/net/minecraftforge/fml/relauncher/ReflectionHelper.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/relauncher/ReflectionHelper.java rename to fml/src/main/java/net/minecraftforge/fml/relauncher/ReflectionHelper.java index a0c14928e8..ff72524eca 100644 --- a/fml/src/main/java/cpw/mods/fml/relauncher/ReflectionHelper.java +++ b/fml/src/main/java/net/minecraftforge/fml/relauncher/ReflectionHelper.java @@ -10,7 +10,7 @@ * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package cpw.mods.fml.relauncher; +package net.minecraftforge.fml.relauncher; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/ServerLaunchWrapper.java b/fml/src/main/java/net/minecraftforge/fml/relauncher/ServerLaunchWrapper.java similarity index 91% rename from fml/src/main/java/cpw/mods/fml/relauncher/ServerLaunchWrapper.java rename to fml/src/main/java/net/minecraftforge/fml/relauncher/ServerLaunchWrapper.java index f32c5e97cc..6d201da084 100644 --- a/fml/src/main/java/cpw/mods/fml/relauncher/ServerLaunchWrapper.java +++ b/fml/src/main/java/net/minecraftforge/fml/relauncher/ServerLaunchWrapper.java @@ -1,4 +1,4 @@ -package cpw.mods.fml.relauncher; +package net.minecraftforge.fml.relauncher; import java.lang.reflect.Method; @@ -38,7 +38,7 @@ public class ServerLaunchWrapper { Method main = launchwrapper.getMethod("main", String[].class); String[] allArgs = new String[args.length + 2]; allArgs[0] = "--tweakClass"; - allArgs[1] = "cpw.mods.fml.common.launcher.FMLServerTweaker"; + allArgs[1] = "net.minecraftforge.fml.common.launcher.FMLServerTweaker"; System.arraycopy(args, 0, allArgs, 2, args.length); main.invoke(null,(Object)allArgs); } diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/Side.java b/fml/src/main/java/net/minecraftforge/fml/relauncher/Side.java similarity index 95% rename from fml/src/main/java/cpw/mods/fml/relauncher/Side.java rename to fml/src/main/java/net/minecraftforge/fml/relauncher/Side.java index 574f7c3e32..0acd06b8aa 100644 --- a/fml/src/main/java/cpw/mods/fml/relauncher/Side.java +++ b/fml/src/main/java/net/minecraftforge/fml/relauncher/Side.java @@ -10,7 +10,7 @@ * cpw - implementation */ -package cpw.mods.fml.relauncher; +package net.minecraftforge.fml.relauncher; public enum Side { diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/SideOnly.java b/fml/src/main/java/net/minecraftforge/fml/relauncher/SideOnly.java similarity index 93% rename from fml/src/main/java/cpw/mods/fml/relauncher/SideOnly.java rename to fml/src/main/java/net/minecraftforge/fml/relauncher/SideOnly.java index 3a066034ee..f04b0b6829 100644 --- a/fml/src/main/java/cpw/mods/fml/relauncher/SideOnly.java +++ b/fml/src/main/java/net/minecraftforge/fml/relauncher/SideOnly.java @@ -10,14 +10,14 @@ * cpw - implementation */ -package cpw.mods.fml.relauncher; +package net.minecraftforge.fml.relauncher; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import cpw.mods.fml.common.SidedProxy; +import net.minecraftforge.fml.common.SidedProxy; /** diff --git a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java rename to fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java index fb87764793..46f367d1c7 100644 --- a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java +++ b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java @@ -24,7 +24,7 @@ * */ -package cpw.mods.fml.repackage.com.nothome.delta; +package net.minecraftforge.fml.repackage.com.nothome.delta; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Checksum.java b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/Checksum.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Checksum.java rename to fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/Checksum.java index 11dc6c6cdd..55cc033967 100644 --- a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Checksum.java +++ b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/Checksum.java @@ -23,7 +23,7 @@ * IN THE SOFTWARE. */ -package cpw.mods.fml.repackage.com.nothome.delta; +package net.minecraftforge.fml.repackage.com.nothome.delta; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DebugDiffWriter.java b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/DebugDiffWriter.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DebugDiffWriter.java rename to fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/DebugDiffWriter.java index 7281e40ce0..0dff4d4538 100644 --- a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DebugDiffWriter.java +++ b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/DebugDiffWriter.java @@ -22,7 +22,7 @@ * */ -package cpw.mods.fml.repackage.com.nothome.delta; +package net.minecraftforge.fml.repackage.com.nothome.delta; import java.io.ByteArrayOutputStream; diff --git a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Delta.java b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/Delta.java similarity index 99% rename from fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Delta.java rename to fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/Delta.java index 534e220e30..60cc2d56f4 100644 --- a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Delta.java +++ b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/Delta.java @@ -32,7 +32,7 @@ * gls031504a Error being written to stderr rather than throwing exception */ -package cpw.mods.fml.repackage.com.nothome.delta; +package net.minecraftforge.fml.repackage.com.nothome.delta; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DiffWriter.java b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/DiffWriter.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DiffWriter.java rename to fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/DiffWriter.java index 1f86e4ec2a..a2534e346f 100644 --- a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DiffWriter.java +++ b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/DiffWriter.java @@ -22,7 +22,7 @@ * */ -package cpw.mods.fml.repackage.com.nothome.delta; +package net.minecraftforge.fml.repackage.com.nothome.delta; import java.io.Closeable; import java.io.IOException; diff --git a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffPatcher.java b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/GDiffPatcher.java similarity index 88% rename from fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffPatcher.java rename to fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/GDiffPatcher.java index c9de71834e..ee0bfe223f 100644 --- a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffPatcher.java +++ b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/GDiffPatcher.java @@ -23,19 +23,19 @@ * */ -package cpw.mods.fml.repackage.com.nothome.delta; +package net.minecraftforge.fml.repackage.com.nothome.delta; -import static cpw.mods.fml.repackage.com.nothome.delta.GDiffWriter.COPY_INT_INT; -import static cpw.mods.fml.repackage.com.nothome.delta.GDiffWriter.COPY_INT_UBYTE; -import static cpw.mods.fml.repackage.com.nothome.delta.GDiffWriter.COPY_INT_USHORT; -import static cpw.mods.fml.repackage.com.nothome.delta.GDiffWriter.COPY_LONG_INT; -import static cpw.mods.fml.repackage.com.nothome.delta.GDiffWriter.COPY_USHORT_INT; -import static cpw.mods.fml.repackage.com.nothome.delta.GDiffWriter.COPY_USHORT_UBYTE; -import static cpw.mods.fml.repackage.com.nothome.delta.GDiffWriter.COPY_USHORT_USHORT; -import static cpw.mods.fml.repackage.com.nothome.delta.GDiffWriter.DATA_INT; -import static cpw.mods.fml.repackage.com.nothome.delta.GDiffWriter.DATA_MAX; -import static cpw.mods.fml.repackage.com.nothome.delta.GDiffWriter.DATA_USHORT; -import static cpw.mods.fml.repackage.com.nothome.delta.GDiffWriter.EOF; +import static net.minecraftforge.fml.repackage.com.nothome.delta.GDiffWriter.COPY_INT_INT; +import static net.minecraftforge.fml.repackage.com.nothome.delta.GDiffWriter.COPY_INT_UBYTE; +import static net.minecraftforge.fml.repackage.com.nothome.delta.GDiffWriter.COPY_INT_USHORT; +import static net.minecraftforge.fml.repackage.com.nothome.delta.GDiffWriter.COPY_LONG_INT; +import static net.minecraftforge.fml.repackage.com.nothome.delta.GDiffWriter.COPY_USHORT_INT; +import static net.minecraftforge.fml.repackage.com.nothome.delta.GDiffWriter.COPY_USHORT_UBYTE; +import static net.minecraftforge.fml.repackage.com.nothome.delta.GDiffWriter.COPY_USHORT_USHORT; +import static net.minecraftforge.fml.repackage.com.nothome.delta.GDiffWriter.DATA_INT; +import static net.minecraftforge.fml.repackage.com.nothome.delta.GDiffWriter.DATA_MAX; +import static net.minecraftforge.fml.repackage.com.nothome.delta.GDiffWriter.DATA_USHORT; +import static net.minecraftforge.fml.repackage.com.nothome.delta.GDiffWriter.EOF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/GDiffWriter.java similarity index 98% rename from fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java rename to fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/GDiffWriter.java index 63d8c92fe3..cd47bf1b59 100644 --- a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java +++ b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/GDiffWriter.java @@ -22,7 +22,7 @@ * */ -package cpw.mods.fml.repackage.com.nothome.delta; +package net.minecraftforge.fml.repackage.com.nothome.delta; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; diff --git a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/PatchException.java b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/PatchException.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/PatchException.java rename to fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/PatchException.java index e419dffbbf..6eff451191 100644 --- a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/PatchException.java +++ b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/PatchException.java @@ -24,7 +24,7 @@ * */ -package cpw.mods.fml.repackage.com.nothome.delta; +package net.minecraftforge.fml.repackage.com.nothome.delta; import java.io.IOException; diff --git a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java similarity index 97% rename from fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java rename to fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java index dd03ff20ee..fad58fc9c9 100644 --- a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java +++ b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java @@ -25,7 +25,7 @@ * */ -package cpw.mods.fml.repackage.com.nothome.delta; +package net.minecraftforge.fml.repackage.com.nothome.delta; import java.io.IOException; import java.io.RandomAccessFile; diff --git a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/SeekableSource.java b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/SeekableSource.java similarity index 96% rename from fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/SeekableSource.java rename to fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/SeekableSource.java index 522e0203d6..a309f02a18 100644 --- a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/SeekableSource.java +++ b/fml/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/SeekableSource.java @@ -24,7 +24,7 @@ * */ -package cpw.mods.fml.repackage.com.nothome.delta; +package net.minecraftforge.fml.repackage.com.nothome.delta; import java.io.Closeable; import java.io.IOException; diff --git a/fml/src/main/java/cpw/mods/fml/server/FMLServerHandler.java b/fml/src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java similarity index 89% rename from fml/src/main/java/cpw/mods/fml/server/FMLServerHandler.java rename to fml/src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java index 7f8c3d6bbc..a0c47096e9 100644 --- a/fml/src/main/java/cpw/mods/fml/server/FMLServerHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java @@ -10,7 +10,7 @@ * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package cpw.mods.fml.server; +package net.minecraftforge.fml.server; import java.io.File; import java.util.Iterator; @@ -24,21 +24,20 @@ import net.minecraft.network.NetworkManager; import net.minecraft.server.MinecraftServer; import net.minecraft.server.dedicated.DedicatedServer; import net.minecraft.world.storage.SaveFormatOld; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.IFMLSidedHandler; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.StartupQuery; +import net.minecraftforge.fml.common.eventhandler.EventBus; +import net.minecraftforge.fml.common.functions.GenericIterableFactory; +import net.minecraftforge.fml.common.network.FMLNetworkEvent; +import net.minecraftforge.fml.common.registry.LanguageRegistry; +import net.minecraftforge.fml.relauncher.Side; import com.google.common.collect.ImmutableList; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.IFMLSidedHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.StartupQuery; -import cpw.mods.fml.common.eventhandler.EventBus; -import cpw.mods.fml.common.functions.GenericIterableFactory; -import cpw.mods.fml.common.network.FMLNetworkEvent; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; - /** * Handles primary communication from hooked code into the system * @@ -127,7 +126,7 @@ public class FMLServerHandler implements IFMLSidedHandler } /* (non-Javadoc) - * @see cpw.mods.fml.common.IFMLSidedHandler#getAdditionalBrandingInformation() + * @see net.minecraftforge.fml.common.IFMLSidedHandler#getAdditionalBrandingInformation() */ @Override public List getAdditionalBrandingInformation() @@ -136,7 +135,7 @@ public class FMLServerHandler implements IFMLSidedHandler } /* (non-Javadoc) - * @see cpw.mods.fml.common.IFMLSidedHandler#getSide() + * @see net.minecraftforge.fml.common.IFMLSidedHandler#getSide() */ @Override public Side getSide() diff --git a/fml/src/test/java/cpw/mods/fml/test/TestNetStuff.java b/fml/src/test/java/net/minecraftforge/fml/test/TestNetStuff.java similarity index 98% rename from fml/src/test/java/cpw/mods/fml/test/TestNetStuff.java rename to fml/src/test/java/net/minecraftforge/fml/test/TestNetStuff.java index 31467019d1..2c52b01f27 100644 --- a/fml/src/test/java/cpw/mods/fml/test/TestNetStuff.java +++ b/fml/src/test/java/net/minecraftforge/fml/test/TestNetStuff.java @@ -1,11 +1,13 @@ -package cpw.mods.fml.test; +package net.minecraftforge.fml.test; import static org.junit.Assert.*; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; +import net.minecraftforge.fml.common.network.ByteBufUtils; + import org.junit.Test; + import com.google.common.base.Strings; -import cpw.mods.fml.common.network.ByteBufUtils; public class TestNetStuff { diff --git a/fml/src/test/java/cpw/mods/fml/test/simplenet/SimpleNetHandler1.java b/fml/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetHandler1.java similarity index 57% rename from fml/src/test/java/cpw/mods/fml/test/simplenet/SimpleNetHandler1.java rename to fml/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetHandler1.java index a124edc54c..47c92d3c5b 100644 --- a/fml/src/test/java/cpw/mods/fml/test/simplenet/SimpleNetHandler1.java +++ b/fml/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetHandler1.java @@ -1,7 +1,7 @@ -package cpw.mods.fml.test.simplenet; +package net.minecraftforge.fml.test.simplenet; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class SimpleNetHandler1 implements IMessageHandler { diff --git a/fml/src/test/java/cpw/mods/fml/test/simplenet/SimpleNetHandler2.java b/fml/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetHandler2.java similarity index 57% rename from fml/src/test/java/cpw/mods/fml/test/simplenet/SimpleNetHandler2.java rename to fml/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetHandler2.java index fd4c71fd84..9fa1a75f3b 100644 --- a/fml/src/test/java/cpw/mods/fml/test/simplenet/SimpleNetHandler2.java +++ b/fml/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetHandler2.java @@ -1,7 +1,7 @@ -package cpw.mods.fml.test.simplenet; +package net.minecraftforge.fml.test.simplenet; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class SimpleNetHandler2 implements IMessageHandler { diff --git a/fml/src/test/java/cpw/mods/fml/test/simplenet/SimpleNetTestMessage1.java b/fml/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTestMessage1.java similarity index 66% rename from fml/src/test/java/cpw/mods/fml/test/simplenet/SimpleNetTestMessage1.java rename to fml/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTestMessage1.java index 74e05155f9..1251531c60 100644 --- a/fml/src/test/java/cpw/mods/fml/test/simplenet/SimpleNetTestMessage1.java +++ b/fml/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTestMessage1.java @@ -1,7 +1,7 @@ -package cpw.mods.fml.test.simplenet; +package net.minecraftforge.fml.test.simplenet; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import io.netty.buffer.ByteBuf; -import cpw.mods.fml.common.network.simpleimpl.IMessage; public class SimpleNetTestMessage1 implements IMessage { @Override diff --git a/fml/src/test/java/cpw/mods/fml/test/simplenet/SimpleNetTestMessage2.java b/fml/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTestMessage2.java similarity index 66% rename from fml/src/test/java/cpw/mods/fml/test/simplenet/SimpleNetTestMessage2.java rename to fml/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTestMessage2.java index 7b030540b3..6814cc54c5 100644 --- a/fml/src/test/java/cpw/mods/fml/test/simplenet/SimpleNetTestMessage2.java +++ b/fml/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTestMessage2.java @@ -1,7 +1,7 @@ -package cpw.mods.fml.test.simplenet; +package net.minecraftforge.fml.test.simplenet; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import io.netty.buffer.ByteBuf; -import cpw.mods.fml.common.network.simpleimpl.IMessage; public class SimpleNetTestMessage2 implements IMessage { diff --git a/fml/src/test/java/cpw/mods/fml/test/simplenet/SimpleNetTester.java b/fml/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTester.java similarity index 67% rename from fml/src/test/java/cpw/mods/fml/test/simplenet/SimpleNetTester.java rename to fml/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTester.java index 6be28fec98..4d6d65c7e1 100644 --- a/fml/src/test/java/cpw/mods/fml/test/simplenet/SimpleNetTester.java +++ b/fml/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTester.java @@ -1,10 +1,11 @@ -package cpw.mods.fml.test.simplenet; +package net.minecraftforge.fml.test.simplenet; import static org.junit.Assert.*; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import net.minecraftforge.fml.relauncher.Side; + import org.junit.Test; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import cpw.mods.fml.relauncher.Side; public class SimpleNetTester {