From e117e7a9fc114cea561b58c26cc53e84a4fcba30 Mon Sep 17 00:00:00 2001 From: Johann Bernhardt Date: Sun, 19 Dec 2021 23:22:40 +0100 Subject: [PATCH] Moved sources an resources --- .../integration/EnderIO.java | 50 ----------- .../api/IWCTInteractionHelper.java | 0 .../api/IWCTItemDescription.java | 0 .../api/IWCTItems.java | 0 .../api/IWirelessCraftingTermHandler.java | 0 .../api/IWirelessCraftingTerminalItem.java | 0 .../wirelesscraftingterminal/api/WCTApi.java | 0 .../exceptions/MissingIngredientError.java | 0 .../api/exceptions/ModNotInstalled.java | 0 .../api/exceptions/RegistrationError.java | 0 .../api/grid/ICraftingIssuerHost.java | 0 .../api/gui/ICraftingIssuerContainer.java | 0 .../networking/security/MachineSource.java | 0 .../networking/security/WCTIActionHost.java | 0 .../networking/security/WCTPlayerSource.java | 0 .../api/package-info.java | 0 .../api/recipes/IIngredient.java | 0 .../api/recipes/game/IRecipeBakeable.java | 0 .../api/recipes/game/ShapedRecipe.java | 0 .../client/gui/GuiCraftAmount.java | 0 .../client/gui/GuiCraftConfirm.java | 0 .../client/gui/GuiCraftingCPU.java | 0 .../client/gui/GuiCraftingStatus.java | 0 .../client/gui/GuiFactory.java | 0 .../client/gui/GuiMagnet.java | 0 .../gui/GuiWirelessCraftingTerminal.java | 0 .../client/gui/WCTBaseGui.java | 0 .../client/gui/WCTGuiConfig.java | 0 .../client/gui/widgets/GuiScrollbar.java | 0 .../client/gui/widgets/GuiTabButton.java | 0 .../client/gui/widgets/GuiTrashButton.java | 0 .../client/gui/widgets/MEGuiTextField.java | 0 .../client/gui/widgets/WCTGuiButton.java | 0 .../client/gui/widgets/WCTGuiCheckBox.java | 0 .../client/me/ClientDCInternalInv.java | 0 .../client/me/InternalSlotME.java | 0 .../client/me/ItemRepo.java | 0 .../client/me/SlotDisconnected.java | 0 .../client/me/SlotME.java | 0 .../client/me/WCTRenderItem.java | 0 .../client/textures/IStateIconTexture.java | 0 .../client/textures/WCTStateIconsEnum.java | 0 .../common/WCTGuiHandler.java | 0 .../common/WirelessCraftingTerminal.java | 2 +- .../container/ContainerCraftAmount.java | 0 .../container/ContainerCraftConfirm.java | 0 .../container/ContainerCraftingCPU.java | 0 .../container/ContainerCraftingStatus.java | 0 .../common/container/ContainerMagnet.java | 0 .../container/ContainerOpenContext.java | 0 .../ContainerWirelessCraftingTerminal.java | 0 .../common/container/CraftingCPURecord.java | 0 .../common/container/WCTBaseContainer.java | 0 .../common/container/guisync/GuiSync.java | 0 .../common/container/guisync/SyncData.java | 0 .../container/slot/AppEngCraftingSlot.java | 0 .../common/container/slot/AppEngSlot.java | 0 .../container/slot/IOptionalSlotHost.java | 0 .../common/container/slot/NullSlot.java | 0 .../container/slot/OptionalSlotFake.java | 0 .../common/container/slot/SlotArmor.java | 0 .../common/container/slot/SlotBooster.java | 0 .../container/slot/SlotCraftingMatrix.java | 0 .../container/slot/SlotCraftingTerm.java | 0 .../common/container/slot/SlotDisabled.java | 0 .../common/container/slot/SlotFake.java | 0 .../slot/SlotFakeCraftingMatrix.java | 0 .../container/slot/SlotInaccessible.java | 0 .../common/container/slot/SlotMagnet.java | 0 .../container/slot/SlotMagnetFilter.java | 0 .../common/container/slot/SlotOutput.java | 0 .../container/slot/SlotPlayerHotBar.java | 0 .../common/container/slot/SlotPlayerInv.java | 0 .../common/container/slot/SlotTrash.java | 0 .../common/container/slot/SlotViewCell.java | 0 .../common/inventory/WCTInventoryBooster.java | 0 .../inventory/WCTInventoryCraftResult.java | 0 .../inventory/WCTInventoryCrafting.java | 0 .../common/inventory/WCTInventoryMagnet.java | 0 .../inventory/WCTInventoryMagnetFilter.java | 0 .../common/inventory/WCTInventoryTrash.java | 0 .../inventory/WCTInventoryViewCell.java | 0 .../common/registries/EnumCache.java | 0 .../common/utils/RandomUtils.java | 0 .../common/utils/ReflectionUtils.java | 0 .../common/utils/WCTLog.java | 0 .../core/sync/WCTPacket.java | 0 .../core/sync/WCTPacketHandlerBase.java | 0 .../core/sync/network/INetworkInfo.java | 0 .../core/sync/network/IPacketHandler.java | 0 .../core/sync/network/NetworkHandler.java | 0 .../sync/network/WCTClientPacketHandler.java | 0 .../sync/network/WCTServerPacketHandler.java | 0 .../core/sync/packets/PacketConfigSync.java | 0 .../core/sync/packets/PacketCraftRequest.java | 0 .../core/sync/packets/PacketEmptyTrash.java | 0 .../sync/packets/PacketInventoryAction.java | 0 .../sync/packets/PacketMEInventoryUpdate.java | 0 .../core/sync/packets/PacketMagnetFilter.java | 0 .../core/sync/packets/PacketNEIRecipe.java | 0 .../core/sync/packets/PacketOpenGui.java | 0 .../core/sync/packets/PacketPartialItem.java | 0 .../core/sync/packets/PacketProgressBar.java | 0 .../core/sync/packets/PacketSetJobBytes.java | 0 .../core/sync/packets/PacketSetMagnet.java | 0 .../core/sync/packets/PacketSwapSlots.java | 0 .../core/sync/packets/PacketSwitchGuis.java | 0 .../sync/packets/PacketUpdateCPUInfo.java | 0 .../core/sync/packets/PacketValueConfig.java | 0 .../creativetab/CreativeTabWCT.java | 0 .../handlers/AchievementHandler.java | 0 .../handlers/ConfigHandler.java | 0 .../handlers/KeybindHandler.java | 0 .../handlers/LocaleHandler.java | 0 .../handlers/NEIRecipeHandler.java | 0 .../handlers/RecipeHandler.java | 0 .../handlers/VersionCheckHandler.java | 0 .../helpers/Reflected.java | 0 .../helpers/WirelessTerminalGuiObject.java | 0 .../implementation/WCTAPIImplementation.java | 0 .../implementation/WCTInteractionHelper.java | 0 .../implementation/WCTItemDescription.java | 0 .../implementation/WCTItems.java | 0 .../implementation/WirelessAELink.java | 0 .../integration/EnderIO.java | 78 ++++++++++++++++++ .../integration/IIntegrationModule.java | 0 .../integration/IntegrationHelper.java | 0 .../integration/IntegrationNode.java | 0 .../integration/IntegrationRegistry.java | 0 .../integration/IntegrationSide.java | 0 .../integration/IntegrationStage.java | 0 .../integration/IntegrationType.java | 0 .../integration/abstraction/INEI.java | 0 .../integration/modules/NEI.java | 0 .../NEIHelpers/NEIAEShapedRecipeHandler.java | 0 .../NEIHelpers/NEICraftingHandler.java | 0 .../modules/NEIHelpers/NEIGUIHandler.java | 0 .../integration/modules/RFItem.java | 0 .../modules/helpers/NullRFHandler.java | 0 .../items/ItemBoosterBGIcon.java | 0 .../items/ItemEnum.java | 0 .../items/ItemInfinityBooster.java | 0 .../items/ItemMagnet.java | 0 .../items/ItemWirelessCraftingTerminal.java | 0 .../proxy/ClientProxy.java | 0 .../proxy/CommonProxy.java | 0 .../reference/Reference.java | 2 +- .../resources/assets/ae2wct/lang/de_DE.lang | 0 .../resources/assets/ae2wct/lang/en_CA.lang | 0 .../resources/assets/ae2wct/lang/en_GB.lang | 0 .../resources/assets/ae2wct/lang/en_US.lang | 0 .../resources/assets/ae2wct/lang/es_ES.lang | 0 .../resources/assets/ae2wct/lang/zh_CN.lang | 0 .../assets/ae2wct/textures/allyourbase.png | Bin .../assets/ae2wct/textures/cape/p455cape.png | Bin .../assets/ae2wct/textures/gui/crafting.png | Bin .../ae2wct/textures/gui/crafting_old.png | Bin .../ae2wct/textures/gui/crafting_viewcell.png | Bin .../ae2wct/textures/gui/magnetfilter.png | Bin .../ae2wct/textures/gui/magnetfilter_old.png | Bin .../items/ItemMaterial.WirelessBooster.png | Bin .../ae2wct/textures/items/boosterBG.png | Bin .../ae2wct/textures/items/boosterBG_old.png | Bin .../textures/items/infinityBoosterCard.png | Bin .../assets/ae2wct/textures/items/magnet.png | Bin .../assets/ae2wct/textures/items/magnetBG.png | Bin .../ae2wct/textures/items/magnetCard.png | Bin .../items/wirelessCraftingTerminal - Copy.png | Bin .../items/wirelessCraftingTerminal.png | Bin src/{ => main}/resources/mcmod.info | 8 +- src/{ => main}/resources/pack.mcmeta | 0 src/resources/CoFH_at.cfg | 66 --------------- 172 files changed, 84 insertions(+), 122 deletions(-) delete mode 100644 src/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTInteractionHelper.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItemDescription.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItems.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTermHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTerminalItem.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/WCTApi.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/MissingIngredientError.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/ModNotInstalled.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/RegistrationError.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/grid/ICraftingIssuerHost.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/gui/ICraftingIssuerContainer.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/MachineSource.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTIActionHost.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTPlayerSource.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/package-info.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/IIngredient.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/IRecipeBakeable.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/ShapedRecipe.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiFactory.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTGuiConfig.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiScrollbar.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTabButton.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTrashButton.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/MEGuiTextField.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiButton.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiCheckBox.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/me/ClientDCInternalInv.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/me/InternalSlotME.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotDisconnected.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotME.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/me/WCTRenderItem.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/textures/IStateIconTexture.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/client/textures/WCTStateIconsEnum.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java (97%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingStatus.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerOpenContext.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/CraftingCPURecord.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/WCTBaseContainer.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/GuiSync.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/SyncData.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngCraftingSlot.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngSlot.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/IOptionalSlotHost.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/NullSlot.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/OptionalSlotFake.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotArmor.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotBooster.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingMatrix.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingTerm.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotDisabled.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFake.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFakeCraftingMatrix.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotInaccessible.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnet.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnetFilter.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotOutput.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerHotBar.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerInv.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotTrash.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotViewCell.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryBooster.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCraftResult.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCrafting.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnet.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryTrash.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryViewCell.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/registries/EnumCache.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/utils/ReflectionUtils.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/common/utils/WCTLog.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/INetworkInfo.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/IPacketHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/NetworkHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTClientPacketHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTServerPacketHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketCraftRequest.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketInventoryAction.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMEInventoryUpdate.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMagnetFilter.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketNEIRecipe.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketPartialItem.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketProgressBar.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetJobBytes.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetMagnet.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwapSlots.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchGuis.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketUpdateCPUInfo.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketValueConfig.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/handlers/NEIRecipeHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/handlers/RecipeHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/handlers/VersionCheckHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/helpers/Reflected.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTAPIImplementation.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItemDescription.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItems.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/implementation/WirelessAELink.java (100%) create mode 100644 src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/integration/IIntegrationModule.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationHelper.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationNode.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationRegistry.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationSide.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationStage.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationType.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/integration/abstraction/INEI.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEICraftingHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIGUIHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/RFItem.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/helpers/NullRFHandler.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/items/ItemBoosterBGIcon.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java (100%) rename src/{ => main}/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java (96%) rename src/{ => main}/resources/assets/ae2wct/lang/de_DE.lang (100%) rename src/{ => main}/resources/assets/ae2wct/lang/en_CA.lang (100%) rename src/{ => main}/resources/assets/ae2wct/lang/en_GB.lang (100%) rename src/{ => main}/resources/assets/ae2wct/lang/en_US.lang (100%) rename src/{ => main}/resources/assets/ae2wct/lang/es_ES.lang (100%) rename src/{ => main}/resources/assets/ae2wct/lang/zh_CN.lang (100%) rename src/{ => main}/resources/assets/ae2wct/textures/allyourbase.png (100%) rename src/{ => main}/resources/assets/ae2wct/textures/cape/p455cape.png (100%) rename src/{ => main}/resources/assets/ae2wct/textures/gui/crafting.png (100%) rename src/{ => main}/resources/assets/ae2wct/textures/gui/crafting_old.png (100%) rename src/{ => main}/resources/assets/ae2wct/textures/gui/crafting_viewcell.png (100%) rename src/{ => main}/resources/assets/ae2wct/textures/gui/magnetfilter.png (100%) rename src/{ => main}/resources/assets/ae2wct/textures/gui/magnetfilter_old.png (100%) rename src/{ => main}/resources/assets/ae2wct/textures/items/ItemMaterial.WirelessBooster.png (100%) rename src/{ => main}/resources/assets/ae2wct/textures/items/boosterBG.png (100%) rename src/{ => main}/resources/assets/ae2wct/textures/items/boosterBG_old.png (100%) rename src/{ => main}/resources/assets/ae2wct/textures/items/infinityBoosterCard.png (100%) rename src/{ => main}/resources/assets/ae2wct/textures/items/magnet.png (100%) rename src/{ => main}/resources/assets/ae2wct/textures/items/magnetBG.png (100%) rename src/{ => main}/resources/assets/ae2wct/textures/items/magnetCard.png (100%) rename src/{ => main}/resources/assets/ae2wct/textures/items/wirelessCraftingTerminal - Copy.png (100%) rename src/{ => main}/resources/assets/ae2wct/textures/items/wirelessCraftingTerminal.png (100%) rename src/{ => main}/resources/mcmod.info (69%) rename src/{ => main}/resources/pack.mcmeta (100%) delete mode 100644 src/resources/CoFH_at.cfg diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java deleted file mode 100644 index b6ba599..0000000 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java +++ /dev/null @@ -1,50 +0,0 @@ -package net.p455w0rd.wirelesscraftingterminal.integration; - -import java.lang.invoke.MethodHandle; -import java.util.Iterator; -import java.util.Map; - -import cpw.mods.fml.common.Loader; -import crazypants.enderio.enchantment.EnchantmentSoulBound; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.item.ItemStack; -import p455w0rdslib.util.ReflectionUtils; - -/** - * @author p455w0rd - * - */ -public class EnderIO { - - public static boolean isLoaded() { - return Loader.isModLoaded("EnderIO"); - } - - @SuppressWarnings("rawtypes") - public static boolean isSoulBound(ItemStack stack) { - if (isLoaded() && crazypants.enderio.config.Config.enchantmentSoulBoundEnabled) { - try { - MethodHandle GET_SOULBOUND = ReflectionUtils.findFieldGetter(crazypants.enderio.enchantment.Enchantments.class, "soulBound"); - EnchantmentSoulBound soulbound = (EnchantmentSoulBound) GET_SOULBOUND.invoke(crazypants.enderio.enchantment.Enchantments.getInstance()); - MethodHandle GET_ID = ReflectionUtils.findFieldGetter(crazypants.enderio.enchantment.EnchantmentSoulBound.class, "id"); - int soulboundId = (int) GET_ID.invoke(soulbound); - //int soulboundId = crazypants.enderio.config.Config.enchantmentSoulBoundId; - Map enchants = EnchantmentHelper.getEnchantments(stack); - if (enchants != null) { - Iterator i = enchants.keySet().iterator(); - while (i.hasNext()) { - int enchId = (int) i.next(); - if (soulboundId != enchId) { - continue; - } - return true; - } - } - } - catch (Throwable e) { - } - } - return false; - } - -} diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTInteractionHelper.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTInteractionHelper.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTInteractionHelper.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTInteractionHelper.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItemDescription.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItemDescription.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItemDescription.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItemDescription.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItems.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItems.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItems.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItems.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTermHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTermHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTermHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTermHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTerminalItem.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTerminalItem.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTerminalItem.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTerminalItem.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/WCTApi.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/WCTApi.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/WCTApi.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/WCTApi.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/MissingIngredientError.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/MissingIngredientError.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/MissingIngredientError.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/MissingIngredientError.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/ModNotInstalled.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/ModNotInstalled.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/ModNotInstalled.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/ModNotInstalled.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/RegistrationError.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/RegistrationError.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/RegistrationError.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/RegistrationError.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/grid/ICraftingIssuerHost.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/grid/ICraftingIssuerHost.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/grid/ICraftingIssuerHost.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/grid/ICraftingIssuerHost.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/gui/ICraftingIssuerContainer.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/gui/ICraftingIssuerContainer.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/gui/ICraftingIssuerContainer.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/gui/ICraftingIssuerContainer.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/MachineSource.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/MachineSource.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/MachineSource.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/MachineSource.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTIActionHost.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTIActionHost.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTIActionHost.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTIActionHost.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTPlayerSource.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTPlayerSource.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTPlayerSource.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTPlayerSource.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/package-info.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/package-info.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/package-info.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/package-info.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/IIngredient.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/IIngredient.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/IIngredient.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/IIngredient.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/IRecipeBakeable.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/IRecipeBakeable.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/IRecipeBakeable.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/IRecipeBakeable.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/ShapedRecipe.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/ShapedRecipe.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/ShapedRecipe.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/ShapedRecipe.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiFactory.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiFactory.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiFactory.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiFactory.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTGuiConfig.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTGuiConfig.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTGuiConfig.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTGuiConfig.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiScrollbar.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiScrollbar.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiScrollbar.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiScrollbar.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTabButton.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTabButton.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTabButton.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTabButton.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTrashButton.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTrashButton.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTrashButton.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTrashButton.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/MEGuiTextField.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/MEGuiTextField.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/MEGuiTextField.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/MEGuiTextField.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiButton.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiButton.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiButton.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiButton.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiCheckBox.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiCheckBox.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiCheckBox.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiCheckBox.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ClientDCInternalInv.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/ClientDCInternalInv.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ClientDCInternalInv.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/ClientDCInternalInv.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/InternalSlotME.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/InternalSlotME.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/me/InternalSlotME.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/InternalSlotME.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotDisconnected.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotDisconnected.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotDisconnected.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotDisconnected.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotME.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotME.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotME.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotME.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/WCTRenderItem.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/WCTRenderItem.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/me/WCTRenderItem.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/WCTRenderItem.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/textures/IStateIconTexture.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/textures/IStateIconTexture.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/textures/IStateIconTexture.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/textures/IStateIconTexture.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/textures/WCTStateIconsEnum.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/textures/WCTStateIconsEnum.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/textures/WCTStateIconsEnum.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/textures/WCTStateIconsEnum.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java similarity index 97% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java index 2876d2d..1c8e98c 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java +++ b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java @@ -29,7 +29,7 @@ import net.p455w0rd.wirelesscraftingterminal.reference.Reference; @Mod(modid = Reference.MODID, acceptedMinecraftVersions = "[1.7.10]", name = Reference.NAME, version = Reference.VERSION, guiFactory = Reference.GUI_FACTORY, dependencies = "" + "required-after:Forge@[" + net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion + net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion + net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion - + net.minecraftforge.common.ForgeVersion.buildVersion + ",);" + "required-after:appliedenergistics2@[rv3-beta-1,);required-after:p455w0rdslib;after:NotEnoughItems;") + + net.minecraftforge.common.ForgeVersion.buildVersion + ",);" + "required-after:appliedenergistics2@[rv3-beta-1,);after:NotEnoughItems;") public class WirelessCraftingTerminal { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingStatus.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingStatus.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingStatus.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingStatus.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerOpenContext.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerOpenContext.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerOpenContext.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerOpenContext.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/CraftingCPURecord.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/CraftingCPURecord.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/CraftingCPURecord.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/CraftingCPURecord.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/WCTBaseContainer.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/WCTBaseContainer.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/WCTBaseContainer.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/WCTBaseContainer.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/GuiSync.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/GuiSync.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/GuiSync.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/GuiSync.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/SyncData.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/SyncData.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/SyncData.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/SyncData.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngCraftingSlot.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngCraftingSlot.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngCraftingSlot.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngCraftingSlot.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngSlot.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngSlot.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngSlot.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngSlot.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/IOptionalSlotHost.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/IOptionalSlotHost.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/IOptionalSlotHost.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/IOptionalSlotHost.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/NullSlot.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/NullSlot.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/NullSlot.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/NullSlot.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/OptionalSlotFake.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/OptionalSlotFake.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/OptionalSlotFake.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/OptionalSlotFake.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotArmor.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotArmor.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotArmor.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotArmor.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotBooster.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotBooster.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotBooster.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotBooster.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingMatrix.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingMatrix.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingMatrix.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingMatrix.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingTerm.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingTerm.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingTerm.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingTerm.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotDisabled.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotDisabled.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotDisabled.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotDisabled.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFake.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFake.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFake.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFake.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFakeCraftingMatrix.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFakeCraftingMatrix.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFakeCraftingMatrix.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFakeCraftingMatrix.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotInaccessible.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotInaccessible.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotInaccessible.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotInaccessible.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnet.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnet.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnet.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnet.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnetFilter.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnetFilter.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnetFilter.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnetFilter.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotOutput.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotOutput.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotOutput.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotOutput.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerHotBar.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerHotBar.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerHotBar.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerHotBar.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerInv.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerInv.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerInv.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerInv.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotTrash.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotTrash.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotTrash.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotTrash.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotViewCell.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotViewCell.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotViewCell.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotViewCell.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryBooster.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryBooster.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryBooster.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryBooster.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCraftResult.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCraftResult.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCraftResult.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCraftResult.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCrafting.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCrafting.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCrafting.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCrafting.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnet.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnet.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnet.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnet.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryTrash.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryTrash.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryTrash.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryTrash.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryViewCell.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryViewCell.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryViewCell.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryViewCell.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/registries/EnumCache.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/registries/EnumCache.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/registries/EnumCache.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/registries/EnumCache.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/ReflectionUtils.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/utils/ReflectionUtils.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/ReflectionUtils.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/utils/ReflectionUtils.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/WCTLog.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/utils/WCTLog.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/WCTLog.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/utils/WCTLog.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/INetworkInfo.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/INetworkInfo.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/INetworkInfo.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/INetworkInfo.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/IPacketHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/IPacketHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/IPacketHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/IPacketHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/NetworkHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/NetworkHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/NetworkHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/NetworkHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTClientPacketHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTClientPacketHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTClientPacketHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTClientPacketHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTServerPacketHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTServerPacketHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTServerPacketHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTServerPacketHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketCraftRequest.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketCraftRequest.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketCraftRequest.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketCraftRequest.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketInventoryAction.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketInventoryAction.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketInventoryAction.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketInventoryAction.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMEInventoryUpdate.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMEInventoryUpdate.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMEInventoryUpdate.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMEInventoryUpdate.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMagnetFilter.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMagnetFilter.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMagnetFilter.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMagnetFilter.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketNEIRecipe.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketNEIRecipe.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketNEIRecipe.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketNEIRecipe.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketPartialItem.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketPartialItem.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketPartialItem.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketPartialItem.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketProgressBar.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketProgressBar.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketProgressBar.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketProgressBar.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetJobBytes.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetJobBytes.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetJobBytes.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetJobBytes.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetMagnet.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetMagnet.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetMagnet.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetMagnet.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwapSlots.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwapSlots.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwapSlots.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwapSlots.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchGuis.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchGuis.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchGuis.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchGuis.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketUpdateCPUInfo.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketUpdateCPUInfo.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketUpdateCPUInfo.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketUpdateCPUInfo.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketValueConfig.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketValueConfig.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketValueConfig.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketValueConfig.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/NEIRecipeHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/NEIRecipeHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/handlers/NEIRecipeHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/NEIRecipeHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/RecipeHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/RecipeHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/handlers/RecipeHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/RecipeHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/VersionCheckHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/VersionCheckHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/handlers/VersionCheckHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/VersionCheckHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/Reflected.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/helpers/Reflected.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/helpers/Reflected.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/helpers/Reflected.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTAPIImplementation.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTAPIImplementation.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTAPIImplementation.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTAPIImplementation.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItemDescription.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItemDescription.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItemDescription.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItemDescription.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItems.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItems.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItems.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItems.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WirelessAELink.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WirelessAELink.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WirelessAELink.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WirelessAELink.java diff --git a/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java new file mode 100644 index 0000000..1fb1022 --- /dev/null +++ b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java @@ -0,0 +1,78 @@ +package net.p455w0rd.wirelesscraftingterminal.integration; + +import java.lang.reflect.Field; +import java.util.Iterator; +import java.util.Map; + +import cpw.mods.fml.common.Loader; +import crazypants.enderio.enchantment.EnchantmentSoulBound; +import crazypants.enderio.enchantment.Enchantments; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.item.ItemStack; + +/** + * @author p455w0rd + * + */ +public class EnderIO { + + private static Field soulBound; + private static Field id; + + static { + try { + soulBound = Enchantments.class.getDeclaredField("soulBound"); + soulBound.setAccessible(true); + + id = EnchantmentSoulBound.class.getDeclaredField("id"); + id.setAccessible(true); + } + catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + + private static EnchantmentSoulBound getEnchantmentSoulBound(Enchantments enchantments) throws IllegalAccessException { + return (EnchantmentSoulBound) soulBound.get(enchantments); + } + + private static int getEnchantmentId(EnchantmentSoulBound enchantmentSoulBound) throws IllegalAccessException { + return id.getInt(enchantmentSoulBound); + } + + private static Boolean isEnderIOLoaded = null; + + public static boolean isLoaded() { + if(isEnderIOLoaded == null) { + isEnderIOLoaded = Loader.isModLoaded("EnderIO"); + } + return isEnderIOLoaded; + } + + @SuppressWarnings("rawtypes") + public static boolean isSoulBound(ItemStack stack) { + if (isLoaded() && crazypants.enderio.config.Config.enchantmentSoulBoundEnabled) { + int soulboundId; + try { + soulboundId = getEnchantmentId(getEnchantmentSoulBound(Enchantments.getInstance())); + } + catch (IllegalAccessException e) { + return false; + } + + Map enchants = EnchantmentHelper.getEnchantments(stack); + if (enchants != null) { + Iterator i = enchants.keySet().iterator(); + while (i.hasNext()) { + int enchId = (int) i.next(); + if (soulboundId != enchId) { + continue; + } + return true; + } + } + } + return false; + } + +} diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IIntegrationModule.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IIntegrationModule.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/IIntegrationModule.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IIntegrationModule.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationHelper.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationHelper.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationHelper.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationHelper.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationNode.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationNode.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationNode.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationNode.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationRegistry.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationRegistry.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationRegistry.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationRegistry.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationSide.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationSide.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationSide.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationSide.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationStage.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationStage.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationStage.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationStage.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationType.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationType.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationType.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationType.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/abstraction/INEI.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/abstraction/INEI.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/abstraction/INEI.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/abstraction/INEI.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEICraftingHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEICraftingHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEICraftingHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEICraftingHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIGUIHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIGUIHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIGUIHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIGUIHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/RFItem.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/RFItem.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/RFItem.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/RFItem.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/helpers/NullRFHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/helpers/NullRFHandler.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/helpers/NullRFHandler.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/helpers/NullRFHandler.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemBoosterBGIcon.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemBoosterBGIcon.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemBoosterBGIcon.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemBoosterBGIcon.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java similarity index 100% rename from src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java similarity index 96% rename from src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java index 6d3a835..90bb637 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java +++ b/src/main/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java @@ -2,7 +2,7 @@ package net.p455w0rd.wirelesscraftingterminal.reference; public class Reference { public static final String MODID = "ae2wct"; - public static final String VERSION = "@version@"; + public static final String VERSION = "GRADLETOKEN_VERSION"; public static final String NAME = "AE2 Wireless Crafting Terminal"; public static final String SERVER_PROXY_CLASS = "net.p455w0rd.wirelesscraftingterminal.proxy.CommonProxy"; public static final String CLIENT_PROXY_CLASS = "net.p455w0rd.wirelesscraftingterminal.proxy.ClientProxy"; diff --git a/src/resources/assets/ae2wct/lang/de_DE.lang b/src/main/resources/assets/ae2wct/lang/de_DE.lang similarity index 100% rename from src/resources/assets/ae2wct/lang/de_DE.lang rename to src/main/resources/assets/ae2wct/lang/de_DE.lang diff --git a/src/resources/assets/ae2wct/lang/en_CA.lang b/src/main/resources/assets/ae2wct/lang/en_CA.lang similarity index 100% rename from src/resources/assets/ae2wct/lang/en_CA.lang rename to src/main/resources/assets/ae2wct/lang/en_CA.lang diff --git a/src/resources/assets/ae2wct/lang/en_GB.lang b/src/main/resources/assets/ae2wct/lang/en_GB.lang similarity index 100% rename from src/resources/assets/ae2wct/lang/en_GB.lang rename to src/main/resources/assets/ae2wct/lang/en_GB.lang diff --git a/src/resources/assets/ae2wct/lang/en_US.lang b/src/main/resources/assets/ae2wct/lang/en_US.lang similarity index 100% rename from src/resources/assets/ae2wct/lang/en_US.lang rename to src/main/resources/assets/ae2wct/lang/en_US.lang diff --git a/src/resources/assets/ae2wct/lang/es_ES.lang b/src/main/resources/assets/ae2wct/lang/es_ES.lang similarity index 100% rename from src/resources/assets/ae2wct/lang/es_ES.lang rename to src/main/resources/assets/ae2wct/lang/es_ES.lang diff --git a/src/resources/assets/ae2wct/lang/zh_CN.lang b/src/main/resources/assets/ae2wct/lang/zh_CN.lang similarity index 100% rename from src/resources/assets/ae2wct/lang/zh_CN.lang rename to src/main/resources/assets/ae2wct/lang/zh_CN.lang diff --git a/src/resources/assets/ae2wct/textures/allyourbase.png b/src/main/resources/assets/ae2wct/textures/allyourbase.png similarity index 100% rename from src/resources/assets/ae2wct/textures/allyourbase.png rename to src/main/resources/assets/ae2wct/textures/allyourbase.png diff --git a/src/resources/assets/ae2wct/textures/cape/p455cape.png b/src/main/resources/assets/ae2wct/textures/cape/p455cape.png similarity index 100% rename from src/resources/assets/ae2wct/textures/cape/p455cape.png rename to src/main/resources/assets/ae2wct/textures/cape/p455cape.png diff --git a/src/resources/assets/ae2wct/textures/gui/crafting.png b/src/main/resources/assets/ae2wct/textures/gui/crafting.png similarity index 100% rename from src/resources/assets/ae2wct/textures/gui/crafting.png rename to src/main/resources/assets/ae2wct/textures/gui/crafting.png diff --git a/src/resources/assets/ae2wct/textures/gui/crafting_old.png b/src/main/resources/assets/ae2wct/textures/gui/crafting_old.png similarity index 100% rename from src/resources/assets/ae2wct/textures/gui/crafting_old.png rename to src/main/resources/assets/ae2wct/textures/gui/crafting_old.png diff --git a/src/resources/assets/ae2wct/textures/gui/crafting_viewcell.png b/src/main/resources/assets/ae2wct/textures/gui/crafting_viewcell.png similarity index 100% rename from src/resources/assets/ae2wct/textures/gui/crafting_viewcell.png rename to src/main/resources/assets/ae2wct/textures/gui/crafting_viewcell.png diff --git a/src/resources/assets/ae2wct/textures/gui/magnetfilter.png b/src/main/resources/assets/ae2wct/textures/gui/magnetfilter.png similarity index 100% rename from src/resources/assets/ae2wct/textures/gui/magnetfilter.png rename to src/main/resources/assets/ae2wct/textures/gui/magnetfilter.png diff --git a/src/resources/assets/ae2wct/textures/gui/magnetfilter_old.png b/src/main/resources/assets/ae2wct/textures/gui/magnetfilter_old.png similarity index 100% rename from src/resources/assets/ae2wct/textures/gui/magnetfilter_old.png rename to src/main/resources/assets/ae2wct/textures/gui/magnetfilter_old.png diff --git a/src/resources/assets/ae2wct/textures/items/ItemMaterial.WirelessBooster.png b/src/main/resources/assets/ae2wct/textures/items/ItemMaterial.WirelessBooster.png similarity index 100% rename from src/resources/assets/ae2wct/textures/items/ItemMaterial.WirelessBooster.png rename to src/main/resources/assets/ae2wct/textures/items/ItemMaterial.WirelessBooster.png diff --git a/src/resources/assets/ae2wct/textures/items/boosterBG.png b/src/main/resources/assets/ae2wct/textures/items/boosterBG.png similarity index 100% rename from src/resources/assets/ae2wct/textures/items/boosterBG.png rename to src/main/resources/assets/ae2wct/textures/items/boosterBG.png diff --git a/src/resources/assets/ae2wct/textures/items/boosterBG_old.png b/src/main/resources/assets/ae2wct/textures/items/boosterBG_old.png similarity index 100% rename from src/resources/assets/ae2wct/textures/items/boosterBG_old.png rename to src/main/resources/assets/ae2wct/textures/items/boosterBG_old.png diff --git a/src/resources/assets/ae2wct/textures/items/infinityBoosterCard.png b/src/main/resources/assets/ae2wct/textures/items/infinityBoosterCard.png similarity index 100% rename from src/resources/assets/ae2wct/textures/items/infinityBoosterCard.png rename to src/main/resources/assets/ae2wct/textures/items/infinityBoosterCard.png diff --git a/src/resources/assets/ae2wct/textures/items/magnet.png b/src/main/resources/assets/ae2wct/textures/items/magnet.png similarity index 100% rename from src/resources/assets/ae2wct/textures/items/magnet.png rename to src/main/resources/assets/ae2wct/textures/items/magnet.png diff --git a/src/resources/assets/ae2wct/textures/items/magnetBG.png b/src/main/resources/assets/ae2wct/textures/items/magnetBG.png similarity index 100% rename from src/resources/assets/ae2wct/textures/items/magnetBG.png rename to src/main/resources/assets/ae2wct/textures/items/magnetBG.png diff --git a/src/resources/assets/ae2wct/textures/items/magnetCard.png b/src/main/resources/assets/ae2wct/textures/items/magnetCard.png similarity index 100% rename from src/resources/assets/ae2wct/textures/items/magnetCard.png rename to src/main/resources/assets/ae2wct/textures/items/magnetCard.png diff --git a/src/resources/assets/ae2wct/textures/items/wirelessCraftingTerminal - Copy.png b/src/main/resources/assets/ae2wct/textures/items/wirelessCraftingTerminal - Copy.png similarity index 100% rename from src/resources/assets/ae2wct/textures/items/wirelessCraftingTerminal - Copy.png rename to src/main/resources/assets/ae2wct/textures/items/wirelessCraftingTerminal - Copy.png diff --git a/src/resources/assets/ae2wct/textures/items/wirelessCraftingTerminal.png b/src/main/resources/assets/ae2wct/textures/items/wirelessCraftingTerminal.png similarity index 100% rename from src/resources/assets/ae2wct/textures/items/wirelessCraftingTerminal.png rename to src/main/resources/assets/ae2wct/textures/items/wirelessCraftingTerminal.png diff --git a/src/resources/mcmod.info b/src/main/resources/mcmod.info similarity index 69% rename from src/resources/mcmod.info rename to src/main/resources/mcmod.info index b25fac6..7e70ead 100644 --- a/src/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,10 +1,10 @@ [ { - "modid": "ae2wct", - "name": "AE2 Wireless Crafting Terminal", + "modid": "${modId}", + "name": "${modName}", "description": "Adds a wireless version of the AE2 Crafting Terminal", - "version": "${version}", - "mcversion": "${mcversion}", + "version": "${modVersion}", + "mcversion": "${minecraftVersion}", "url": "http://p455w0rd.net/", "updateUrl": "", "authorList": ["TheRealp455w0rd"], diff --git a/src/resources/pack.mcmeta b/src/main/resources/pack.mcmeta similarity index 100% rename from src/resources/pack.mcmeta rename to src/main/resources/pack.mcmeta diff --git a/src/resources/CoFH_at.cfg b/src/resources/CoFH_at.cfg deleted file mode 100644 index b1cf76f..0000000 --- a/src/resources/CoFH_at.cfg +++ /dev/null @@ -1,66 +0,0 @@ -# NetherOres -public net.minecraft.entity.monster.EntityPigZombie func_70835_c(Lnet/minecraft/entity/Entity;)V # becomeAngryAt -public net.minecraft.entity.monster.EntitySilverfish field_70843_d # allySummonCooldown -public-f net.minecraft.init.Blocks field_150449_bY # oreNetherQuartz - -# MineFactory Reloaded -protected net.minecraft.util.WeightedRandomFishable * # need it all -public net.minecraft.entity.EntityList field_75624_e # classToIDMapping -public net.minecraft.entity.EntityList field_75622_f # stringToIDMapping -public net.minecraft.entity.monster.EntitySlime func_70799_a(I)V # setSlimeSize -public net.minecraft.entity.monster.EntityZombie func_82228_a(I)V # startConversion -public net.minecraft.entity.EntityLivingBase field_70718_bc # recentlyHit -public-f net.minecraft.init.Blocks field_150432_aD # ice -public-f net.minecraft.init.Blocks field_150410_aZ # glass_pane -public-f net.minecraft.init.Items field_151117_aB # milkBucket -protected net.minecraft.block.Block field_149770_b # unlocalizedName -public net.minecraft.server.management.PlayerManager func_72690_a(IIZ)Lnet/minecraft/server/management/PlayerManager$PlayerInstance; # getOrCreateChunkWatcher -public net.minecraft.server.management.PlayerManager$PlayerInstance -public net.minecraft.server.management.PlayerManager$PlayerInstance field_73263_b # playersWatchingChunk -public net.minecraft.entity.EntityLiving field_70728_aV # experienceValue -public net.minecraft.entity.EntityLiving field_82174_bp # equipmentDropChances - -# ThermalFoundation -public net.minecraft.entity.Entity field_70171_ac # inWater - -# ThermalDynamics -public net.minecraft.client.renderer.Tessellator field_147569_p # rawBufferIndex -public net.minecraft.client.renderer.Tessellator field_78408_v # xOffset -public net.minecraft.client.renderer.Tessellator field_78407_w # yOffset -public net.minecraft.client.renderer.Tessellator field_78417_x # zOffset -public net.minecraft.client.renderer.Tessellator field_78406_i # rawBuffer -public net.minecraft.client.renderer.Tessellator field_78405_h # vertexCount - -# Thermal Expansion -public net.minecraft.entity.Entity field_83001_bt # invulnerable -public net.minecraft.entity.Entity field_70178_ae # isImmuneToFire -public net.minecraft.entity.player.EntityPlayer field_71074_e # itemInUse -public net.minecraft.server.management.ItemInWorldManager field_73094_o #durabilityRemainingOnBlock -protected net.minecraft.client.particle.EntityFireworkSparkFX * # everything - -# PC Core -public net.minecraft.client.gui.GuiScreen field_146289_q # fontRenderer -public net.minecraft.client.gui.inventory.GuiContainer field_147003_i # guiLeft -public net.minecraft.client.gui.inventory.GuiContainer field_147009_r # guiTop -public net.minecraft.world.WorldServer field_73068_P # allPlayersSleeping - -# CoFH Core -protected net.minecraft.inventory.Container * # senseless to have private stuff here -protected net.minecraft.client.gui.inventory.GuiContainer * # senseless to have private stuff here -protected net.minecraft.client.gui.FontRenderer *()V # all of it -protected net.minecraft.client.gui.FontRenderer * # all of it -public net.minecraft.entity.projectile.EntityFishHook * # (nearly) literally everything is private - -public net.minecraft.nbt.NBTTagByteArray func_74734_a(Ljava/io/DataOutput;)V # write - -protected net.minecraft.entity.player.EntityPlayer field_71072_f # itemInUseCount -public net.minecraft.item.ItemPickaxe field_150915_c # blocksEffectiveAgainst -public net.minecraft.item.ItemSpade field_150916_c # blocksEffectiveAgainst -public net.minecraft.item.ItemAxe field_150917_c # blocksEffectiveAgainst -public net.minecraft.util.RegistrySimple field_82596_a # registryObjects -public-f net.minecraft.util.RegistryNamespaced field_148759_a # underlyingIntegerMap -public net.minecraft.world.World field_72998_d # collidingBoundingBoxes - -# WorldProxy -public-f net.minecraft.world.World *()V # Doesn't matter what it is, we need it public -public-f net.minecraft.world.WorldServer *()V # Doesn't matter what it is, we need it public