From 12f51ac23abbe6fdcb837bd219e4017389937354 Mon Sep 17 00:00:00 2001 From: fewizz Date: Sun, 5 Apr 2015 11:08:54 +0300 Subject: [PATCH] killed modularity, updated IC2 api --- src/main/java/ic2/api/crops/CropCard.class | Bin 5967 -> 6036 bytes src/main/java/ic2/api/crops/CropCard.java | 50 +- .../java/ic2/api/item/ICustomDamageItem.class | Bin 0 -> 386 bytes .../java/ic2/api/item/ICustomDamageItem.java | 56 +++ .../java/ic2/api/item/IKineticWindRotor.class | Bin 318 -> 408 bytes .../java/ic2/api/item/IKineticWindRotor.java | 11 +- .../ic2/api/recipe/IMachineRecipeManager.java | 18 +- .../api/recipe/IMachineRecipeManagerExt.class | Bin 0 -> 309 bytes .../api/recipe/IMachineRecipeManagerExt.java | 22 + .../ic2/api/recipe/RecipeInputItemStack.class | Bin 1899 -> 1899 bytes .../ic2/api/recipe/RecipeInputItemStack.java | 3 +- .../ic2/api/recipe/RecipeInputOreDict.class | Bin 2803 -> 3508 bytes .../ic2/api/recipe/RecipeInputOreDict.java | 49 +- .../java/ic2/api/recipe/RecipeOutput.class | Bin 1740 -> 2596 bytes .../java/ic2/api/recipe/RecipeOutput.java | 26 + .../ic2/IC2Research.java => EMTResearch.java} | 213 ++++---- .../tombenpotter/emt/ElectroMagicTools.java | 8 +- .../emt/client/gui/GuiEtherealMacerator.java | 2 +- .../gui/GuiIndustrialWandRecharger.java | 2 +- .../container/ContainerEtheralMacerator.java | 4 +- .../ContainerIndustrialWandRecharge.java | 2 +- .../emt/client/renderer/RenderLaser.java | 2 +- .../emt/common/RecipeRegistry.java | 465 ++++++++++++++++++ .../tombenpotter/emt/common/Registry.java | 20 + .../{modules/base => }/blocks/BlockBase.java | 6 +- .../base => }/blocks/BlockBaseContainer.java | 4 +- .../{modules/ic2 => }/blocks/BlockEMT.java | 4 +- .../ic2 => }/blocks/BlockEMTMachines.java | 6 +- .../ic2 => }/blocks/BlockEMTSolars.java | 36 +- .../ic2 => }/blocks/BlockEMTSolars2.java | 14 +- .../blocks/BlockEssentiaGenerator.java | 6 +- .../blocks/BlockEssentiaGenerators.java | 6 +- .../base => }/blocks/BlockPortableNode.java | 4 +- .../BlockRegistry.java} | 32 +- .../{modules/ic2 => }/blocks/BlockShield.java | 2 +- .../base => }/blocks/BlockToolRefiller.java | 2 +- .../entities/BaseEntityRegistry.java | 2 +- .../base => }/entities/EntityArcher.java | 2 +- .../ic2 => }/entities/EntityLaser.java | 2 +- .../{modules/base => }/items/ItemBase.java | 6 +- .../base => }/items/ItemBaseBaubles.java | 2 +- .../base => }/items/ItemBaseChainsaw.java | 2 +- .../base => }/items/ItemBaseDrill.java | 2 +- .../base => }/items/ItemBaseOmnitool.java | 2 +- .../items/ItemCraftingComponents.java | 2 +- .../items/ItemElectricScribingTools.java | 2 +- .../ic2 => }/items/ItemIC2Baubles.java | 4 +- .../base => }/items/ItemMaterials.java | 2 +- .../ItemRegistry.java} | 141 +++++- .../base => }/items/ItemShardCarver.java | 2 +- .../items/armor/ItemFeatherWing.java | 2 +- .../armor/ItemThaumiumReinforcedWing.java | 2 +- .../boots/ItemElectricBootsTraveller.java | 2 +- .../armor/boots/ItemNanoBootsTraveller.java | 2 +- .../boots/ItemQuantumBootsTraveller.java | 2 +- .../armor/goggles/ItemElectricGoggles.java | 2 +- .../items/armor/goggles/ItemNanoGoggles.java | 2 +- .../armor/goggles/ItemQuantumGoggles.java | 2 +- .../goggles/ItemSolarHelmetRevealing.java | 2 +- .../items/armor/wings/ItemNanoWing.java | 4 +- .../items/armor/wings/ItemQuantumWing.java | 2 +- .../items/blocks/ItemBlockEMTMachines.java | 2 +- .../items/blocks/ItemBlockEMTSolars.java | 2 +- .../items/blocks/ItemBlockEMTSolars2.java | 2 +- .../blocks/ItemBlockEssentiaGenerator.java | 2 +- .../blocks/ItemBlockEssentiaGenerators.java | 2 +- .../base => }/items/foci/ItemBaseFocus.java | 2 +- .../ic2 => }/items/foci/ItemChargeFocus.java | 4 +- .../items/foci/ItemChristmasFocus.java | 2 +- .../items/foci/ItemExplosionFocus.java | 4 +- .../base => }/items/foci/ItemShieldFocus.java | 24 +- .../items/foci/ItemWandChargingFocus.java | 4 +- .../items/tools/ItemElectricHoeGrowth.java | 2 +- .../items/tools/ItemElectricThorHammer.java | 4 +- .../base => }/items/tools/ItemThorHammer.java | 2 +- .../items/tools/ItemThorHammerBroken.java | 2 +- .../items/tools/ItemVanillaChainsaw.java | 4 +- .../items/tools/ItemVanillaDrill.java | 4 +- .../items/tools/ItemVanillaOmnitool.java | 4 +- .../tools/chainsaws/ItemDiamondChainsaw.java | 2 +- .../tools/chainsaws/ItemStreamChainsaw.java | 2 +- .../tools/chainsaws/ItemThaumiumChainsaw.java | 2 +- .../tools/drills/ItemRockbreakerDrill.java | 2 +- .../items/tools/drills/ItemThaumiumDrill.java | 2 +- .../tools/omnitools/ItemOmnitoolDiamond.java | 2 +- .../tools/omnitools/ItemOmnitoolIron.java | 2 +- .../tools/omnitools/ItemOmnitoolThaumium.java | 2 +- .../emt/common/modules/ModuleRegistry.java | 56 --- .../common/modules/base/BaseItemStacks.java | 79 --- .../modules/base/BaseRecipeRegistry.java | 188 ------- .../base/blocks/BaseBlockRegistry.java | 15 - .../modules/base/entities/EntityLaser.java | 350 ------------- .../modules/base/tile/BaseTileRegistry.java | 10 - .../common/modules/ic2/IC2RecipeRegistry.java | 465 ------------------ .../common/modules/ic2/blocks/BlockIC2.java | 28 -- .../modules/ic2/blocks/BlockIC2Container.java | 93 ---- .../ic2/entities/IC2EntityRegistry.java | 5 - .../modules/ic2/items/IC2ItemRegistry.java | 161 ------ .../emt/common/modules/ic2/items/ItemIC2.java | 23 - .../base => }/tile/TileEntityEMT.java | 2 +- .../tile/TileEntityEtherealMacerator.java | 8 +- .../TileEntityIndustrialWandRecharge.java | 4 +- .../tile/TileEntityPortableNode.java | 2 +- .../tile/TileEntityToolRefiller.java | 2 +- .../TileRegistry.java} | 69 ++- .../generators/TileEntityAerGenerator.java | 2 +- .../generators/TileEntityArborGenerator.java | 2 +- .../generators/TileEntityAuramGenerator.java | 2 +- .../generators/TileEntityBaseGenerator.java | 4 +- .../TileEntityEssentiaGenerator.java | 4 +- .../generators/TileEntityIgnisGenerator.java | 2 +- .../TileEntityPotentiaGenerator.java | 2 +- .../tile/solars/TileEntitySolarBase.java | 4 +- .../tile/solars/air/TileEntityAirSolar.java | 8 +- .../solars/air/TileEntityDoubleAirSolar.java | 6 +- .../solars/air/TileEntityTripleAirSolar.java | 6 +- .../compressed/TileEntityCompressedSolar.java | 8 +- .../TileEntityDoubleCompressedSolar.java | 8 +- .../TileEntityTripleCompressedSolar.java | 8 +- .../tile/solars/dark/TileEntityDarkSolar.java | 8 +- .../dark/TileEntityDoubleDarkSolar.java | 6 +- .../dark/TileEntityTripleDarkSolar.java | 6 +- .../earth/TileEntityDoubleEarthSolar.java | 6 +- .../solars/earth/TileEntityEarthSolar.java | 8 +- .../earth/TileEntityTripleEarthSolar.java | 6 +- .../fire/TileEntityDoubleFireSolar.java | 6 +- .../tile/solars/fire/TileEntityFireSolar.java | 8 +- .../fire/TileEntityTripleFireSolar.java | 6 +- .../order/TileEntityDoubleOrderSolar.java | 6 +- .../solars/order/TileEntityOrderSolar.java | 8 +- .../order/TileEntityTripleOrderSolar.java | 6 +- .../water/TileEntityDoubleWaterSolar.java | 6 +- .../water/TileEntityTripleWaterSolar.java | 6 +- .../solars/water/TileEntityWaterSolar.java | 8 +- .../emt/common/util/CreativeTabEMT.java | 4 +- .../common/util/DungeonChestGenerator.java | 6 +- .../emt/common/util/EntityEventHandler.java | 6 +- .../emt/common/util/EventHandlerEMT.java | 12 +- .../emt/common/util/RegistryHandler.java | 6 +- .../tombenpotter/emt/proxies/ClientProxy.java | 4 +- .../tombenpotter/emt/proxies/CommonProxy.java | 4 +- 141 files changed, 1214 insertions(+), 1914 deletions(-) create mode 100644 src/main/java/ic2/api/item/ICustomDamageItem.class create mode 100644 src/main/java/ic2/api/item/ICustomDamageItem.java create mode 100644 src/main/java/ic2/api/recipe/IMachineRecipeManagerExt.class create mode 100644 src/main/java/ic2/api/recipe/IMachineRecipeManagerExt.java rename src/main/java/tombenpotter/emt/{common/modules/ic2/IC2Research.java => EMTResearch.java} (61%) create mode 100644 src/main/java/tombenpotter/emt/common/RecipeRegistry.java create mode 100644 src/main/java/tombenpotter/emt/common/Registry.java rename src/main/java/tombenpotter/emt/common/{modules/base => }/blocks/BlockBase.java (79%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/blocks/BlockBaseContainer.java (95%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/blocks/BlockEMT.java (95%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/blocks/BlockEMTMachines.java (96%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/blocks/BlockEMTSolars.java (86%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/blocks/BlockEMTSolars2.java (88%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/blocks/BlockEssentiaGenerator.java (92%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/blocks/BlockEssentiaGenerators.java (95%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/blocks/BlockPortableNode.java (96%) rename src/main/java/tombenpotter/emt/common/{modules/ic2/blocks/IC2BlockRegistry.java => blocks/BlockRegistry.java} (62%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/blocks/BlockShield.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/blocks/BlockToolRefiller.java (88%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/entities/BaseEntityRegistry.java (97%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/entities/EntityArcher.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/entities/EntityLaser.java (99%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/ItemBase.java (69%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/ItemBaseBaubles.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/ItemBaseChainsaw.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/ItemBaseDrill.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/ItemBaseOmnitool.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/ItemCraftingComponents.java (99%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/ItemElectricScribingTools.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/ItemIC2Baubles.java (97%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/ItemMaterials.java (99%) rename src/main/java/tombenpotter/emt/common/{modules/base/items/BaseItemRegistry.java => items/ItemRegistry.java} (50%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/ItemShardCarver.java (86%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/armor/ItemFeatherWing.java (97%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/armor/ItemThaumiumReinforcedWing.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/armor/boots/ItemElectricBootsTraveller.java (99%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/armor/boots/ItemNanoBootsTraveller.java (97%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/armor/boots/ItemQuantumBootsTraveller.java (97%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/armor/goggles/ItemElectricGoggles.java (99%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/armor/goggles/ItemNanoGoggles.java (97%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/armor/goggles/ItemQuantumGoggles.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/armor/goggles/ItemSolarHelmetRevealing.java (99%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/armor/wings/ItemNanoWing.java (97%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/armor/wings/ItemQuantumWing.java (97%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/blocks/ItemBlockEMTMachines.java (96%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/blocks/ItemBlockEMTSolars.java (99%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/blocks/ItemBlockEMTSolars2.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/blocks/ItemBlockEssentiaGenerator.java (88%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/blocks/ItemBlockEssentiaGenerators.java (97%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/foci/ItemBaseFocus.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/foci/ItemChargeFocus.java (96%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/foci/ItemChristmasFocus.java (97%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/foci/ItemExplosionFocus.java (94%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/foci/ItemShieldFocus.java (73%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/foci/ItemWandChargingFocus.java (94%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/tools/ItemElectricHoeGrowth.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/tools/ItemElectricThorHammer.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/tools/ItemThorHammer.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/tools/ItemThorHammerBroken.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/tools/ItemVanillaChainsaw.java (95%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/tools/ItemVanillaDrill.java (88%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/items/tools/ItemVanillaOmnitool.java (95%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/tools/chainsaws/ItemDiamondChainsaw.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/tools/chainsaws/ItemStreamChainsaw.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/tools/chainsaws/ItemThaumiumChainsaw.java (97%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/tools/drills/ItemRockbreakerDrill.java (99%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/tools/drills/ItemThaumiumDrill.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/tools/omnitools/ItemOmnitoolDiamond.java (97%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/tools/omnitools/ItemOmnitoolIron.java (99%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/items/tools/omnitools/ItemOmnitoolThaumium.java (97%) delete mode 100644 src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java delete mode 100644 src/main/java/tombenpotter/emt/common/modules/base/BaseItemStacks.java delete mode 100644 src/main/java/tombenpotter/emt/common/modules/base/BaseRecipeRegistry.java delete mode 100644 src/main/java/tombenpotter/emt/common/modules/base/blocks/BaseBlockRegistry.java delete mode 100644 src/main/java/tombenpotter/emt/common/modules/base/entities/EntityLaser.java delete mode 100644 src/main/java/tombenpotter/emt/common/modules/base/tile/BaseTileRegistry.java delete mode 100644 src/main/java/tombenpotter/emt/common/modules/ic2/IC2RecipeRegistry.java delete mode 100644 src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockIC2.java delete mode 100644 src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockIC2Container.java delete mode 100644 src/main/java/tombenpotter/emt/common/modules/ic2/entities/IC2EntityRegistry.java delete mode 100644 src/main/java/tombenpotter/emt/common/modules/ic2/items/IC2ItemRegistry.java delete mode 100644 src/main/java/tombenpotter/emt/common/modules/ic2/items/ItemIC2.java rename src/main/java/tombenpotter/emt/common/{modules/base => }/tile/TileEntityEMT.java (96%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/TileEntityEtherealMacerator.java (97%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/TileEntityIndustrialWandRecharge.java (98%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/tile/TileEntityPortableNode.java (95%) rename src/main/java/tombenpotter/emt/common/{modules/base => }/tile/TileEntityToolRefiller.java (55%) rename src/main/java/tombenpotter/emt/common/{modules/ic2/tile/IC2TileRegistry.java => tile/TileRegistry.java} (53%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/generators/TileEntityAerGenerator.java (82%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/generators/TileEntityArborGenerator.java (94%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/generators/TileEntityAuramGenerator.java (94%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/generators/TileEntityBaseGenerator.java (92%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/generators/TileEntityEssentiaGenerator.java (94%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/generators/TileEntityIgnisGenerator.java (94%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/generators/TileEntityPotentiaGenerator.java (94%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/TileEntitySolarBase.java (95%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/air/TileEntityAirSolar.java (82%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/air/TileEntityDoubleAirSolar.java (84%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/air/TileEntityTripleAirSolar.java (84%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/compressed/TileEntityCompressedSolar.java (79%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/compressed/TileEntityDoubleCompressedSolar.java (79%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/compressed/TileEntityTripleCompressedSolar.java (79%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/dark/TileEntityDarkSolar.java (82%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/dark/TileEntityDoubleDarkSolar.java (84%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/dark/TileEntityTripleDarkSolar.java (84%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/earth/TileEntityDoubleEarthSolar.java (84%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/earth/TileEntityEarthSolar.java (82%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/earth/TileEntityTripleEarthSolar.java (84%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/fire/TileEntityDoubleFireSolar.java (84%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/fire/TileEntityFireSolar.java (85%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/fire/TileEntityTripleFireSolar.java (84%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/order/TileEntityDoubleOrderSolar.java (84%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/order/TileEntityOrderSolar.java (81%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/order/TileEntityTripleOrderSolar.java (84%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/water/TileEntityDoubleWaterSolar.java (84%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/water/TileEntityTripleWaterSolar.java (84%) rename src/main/java/tombenpotter/emt/common/{modules/ic2 => }/tile/solars/water/TileEntityWaterSolar.java (83%) diff --git a/src/main/java/ic2/api/crops/CropCard.class b/src/main/java/ic2/api/crops/CropCard.class index 0970501b709e566204477d73278874cf45508e8c..e117b0c958114f63ac80433c027c5433c3a6b8d2 100644 GIT binary patch literal 6036 zcmbVQX?RrS6@I^&NoF#+S!E{(LMTZ{m>NaIAVM|?2CxZ5L0i3+)3};NyP4! z+Qr(^)-F=DELv(yDWXQvirPi3-B;V%&F=kSpZ@lt%X{v-b~iGDL>?6T7P2~aYwr*nqF`EzdO z#?p@7p01s{DM7@ZltOLqP5QW=NbA;6qTjJiYlyqftJkwx!*(s`G_yKw;#Ref@|#S{ zbT%u58yfd0L^?7ls;%m!UpsT71BSg@HVbSfsi*howkgm4%ZM{<(xXMaX0kP*kC}<2 zof*p}I=FV|c8ZE4mOe`9c@2%l%qq!DSca`oo-(szX?_1rceBQ)WM$6Sp{~_(VQsf0l9Qg~szKPWxO1&2MNdYG`y+ zzq#MMMWSFELuS@7?EW#^bY(7WD9E~G+B7VONo1wSm!0qv)Jw!ZU%X8stC>vAsW%Gi z|1ThgG7{#QLyS4NDuAC+9hF0NX2Kcn%-L>DC`6OGbtT`;O+T}>dcrV=hMgX3kkw%& zg~sKx8`0g}Ev(0ebE9U;beK!3n;uv>27#~nSSKfL>e0{0fS%<;lqm91VdL!XG#1#!Y#UAVaB+)98i<6QNx5~9>FDd8 zJ6i2zI&BP2ap@Y_Zy2d5Bj+kKS|1aI+|HQPWUQSM_JK^!7U>~+HJ7v`yD@4yeUx@G z7I#-?toC#!InqhS?96^4t%~?v+(ZU@CFHIeFK`{1beerTGdE=gjQJVhA$UReUMVb_ zbF14hB-={O>@{?lot&mgCy#d;W44jh-5@W>>uJ;P85tpJhu8Wwj)0Dg}iYQTSVBzeD{Vxyq_E=jc&F(g^H;@zD_2JhRd;8!yV|-uo0JO=tLK@ zD`$;Z?BW`(!}SVKSXelI+H+=_%}K+vcupbIyh6kCBC47-yam^Ce9SgTH6AD~V(xLe zTqb=tF(5${tJYC`ogjWYiWf9|2j7k2dm6rvA85D+*J}77ex%{Yvit-;)$lXrqEpi}Y@HgtUACQJTox3cmQnmg!(Z_d({);Q*T79ilF6C(${XqmD`p%cibR(w zrH_qqGAOh(PJeF%E?TrsVg>jr*~d7lfc(Ck652mlTFS`3hRoRHxqfr z1X(zf!eB;w?au3y9Kh^B(P6Jq$_(Boy*M)F_I7EDl1U0ncs7{{HIfnPdetf zk>6<)>SvM4-$mJ~>D=!~^U%t2;rY+xSuiLg&Lk(7jaE4>P+UIbPpKiBgU`xsaGvtctryaTkRN1>V?L+BBNALMfgTewyd8kkS` z1t`ZtY~_>Y?MFL0fQXVN$hSNy@akbEcooc&riT$e#TyT-)P0%A11a%9`2NZw!jp&; z3U4YZye$xJ@im8QOA1B1@Ih>(nIKI z4!7=XK3j4G8=gRH@1rPdnMAy{oJ(`0mFpxlelIHA>Kj8ti5$-i*cAgXQe;8*wfAv5#-A$6Gl^2Dsje8(cpx zro>`~`znTBLU_RUSnhhUgFctw-Pnm;jLiU6`unct&c!G_hsr446gr2kQS`kE6+4Gj zyrWP*P4HrT39lh;4@FMM>Kf|>c-S>yf%i2~8={$epqMWlPHx`prRkDCoSN>HgOEsy zPTW9Q$<5<5QjFi;#F$h*iK<6X9l5-YSyg@Z7%q`(T_m;EC$hGNY;$9Tm)cq`b(1)c zaXEu|A@m;zspJ27PBPmgb^)=0yP4JZGPe&im+wUnj=Hw5;GPPSCq#*l+XFAQ<3{MT zQHUx78LCjPvaE_!og%GC-w%^`g0p7r8O&EyRO8*aj@*Y5bxQ8Mcac=9kW)hTAoK; zD4@=-TuQ&aIA2TthcDF<*gGd*#C!+d>DzUT{6uK$2EPyvqon*~?b0sqvE(qK^%YiE zc=Ix!x_VMqH*&D+K$w;NO8qo-ZfUDap{b3iQkP+wYQuWvjgBU&Sng9O!PpSExxvqn zDm1uchTN*EL_|A>YF4@uLTT!|NT`>Qdr|6Uez8QP- zFp7oz*4H*;AP=IL8Si@?W{l)v6f@%h-tV(xH{6d(FJGz`&CF{YEan)mJoJ7-AP0w=9p21p$Q>W2< z2<1~wXp)vPmd5rFdE|~p4xtNO z(uGo5N?S@oO9@NUg+d5m2$TR_fYOcbEnVo|!w>Wi;H1lUXU1b$mJJ7;<2Uo(ymy!H ze)rzz7ytXjNdO)AR|03@)&xF>&&%+I3fzV-mLrMVV>pyR6t~84IEFhCD3{kS$@9wz ze!o-Rz7oe>GC2~*-ErI#$GtMUFNUv*h@)|QEsn3t#&1;Mo4CIM-@*g3<3V{l7QOi2 zBkoUT4@EAfLD7p}JtV)wvUFUAhh=y~hDT+XlHsu!9#5bJC(7{zo|NI+2@X%ia590X z@k|WQD#RV*Iwx-%Ifa#b2Q0%$j+>T|vh@)snRm=gvcEr-wKgj(AIw{hId1GSbLMcy z=(Mb?qdR8S;>k4wsfqo`@oYMm92w6fZ6l-St<;!dCx^_mvBSz7pn$STJ(D*SPFrv@ zH%7Y$`g^zUR9Mug=W>SaD(NwEI@P8X)E;ixVp^tikwUnsd6z<@JDaBD>H(U*JwHBd z*gIvjLft?%rDt~OwkdOeG2)DwGWnEgG!+5UFUagPGsfm-N{k3vq{F-%uQxQp18Pl*F za?VN9MmV@|&{!ep{i0^{lP8`0O-C#c8A^5bUObVw-GM-Qw#gFw`H zIINotRh;S>GW%vz#tKoO@;eZS;%kX;{{(wI!tedTIR@?^6NjAAI=8c9w;guNv ztl=-{6wv;v;cxi6!qU=hGlqX?_$OW=*Jg0qF?_9&BC}S{x*wEijk8X9=qjuzb!s51 zyO_sKi=D;I_S4v>=if?()afb5oHPo1u|nfKrwVroyU0Z@2_2*Q#01-nLVHsI7yWy| z-2Uv-Lu5GFX`dQOb@G{=XU~q!n`&-M_USe$cQu6#CC!^Hc~(2BpB>Vm;d`~yE4u9F zENHPYuj)!e-y?-RGT}A~sj-r73>smbEp9pu354`cX>)SVsO0;gkz;%JqNs5`#L7Nk zOd1*YGp|)leZK~7DX!gt*e?FwuzXjTIceJLOV+5{A87lcxpuPHM)tckXh{h#ay}pW z(|uAFR?cgZG~Mc%H0aLoBFoI-WzOWqE+{YTElxfcIfHlovv{o!AtE`?5^)Y^m3(gG z-?;`h;k=q-4^cH-gdI=2sZhKw$s46Iu31-4$oG8j~)pealbF}zqB9Y zx4T_oZDk@Tb_A>D2#QV%YM+6-gK-455%e9X#oMt2gIJCsoQ|C&#+7`#isNovjXfB~ zUVIqubp1SsCzg{g+pwK}(JS9$dE0?2=yMrvpu9oCJB&5{J_*!vL{FhAh9SnQGlre7 zL&Z;FE#G+PO6=k&3_O?55TBvQ{W2EN&nVzRC{P=sq3?hqx!AN^LhhxhLN@kC_sOShj-y5c| zoE$oV6(I~A45_34dtOqdkjJ-?!?%;ShsdDYNy|H2+gEc>CBYM*#K*0H7h4HdiZ%v} zu2ioxE$8Mf_oQL?ewdUea@I4uRw~?yTJObmuPyitttxPpmmIZBZB zP@t5Ac;mX^`pEE2#S&j~B?=$8Cy*HTEtj=@$hbzuG0ry$cpMhrBGizjK2OgM-}D*} zC#G5~aukuU=<`DARlk=DJg5ou)f6CAhEUZdQYR+x9$$DLg}aJdBPXybgkmRNb%hEq z=5xYEj=7-V5Nly|-Un(D`+XfY9g_16T2GiHW&rL+?b@3cQaA=X%F^@cB6 z6LXv96USHY#vj=ZMX!|U0}pI-w1^dv6OpiHd2MCDem*?@&XYm5TODQ9|_Vv2)Uar1;tto7RV?S@`G<| z#@+%ErOf!~n=m6?AfuESAH&CeG_K)O0$1DiELsksqU{-w53TnX)B!JbvWTe(#y{tZ z_ENVtK&jS8iGuJ6+(>|>q=%uZDgTpi?DP!<2A6XBrl4*OQ?`U}jnCsFSl)UZZTF$d z<4eu5c`BK@u|UU~!16V|rmp{SIp+gz#M z?Qpst-^~4RyO`9_Ps?e1Cb(?MZB%}Bi;$ec+YbAM_hFRHy?KgNtgn?cO5qkxLip_e E0hHnlj{pDw diff --git a/src/main/java/ic2/api/crops/CropCard.java b/src/main/java/ic2/api/crops/CropCard.java index 7ddff5b..091b9ad 100644 --- a/src/main/java/ic2/api/crops/CropCard.java +++ b/src/main/java/ic2/api/crops/CropCard.java @@ -18,12 +18,18 @@ import cpw.mods.fml.relauncher.SideOnly; * Any crop extending this can be registered using registerCrop to be added into the game. */ public abstract class CropCard { + public CropCard() { + modId = getModId(); // initialize mod id while we should be in the real owner's init event + } + /** * Plant name for identifying this crop within your mod. * * The name has to be unique within the mod and is used for saving. * By default this name will be also used to determine displayKey() and registerSprites(). * + * @note changing name or owner will cause existing crops in users' worlds to disappear. + * * @return Plant name */ public abstract String name(); @@ -33,28 +39,25 @@ public abstract class CropCard { * * It's recommended to hard code this to your mod id. * + * @note changing name or owner will cause existing crops in users' worlds to disappear. + * * @return Mod id. */ public String owner() { - ModContainer modContainer = Loader.instance().activeModContainer(); - - if (modContainer != null) { - return modContainer.getModId(); - } else { - // this is bad if you are not actually IC2 - assert false; - - return "IC2"; - } + return modId; } /** * Translation key for display to the player. * + * It's highly recommended to specify a valid key from your language file here, e.g. add + * "yourmod.crop.yourCropName = Your crop's name" to the language file, override name() to + * return "yourCropName" and override displayName() to return "yourmod.crop."+name(). + * * @return Unlocalized name. */ public String displayName() { - return "ic2.crop."+name(); + return name(); // return the raw name for backwards compatibility } /** @@ -63,7 +66,7 @@ public abstract class CropCard { * @return Your name */ public String discoveredBy() { - return "IC2 Team"; + return "unknown"; } /** @@ -97,7 +100,7 @@ public abstract class CropCard { * @param crop reference to ICropTile * @return roots lengt use in isBlockBelow */ - public int getrootslength(ICropTile crop){ + public int getrootslength(ICropTile crop) { return 1; } @@ -144,13 +147,17 @@ public abstract class CropCard { * Instantiate your Icons here. * * This method will get called by IC2, don't call it yourself. + * + * It's highly recommended to use your own assert domain here, e.g. yourmod:crop/* instead of + * ic2:crop/*, which will then read assets/yourmod/textures/blocks/crop/*.png. */ @SideOnly(Side.CLIENT) public void registerSprites(IIconRegister iconRegister) { textures = new IIcon[maxSize()]; for (int i = 1; i <= textures.length; i++) { - textures[i - 1] = iconRegister.registerIcon("ic2:crop/"+name()+"."+i); + // ic2:crop/blockCrop.NAME.n is the legacy name for backwards compatiblity + textures[i - 1] = iconRegister.registerIcon("ic2:crop/blockCrop."+name()+"."+i); } } @@ -406,6 +413,21 @@ public abstract class CropCard { return Crops.instance.getIdFor(this); } + private static String getModId() { + ModContainer modContainer = Loader.instance().activeModContainer(); + + if (modContainer != null) { + return modContainer.getModId(); + } else { + // this is bad if you are not actually IC2 + assert false; + + return "unknown"; + } + } + @SideOnly(Side.CLIENT) protected IIcon textures[]; + + private final String modId; // TODO: make owner abstract, remove modId auto detection } diff --git a/src/main/java/ic2/api/item/ICustomDamageItem.class b/src/main/java/ic2/api/item/ICustomDamageItem.class new file mode 100644 index 0000000000000000000000000000000000000000..80020b8490b6b3dc9041520697c12ce05bad5070 GIT binary patch literal 386 zcmah_Jx>Bb5PgFu=QnC$X`+?axCt$tqRA!@3la;vaWh^P@0JTU5cz8s{s4cJaUm3N z4b6Nc@4b0%e*eCI0CaJd;v~f>p_7X~&T5^MeJ(i{!p+?vh?>#|aZ~uWo>pz(=RV{QTuU!|BOHw; zv#FD3U&L@%cJt6O)cu&}Ot|*0Yq;|3v`rM@e2Fs!huplpkHu-5KxoBp0!c#HLlOtV T{<^o3uJ!{QMntp`YYWH!kKJ$Z literal 0 HcmV?d00001 diff --git a/src/main/java/ic2/api/item/ICustomDamageItem.java b/src/main/java/ic2/api/item/ICustomDamageItem.java new file mode 100644 index 0000000..4470fa0 --- /dev/null +++ b/src/main/java/ic2/api/item/ICustomDamageItem.java @@ -0,0 +1,56 @@ +package ic2.api.item; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; + +/** + * ICustomDamageItem allows items to have custom damage handling without the massive overhead of + * Item.getDamage() / Item.setDamage(), which turn ItemStack.getItemDamage into virtual calls. + * + * The custom damage value is typically stored in the item stacks nbt data. + * + * If an Item implements ICusomDamageItem, the normal ItemStack damage won't be changed by IC2. + * It's up to the implementer to potentially manipulate it for suitable visual effect on the + * rendered damage bar or to provide a suitable item renderer. + * + * Item.isDamageable() still applies. + * + * @author Player + */ +public interface ICustomDamageItem { + /** + * Retrieve the custom damage value for the supplied item stack. + * + * @param stack ItemStack to be queried. + * @return Custom damage value. + */ + int getCustomDamage(ItemStack stack); + + /** + * Retrieve the maximum custom damage value for the supplied item stack. + * @param stack ItemStack to be queried. + * @return Custom damage value limit. + */ + int getMaxCustomDamage(ItemStack stack); + + /** + * Set the custom damage value for the supplied item stack. + * + * @param stack ItemStack to be manipulated. + * @param damage New damage value. + */ + void setCustomDamage(ItemStack stack, int damage); + + /** + * Increase the custom damage value for the supplied item stack. + * + * It's up to the implementation to not apply any damage, e.g. based on some randomness or + * properties of src. + * + * @param stack ItemStack to be manipulated. + * @param damage Extra damage to be applied. + * @param src Entity damaging the item, may be null. + * @return true if damage was applied. + */ + boolean applyCustomDamage(ItemStack stack, int damage, EntityLivingBase src); +} diff --git a/src/main/java/ic2/api/item/IKineticWindRotor.class b/src/main/java/ic2/api/item/IKineticWindRotor.class index 684dd536e041168aef8c77a97e6365d104d6833e..00f10fc86f1111a2bc90c6e9c78dcbe8f9547b80 100644 GIT binary patch delta 180 zcmdnTG=q79LX4t@PhM(?er{%7YI0FxT8VyUNouaXCy)p(NlebR*7Rg#5KT`l3Cb_Y zFA7S{OGzyXNv$X;ElOo%a3!F3qJxf?Yg$@na%O5?awQ`JLA%@-8H9j#`DW&YXXd2@ RmlUPurI%zt1t-o}1^_23KH>lX delta 66 zcmbQiypL&u0u!^wLqjj10^gnr@5?Lg}d`xtV$4nRzL} RB}J)u=_MIZ!HJ)i0RVW=6zu>2 diff --git a/src/main/java/ic2/api/item/IKineticWindRotor.java b/src/main/java/ic2/api/item/IKineticWindRotor.java index 62f1fdc..de696e3 100644 --- a/src/main/java/ic2/api/item/IKineticWindRotor.java +++ b/src/main/java/ic2/api/item/IKineticWindRotor.java @@ -1,15 +1,16 @@ package ic2.api.item; +import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; public interface IKineticWindRotor { - public int getDiameter(); + int getDiameter(ItemStack stack); - public ResourceLocation getRotorRenderTexture(); + ResourceLocation getRotorRenderTexture(ItemStack stack); - public float getefficiency(); + float getEfficiency(ItemStack stack); - int getminWindStrength(); + int getMinWindStrength(ItemStack stack); - int getmaxWindStrength(); + int getMaxWindStrength(ItemStack stack); } diff --git a/src/main/java/ic2/api/recipe/IMachineRecipeManager.java b/src/main/java/ic2/api/recipe/IMachineRecipeManager.java index 388e394..d2d4382 100644 --- a/src/main/java/ic2/api/recipe/IMachineRecipeManager.java +++ b/src/main/java/ic2/api/recipe/IMachineRecipeManager.java @@ -7,26 +7,26 @@ import net.minecraft.nbt.NBTTagCompound; /** * Recipe manager interface for basic machines. - * + * * @author RichardG, Player */ -public interface IMachineRecipeManager { +public interface IMachineRecipeManager { // TODO: merge with IMachineRecipeManagerExt /** * Adds a recipe to the machine. - * + * * @param input Recipe input * @param metadata meta data for additional recipe properties, may be null * @param outputs Recipe outputs, zero or more depending on the machine - * + * * For the thermal centrifuge @param metadata meta data {"minHeat": 1-xxx} * For the ore washing plant @param metadata meta data {"amount": 1-8000} - * + * */ public void addRecipe(IRecipeInput input, NBTTagCompound metadata, ItemStack... outputs); /** * Gets the recipe output for the given input. - * + * * @param input Recipe input * @param adjustInput modify the input according to the recipe's requirements * @return Recipe output, or null if none @@ -35,10 +35,10 @@ public interface IMachineRecipeManager { /** * Gets a list of recipes. - * + * * You're a mad evil scientist if you ever modify this. - * + * * @return List of recipes */ - public Map getRecipes(); + public Map getRecipes(); // TODO: Change to iterable/collection/list } diff --git a/src/main/java/ic2/api/recipe/IMachineRecipeManagerExt.class b/src/main/java/ic2/api/recipe/IMachineRecipeManagerExt.class new file mode 100644 index 0000000000000000000000000000000000000000..b6f9bac0ef076f74fcbd24b659b145555737404b GIT binary patch literal 309 zcma)2&1%9x5dOwmQ}xmp=uN0z9PpZ3OND?xpq}(J*{pG`*@Unuz4}@n`T#zZxHdPT z(8GKTGvCiJ=ga8_zzE#{PXXEiI)t_)$wDhrXhPhd7&T%k441znj_Orpi^_!)s~u;? zYE{bCv5g(i-c~C~-}9`-{}{&@b%zdL(L&r%Jy0k&&%@#@${uMuH(xoE-xDR zih-{h_?m+5xJyl6Ayd9&U9pNa%Uvwa`<~-29#TkH^+wa>ttu&Kb=$WTcD4zYT;E=_ zJxXc~&t6v85neWZr&cUG%RX;X^Uk7c`AyGOc=WF8iLz_^#k%9#70+7mi;i#CizP1e zzE!z=Xi`F$a9qcqROlIQa~wrDa)zF#8daL!UZ$0qX8nTgowhF2c#m z9cunXhjBh!b}FMqYso2kcEwq;i*v!FBv_pC>|;(vLQe$PJf_fl58owmZiE0)WaM5V zZ4qxk6=>Bhzj9IV+B^JU1V)~w4?-)LC}i&^%veofXU=}E>3DWkAxWhGM1_I-X@wvw z#GHK!-EGv+n`ikA;ni4fUbtjeSOOs!jCp%=*(OGT_H=<|{D9lR+zHZo!ITNqon!vl!+f>Ry_a2#82@v13x$M3;dGt-aQ4LXgam3 z?J0E5wRgvaiC6KOEWhG(xXRz8iKp;6ZjQ+5uTA8TH}D%t<#iKp;7wNh|7nmeO4<0HT>8UR?i-Rcq3rw(LAFkKthc z#H}iueamQ!42h$jR=!h>T8(Y&G+b8bj;330RGo!jFovKFMdPbAx!aS8nk!)~E!i#| z7Va_ZBKfwih)Rb!^)uSGSs1ob>w1g1jrboRKfHyXg@(6i7dh{$oZ3b9piFNjYI)c0 zJ(k-u+w2HNnLa)}d;0A8a%uiFv1^+xEg^nJ_wpOg4+u1LNz?KZ-z9w;JlVQ@#-#Kq zvp?7ukmUXVid-M%$tMw~1YqRy+8Wd!1EI&bri0^7B>0IR<$G@^hL7T7e4_$BPIqiD z8XJp@on#ns-X(MSezk_!-PSVH+8J0I4COYhB_nIp#p4V=7T7%)*{$(iquuV@8sfS9 zO=!9Po6vKGn@F^L^g^dh4<&n%LLWM@i{7$92d!Uw7n>)@9Z)E`?8EJoK!t z({q|uuhX+Jo%=Hqw_#{2(BhN%RV2qXuBkD7|1G2y#uM4ZEp#XjoEh1f3V*}4aU*Mp zXfm6;jl|0OKli+f4mnD#AT1VG(K(jNYT4xP(cPo>q~1VBPpa$1^*5nwZ>_BVA^sKv z&>*CY!sNP#i4GuxhnV0XcSD$91x%6uC&~S@OydeUze>hmAUQ(b0+X0x%7-YKq{J>9 zCdetiO<2A(uf=DRX5&EE|09`*%C(;X+&9rUSxL;Z)^ z3a2m|QV~?FqBWhE=>kbCfF!|dFknejTvH$lU*R*DqZG?ronyd3YQkeVemEZxHdBb` z8sH{kOUr6x>o$_w;T56lU;VE^&);|l+s{&Ihr$}VWnrmR)2)&+4@BF3dt! zzlBT;Ppz!~qwqF%-e7Pck7N9AEx71p#2^<#WFbeS_mhJnF&`zy2Z`v=*Wyh($H zQU$^o-W7N!3=Y6}ADtm%GlOJCe-Ax;C3lYqPvLAiLp^?UxyodDo##SFCG48~JLo>U zhMr9CD*A-NRqV=S!#xr2%Y2B-Ds~g;2g~(`I&7Ogn>ut852~S)Pmp(m%omwvt12o{ zRY*GQ@gk$+zZ$L*>q~sb_#9$j1MhNv@o|HT_BI|W=l_Jk-^on7iGh5J!wk^}ZJ0R6 sqCSs7Sb@86P!2`zy2+4WtTuZiJQ0i~loVp-9qc5QZ6H3)ix@utUy!K*5C8xG literal 2803 zcma)7SyLQU6#g!=^e{9Kh9wJ2R^u>0CSVdZAPHHB!~ql{k+?QPXJ|58nw}Wq5_kOz zzNk-9W#u7OB_O8C^2t>B7kskHKcS_;@AUKx1Hr_HIeqWB=bq&|-?{VagCBna(1$O= zXve6Cu`oI?Ud`2uB3=?P5ym7g)Zk@I)!-st5izadQW!OORm5vyypA_CyeT$sg;5Vf zRx=usVKibqgjxBTA})uJ3Smx`RtWR*y`mwlA)_Iy5U{fOf};>g%p2E?c-qLO;**YT zWmEkMK_inZWO=Ga6#N;}F%%jr3`eq#nKEs$9I&#MGpNuUtvL4_bx!g2>D;WTP@k}} z=2#&!W7-#tnKU(#L@sHhrwrSYy{Gg$bJl{w{)Cn6iyL_>ZktIfZ^kFw&xoWvZkuPU zq$9E25_%O{wun6!Eg(~ZSLQ^qx!Licf&NiH!ps6hsX6DT#fiKp^ z6t-1ZCaeXiyJaJCi}@0Ihd0>{JUW*_`l@vc88z~512p6`XhjWc`WcnJIMpl zxE)|tk!a_pSo9TG5K!3ioGsw_Y?FmlPg<$0;S_APyzik~|0BbYlPl7RsFm(-WNUab zSFn@juqCwG{xDSz3Bz?9#32!fMO@Xf2YYqw!+sqH@Pr0i#{wJzpre3mL_x>fxUORn zHx$|)#R47g;9VW>VMxRKI&NZ!!{QE=+ukADHWsCGIzGUV1piRSNBEejZl1hT1uH#k z+6r|Ol~f-iVSO5 z$I*K=B)hCLWuyx{_AgjBWa5#zq4XofCyb0=tYBZyc zIX7av8!uM8Uyj#Qj@RVHqjz~fn3qB?|KMGC)DA`t((8Qe4*Wkr8|_|2NMWpJ71at~ zVv>un!q2EV?%(NOhJGKxrL{k39lVbk(bO&>EZb$&9Sd~P!ZrIAEnL?&2fjv4bD-ho z+BXRJZ!N8T=exydezybrhy~C}*-k_{i1Ka>6Z0f@CNrI56QwhQ%y5`zPf;J>?-Xl0 zLLc>*#!(z|k)AJCK98q)N}^*1&)`|scbq=-vZkM!0ctv+{eyZ9&uJL^8yy->)D0^x z)Spm)(MI7UhKeW=LE!<|kvj-T0YwT0U1hhMqy(UWmxf}Jr)eb&{GAC(@l2W z-GbW@hV3OE&$wu{Gno=v=e#sS9FMcah%Xf_hs$WmEELcB%V#CrBJe#xyNjDZcR;W@ z$7oe}p0<4KDW&YMs1Zn#MXq$+L*w)cnj+21Xb~8fu|2Y*xF(BQB0DLTvFrBZ>{^R= o$hWrg9ft9_l&W*d@Epf*kWD*T(V3)Ivb3HfART>y%PJ)P1^f(V?EnA( diff --git a/src/main/java/ic2/api/recipe/RecipeInputOreDict.java b/src/main/java/ic2/api/recipe/RecipeInputOreDict.java index 89f73dc..e6e4695 100644 --- a/src/main/java/ic2/api/recipe/RecipeInputOreDict.java +++ b/src/main/java/ic2/api/recipe/RecipeInputOreDict.java @@ -1,8 +1,10 @@ package ic2.api.recipe; import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -24,14 +26,19 @@ public class RecipeInputOreDict implements IRecipeInput { @Override public boolean matches(ItemStack subject) { - List inputs = OreDictionary.getOres(input); + List inputs = getOres(); + boolean useOreStackMeta = (meta == null); + Item subjectItem = subject.getItem(); + int subjectMeta = subject.getItemDamage(); - for (ItemStack input1 : inputs) { - if (input1.getItem() == null) continue; // ignore invalid - int metaRequired = meta == null ? input1.getItemDamage() : meta; + for (ItemStack oreStack : inputs) { + Item oreItem = oreStack.getItem(); + if (oreItem == null) continue; // ignore invalid - if (subject.getItem() == input1.getItem() && - (subject.getItemDamage() == metaRequired || metaRequired == OreDictionary.WILDCARD_VALUE)) { + int metaRequired = useOreStackMeta ? oreStack.getItemDamage() : meta; + + if (subjectItem == oreItem && + (subjectMeta == metaRequired || metaRequired == OreDictionary.WILDCARD_VALUE)) { return true; } } @@ -46,14 +53,27 @@ public class RecipeInputOreDict implements IRecipeInput { @Override public List getInputs() { - List ores = OreDictionary.getOres(input); + List ores = getOres(); + + // check if we have to filter the list first + boolean hasInvalidEntries = false; + + for (ItemStack stack : ores) { + if (stack.getItem() == null) { + hasInvalidEntries = true; + break; + } + } + + if (!hasInvalidEntries) return ores; + List ret = new ArrayList(ores.size()); for (ItemStack stack : ores) { if (stack.getItem() != null) ret.add(stack); // ignore invalid } - return ret; + return Collections.unmodifiableList(ret); } @Override @@ -65,7 +85,20 @@ public class RecipeInputOreDict implements IRecipeInput { } } + private List getOres() { + if (ores != null) return ores; + + // cache the ore list by making use of the fact that forge always uses the same list, + // unless it's EMPTY_LIST, which should never happen. + List ret = OreDictionary.getOres(input); + + if (ret != OreDictionary.EMPTY_LIST) ores = ret; + + return ret; + } + public final String input; public final int amount; public final Integer meta; + private List ores; } diff --git a/src/main/java/ic2/api/recipe/RecipeOutput.class b/src/main/java/ic2/api/recipe/RecipeOutput.class index 48a57872c7d28876dc3921b2d81ce502d6c793c1..0dad69cfc545470a67433fd9edb423d9d9ddcc4e 100644 GIT binary patch literal 2596 zcmb7FTT>KQ5dO~I28KakL4=^u5RD70uA-Pk2nq<%xIzMGqUPdZcZ9)ZcAc3uY7(pR z>Py~|!jzS~`Qk%vqQPAT=Ijw!sYQ+h|kw6dAeF^khmI@5r6@t%5|)o@NnGtO&x zUq>9r>+pekf2bZG)!{-Nq!QTyh1P(~I(oOcgyVmr7f%Hz-g)W6j&r zD>^jWw`O}NZJS6(x0oj~P#9E)5RTy>7|$WLA1opnHwAJ?Et+M`vf{ z{8)aekT2R<+PChMu4_7;mABnvmMiCSW>!F)6Nn92w&e{A3?w!Vv?kHPo-+cGv3!_5akzowmQP*h>I zZ(zgP&C5lZW5YHlg5Kw(J)fGITQoD?V2^^&Rh$?RcyayX%9f)7Vaua^TMd@vmLt8q zL!xk#CLt$JF+aDcQ1rQ5d#=F2e{tThaT*p#TrWT4IhIXu+7dlAu>-B5_E08QqGULs zx}?wKi%!OzuoS6UYKgK}rDk9!#tn4iWkPPi!XbfjpjnEt{(`0tyK1Sbg;K!!NMO_o`ezgtV$CBhM@{ zdE1kgt*)!;{)pqqYgEOgt1d2qU5WEGpp}VOLxVCm3hA47#6B z`FO&vEl79Lyvif!Lt;m4f3cb*rSn*VbWA!2H=;YPhD6}V+NtERwHN356XH*kEEG(e zH{+h#aVt^tdA61yWcI7zmoNv9cKC9U`NB_E*fKI&CoAwMsj zZ=ehhC@MQvB0%P|J!}PL0`sKeUG7^>ir4YLo^5^%fh$# zjLO*W(5Z?&L5o^F!9uW-YNf;#7|WOm+#3ZZ1Aj_~BYPfVlVFbzbVf>24^>S9kI{TM zs+1);)*0=LJwVGcqT#!Do;{7+4c}#g0SNtUBGAEY{%CuSpjsM9yjRsDqbUuH|hI2r5JrDa2SJZ?gc)F_*d|Lfj0=GYU}Mv8*gJ6 zN7yt4WIOi)&!ZL3qx4jeZb9r%g=VVpFLY}d;cp=H2OWjFvx2T;+D8FMJVKm=YmK+9 zV6$r53fkja0-4Qhk9SaBLFac29H1Rz1du1HsDMw2Qi^prhVfGT0pE)JYK6Xn7j8j| c+(9J#BSKZ)1d((<=_o>tM^%aw{y}g41CVBF!2kdN delta 666 zcmYk4O-~b16o#KWGwq$;-a?rcDAo$7*n;>`EQ*MT3MzggqES~GRxZSiD>sH8;6iWW z!i^gfw-QWEF!2Yd8~=_m>bX0j9WPDAUT3FrDW( zCp0sLsKcD}^sM0&b4Ji<&Ah?TiaF!$f42nVV0xIH*HWVv=WzJe(9%DG$xgSWP{ieYfudMKU2NS&|B zQTk8UbahQv*D%H*$yWZRI$c;zeQ12f-1|g6v26+yAJJ`klHLx^dR!FTrtgDj1+p7t zQR`v`Q_;>EjenvsN9AJEF_{+YpQJ?6rt}6Ky(bE{3ATjowi296*Uu0X7UX-%Z|K9v F{sKfuNACat diff --git a/src/main/java/ic2/api/recipe/RecipeOutput.java b/src/main/java/ic2/api/recipe/RecipeOutput.java index 867cfa2..34c7fe9 100644 --- a/src/main/java/ic2/api/recipe/RecipeOutput.java +++ b/src/main/java/ic2/api/recipe/RecipeOutput.java @@ -1,6 +1,7 @@ package ic2.api.recipe; import java.util.Arrays; +import java.util.Iterator; import java.util.List; import net.minecraft.item.ItemStack; @@ -18,6 +19,31 @@ public final class RecipeOutput { this(metadata1, Arrays.asList(items1)); } + @Override + public boolean equals(Object obj) { + if (obj instanceof RecipeOutput) { + RecipeOutput ro = (RecipeOutput) obj; + + if (items.size() == ro.items.size() && + (metadata == null && ro.metadata == null || metadata != null && ro.metadata != null) && + metadata.equals(ro.metadata)) { + Iterator itA = items.iterator(); + Iterator itB = ro.items.iterator(); + + while (itA.hasNext() && itB.hasNext()) { + ItemStack stackA = itA.next(); + ItemStack stackB = itB.next(); + + if (ItemStack.areItemStacksEqual(stackA, stackB)) return false; + } + + return true; + } + } + + return false; + } + @Override public String toString() { return "ROutput<"+items+","+metadata+">"; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/IC2Research.java b/src/main/java/tombenpotter/emt/EMTResearch.java similarity index 61% rename from src/main/java/tombenpotter/emt/common/modules/ic2/IC2Research.java rename to src/main/java/tombenpotter/emt/EMTResearch.java index 470b9a9..ca3a5f6 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/IC2Research.java +++ b/src/main/java/tombenpotter/emt/EMTResearch.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2; +package tombenpotter.emt; import ic2.api.item.IC2Items; import net.minecraft.item.ItemStack; @@ -19,17 +19,16 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; -import tombenpotter.emt.common.modules.base.blocks.BaseBlockRegistry; -import tombenpotter.emt.common.modules.base.items.BaseItemRegistry; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; +import tombenpotter.emt.common.RecipeRegistry; +import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.items.ItemRegistry; import tombenpotter.emt.common.util.ConfigHandler; import tombenpotter.emt.common.util.EMTResearchItem; import tombenpotter.emt.common.util.ResearchAspects; -public class IC2Research { +public class EMTResearch { - public static void addResearchTab() { + public static void addResearchTab(){ ResourceLocation background = new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png"); ResearchCategories.registerCategory("EMT", new ResourceLocation("electromagictools:textures/misc/emt.png"), background); } @@ -45,57 +44,57 @@ public class IC2Research { research.setPages(new ResearchPage(text)); text = "1"; - research = new EMTResearchItem("Diamond Chainsaw", "EMT", new AspectList(), 5, -6, 0, new ItemStack(IC2ItemRegistry.diamondChainsaw)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.diamondChainsaw)); + research = new EMTResearchItem("Diamond Chainsaw", "EMT", new AspectList(), 5, -6, 0, new ItemStack(ItemRegistry.diamondChainsaw)).setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.diamondChainsaw)); text = "1"; - research = new EMTResearchItem("Thaumium Plate", "EMT", new AspectList(), 6, -6, 0, new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thaumiumPlate)); + research = new EMTResearchItem("Thaumium Plate", "EMT", new AspectList(), 6, -6, 0, new ItemStack(ItemRegistry.itemEMTItems, 1, 5)).setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thaumiumPlate)); text = "1"; research = new EMTResearchItem("Macerating Native Ore Clusters", "EMT", new AspectList(), 5, -7, 0, IC2Items.getItem("smallGoldDust")).setRound().setAutoUnlock().registerResearchItem(); research.setPages(new ResearchPage(text)); text = "1"; - research = new EMTResearchItem("The Legend", "EMT", new AspectList(), 5, -5, 0, new ItemStack(IC2ItemRegistry.taintedThorHammer)).setRound().setAutoUnlock().registerResearchItem(); + research = new EMTResearchItem("The Legend", "EMT", new AspectList(), 5, -5, 0, new ItemStack(ItemRegistry.taintedThorHammer)).setRound().setAutoUnlock().registerResearchItem(); research.setPages(new ResearchPage(text)); text = "1"; - research = new EMTResearchItem("Lightning Summoner", "EMT", new AspectList(), 6, -5, 0, new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 6)).setRound().setAutoUnlock().registerResearchItem(); + research = new EMTResearchItem("Lightning Summoner", "EMT", new AspectList(), 6, -5, 0, new ItemStack(ItemRegistry.itemEMTItems, 1, 6)).setRound().setAutoUnlock().registerResearchItem(); research.setPages(new ResearchPage(text)); text = "1"; - research = new EMTResearchItem("The One Ring", "EMT", new AspectList(), 6, -7, 0, new ItemStack(BaseItemRegistry.baseBaubles)).setRound().setAutoUnlock().registerResearchItem(); + research = new EMTResearchItem("The One Ring", "EMT", new AspectList(), 6, -7, 0, new ItemStack(ItemRegistry.baseBaubles)).setRound().setAutoUnlock().registerResearchItem(); research.setPages(new ResearchPage(text)); text = "1"; - research = new EMTResearchItem("Feather Wings", "EMT", new AspectList(), 0, 2, 0, new ItemStack(IC2ItemRegistry.featherWing)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.rubberBall), new ResearchPage(IC2RecipeRegistry.ductTape), new ResearchPage(IC2RecipeRegistry.featherMesh), new ResearchPage(IC2RecipeRegistry.cardboard), new ResearchPage(IC2RecipeRegistry.featherWing), new ResearchPage(IC2RecipeRegistry.featherWings)); + research = new EMTResearchItem("Feather Wings", "EMT", new AspectList(), 0, 2, 0, new ItemStack(ItemRegistry.featherWing)).setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.rubberBall), new ResearchPage(RecipeRegistry.ductTape), new ResearchPage(RecipeRegistry.featherMesh), new ResearchPage(RecipeRegistry.cardboard), new ResearchPage(RecipeRegistry.featherWing), new ResearchPage(RecipeRegistry.featherWings)); /** Research that can be disabled **/ if (ConfigHandler.thaumiumDrillResearch == false) { text = "1"; - research = new EMTResearchItem("Thaumium Drill", "EMT", ResearchAspects.thaumiumDrillResearch, -1, -2, 1, new ItemStack(IC2ItemRegistry.thaumiumDrill)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thaumiumDrill)); + research = new EMTResearchItem("Thaumium Drill", "EMT", ResearchAspects.thaumiumDrillResearch, -1, -2, 1, new ItemStack(ItemRegistry.thaumiumDrill)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thaumiumDrill)); } if (ConfigHandler.thaumiumChainsawResearch == false) { text = "1"; - research = new EMTResearchItem("Thaumium Chainsaw", "EMT", ResearchAspects.thaumiumChainsawResearch, -2, -2, 1, new ItemStack(IC2ItemRegistry.thaumiumChainsaw)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thaumiumChainsaw)); + research = new EMTResearchItem("Thaumium Chainsaw", "EMT", ResearchAspects.thaumiumChainsawResearch, -2, -2, 1, new ItemStack(ItemRegistry.thaumiumChainsaw)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thaumiumChainsaw)); } if (ConfigHandler.electricGooglesResearch == false) { text = "1"; - research = new EMTResearchItem("Electric Goggles", "EMT", ResearchAspects.electricGogglesResearch, 1, -2, 1, new ItemStack(IC2ItemRegistry.electricGoggles)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.electricGoggles)); + research = new EMTResearchItem("Electric Goggles", "EMT", ResearchAspects.electricGogglesResearch, 1, -2, 1, new ItemStack(ItemRegistry.electricGoggles)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.electricGoggles)); } if (ConfigHandler.electricGooglesResearch == false) { if (ConfigHandler.nanoGooglesResearch == false) { text = "1"; - research = new EMTResearchItem("Nanosuit Goggles of Revealing", "EMT", ResearchAspects.thaumicNanoHelmet, 2, -2, 2, new ItemStack(IC2ItemRegistry.nanoThaumicHelmet)).setParents("Electric Goggles").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thaumicNanoHelmet)); + research = new EMTResearchItem("Nanosuit Goggles of Revealing", "EMT", ResearchAspects.thaumicNanoHelmet, 2, -2, 2, new ItemStack(ItemRegistry.nanoThaumicHelmet)).setParents("Electric Goggles").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thaumicNanoHelmet)); } } @@ -103,167 +102,167 @@ public class IC2Research { if (ConfigHandler.nanoGooglesResearch == false) { if (ConfigHandler.quantumGooglesResearch == false) { text = "1"; - research = new EMTResearchItem("Quantum Goggles of Revealing", "EMT", ResearchAspects.thaumicQuantumHelmet, 3, -2, 3, new ItemStack(IC2ItemRegistry.quantumThaumicHelmet)).setParents("Nanosuit Goggles of Revealing").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thaumicQuantumHelmet)); + research = new EMTResearchItem("Quantum Goggles of Revealing", "EMT", ResearchAspects.thaumicQuantumHelmet, 3, -2, 3, new ItemStack(ItemRegistry.quantumThaumicHelmet)).setParents("Nanosuit Goggles of Revealing").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thaumicQuantumHelmet)); } } } if (ConfigHandler.ironOmnitoolResearch == false) { text = "1"; - research = new EMTResearchItem("Iron Omnitool", "EMT", new AspectList(), -2, 0, 0, new ItemStack(IC2ItemRegistry.ironOmnitool)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.ironOmnitool)); + research = new EMTResearchItem("Iron Omnitool", "EMT", new AspectList(), -2, 0, 0, new ItemStack(ItemRegistry.ironOmnitool)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.ironOmnitool)); } if (ConfigHandler.ironOmnitoolResearch == false) { if (ConfigHandler.diamondOmnitoolResearch == false) { text = "1"; - research = new EMTResearchItem("Diamond Omnitool", "EMT", ResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(IC2ItemRegistry.diamondOmnitool)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.diamondOmnitool), new ResearchPage(IC2RecipeRegistry.ironOmnitoolToDiamond)); + research = new EMTResearchItem("Diamond Omnitool", "EMT", ResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(ItemRegistry.diamondOmnitool)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.diamondOmnitool), new ResearchPage(RecipeRegistry.ironOmnitoolToDiamond)); } } if (ConfigHandler.thaumiumDrillResearch == false && ConfigHandler.thaumiumChainsawResearch == false) { if (ConfigHandler.thaumiumOmnitoolResearch == false) { text = "1"; - research = new EMTResearchItem("Thaumium Omnitool", "EMT", ResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(IC2ItemRegistry.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thaumiumOmnitool), new ResearchPage(IC2RecipeRegistry.diamondOmnitoolToThaumium)); + research = new EMTResearchItem("Thaumium Omnitool", "EMT", ResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(ItemRegistry.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thaumiumOmnitool), new ResearchPage(RecipeRegistry.diamondOmnitoolToThaumium)); } } if (ConfigHandler.explosionFocusResearch == false) { text = "1"; - research = new EMTResearchItem("Explosion Focus", "EMT", ResearchAspects.laserFocusResearch, 2, 3, 2, new ItemStack(IC2ItemRegistry.explosionFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.explosionFocus)); + research = new EMTResearchItem("Explosion Focus", "EMT", ResearchAspects.laserFocusResearch, 2, 3, 2, new ItemStack(ItemRegistry.explosionFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.explosionFocus)); } if (ConfigHandler.christmasFocusResearch == false) { text = "1"; - research = new EMTResearchItem("Kris-tmas Focus", "EMT", ResearchAspects.christmasFocusResearch, 3, 3, 1, new ItemStack(IC2ItemRegistry.christmasFocus)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.christmasFocus)); + research = new EMTResearchItem("Kris-tmas Focus", "EMT", ResearchAspects.christmasFocusResearch, 3, 3, 1, new ItemStack(ItemRegistry.christmasFocus)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.christmasFocus)); } if (ConfigHandler.shieldFocusResearch == false) { text = "1"; - research = new EMTResearchItem("Shield Focus", "EMT", ResearchAspects.shieldFocusResearch, 4, 3, 2, new ItemStack(IC2ItemRegistry.shieldFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.shieldFocus)); + research = new EMTResearchItem("Shield Focus", "EMT", ResearchAspects.shieldFocusResearch, 4, 3, 2, new ItemStack(ItemRegistry.shieldFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.shieldFocus)); } if (ConfigHandler.shieldFocusResearch == false) { if (ConfigHandler.shieldBlockResearch == false) { text = "1"; - research = new EMTResearchItem("Shield Block", "EMT", ResearchAspects.shieldBlockResearch, 4, 5, 1, new ItemStack(IC2BlockRegistry.shield)).setSecondary().setParents("Shield Focus").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.shieldBlock)); + research = new EMTResearchItem("Shield Block", "EMT", ResearchAspects.shieldBlockResearch, 4, 5, 1, new ItemStack(BlockRegistry.shield)).setSecondary().setParents("Shield Focus").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.shieldBlock)); } } if (ConfigHandler.potentiaGeneratorResearch == false) { text = "1"; - research = new EMTResearchItem("Potentia Generator", "EMT", ResearchAspects.potentiaGeneratorResearch, -2, 3, 3, new ItemStack(IC2BlockRegistry.essentiaGens, 1, 0)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.potentiaGenerator)); + research = new EMTResearchItem("Potentia Generator", "EMT", ResearchAspects.potentiaGeneratorResearch, -2, 3, 3, new ItemStack(BlockRegistry.essentiaGens, 1, 0)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.potentiaGenerator)); } if (ConfigHandler.potentiaGeneratorResearch == false) { if (ConfigHandler.ignisGeneratorResearch == false) { text = "1"; - research = new EMTResearchItem("Ignis Generator", "EMT", ResearchAspects.ignisGeneratorResearch, -3, 4, 1, new ItemStack(IC2BlockRegistry.essentiaGens, 1, 1)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.ignisGenerator)); + research = new EMTResearchItem("Ignis Generator", "EMT", ResearchAspects.ignisGeneratorResearch, -3, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 1)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.ignisGenerator)); } } if (ConfigHandler.potentiaGeneratorResearch == false) { if (ConfigHandler.auramGeneratorResearch == false) { text = "1"; - research = new EMTResearchItem("Auram Generator", "EMT", ResearchAspects.auramGeneratorResearch, -1, 4, 1, new ItemStack(IC2BlockRegistry.essentiaGens, 1, 2)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.auramGenerator)); + research = new EMTResearchItem("Auram Generator", "EMT", ResearchAspects.auramGeneratorResearch, -1, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 2)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.auramGenerator)); } } if (ConfigHandler.potentiaGeneratorResearch == false) { if (ConfigHandler.arborGeneratorResearch == false) { text = "1"; - research = new EMTResearchItem("Arbor Generator", "EMT", ResearchAspects.arborGeneratorResearch, -2, 5, 1, new ItemStack(IC2BlockRegistry.essentiaGens, 1, 3)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.arborGenerator)); + research = new EMTResearchItem("Arbor Generator", "EMT", ResearchAspects.arborGeneratorResearch, -2, 5, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 3)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.arborGenerator)); } } if (ConfigHandler.potentiaGeneratorResearch == false) { if (ConfigHandler.aerGeneratorResearch == false) { text = "1"; - research = new EMTResearchItem("Aer Generator", "EMT", ResearchAspects.aerGenerator, -2, 6, 1, new ItemStack(IC2BlockRegistry.essentiaGens, 1, 4)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.aerGenerator)); + research = new EMTResearchItem("Aer Generator", "EMT", ResearchAspects.aerGenerator, -2, 6, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 4)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.aerGenerator)); } } if (ConfigHandler.potentiaGeneratorResearch == false) { if (ConfigHandler.wandChargingSationResearch == false) { text = "1"; - research = new EMTResearchItem("Industrial Wand Charging Station", "EMT", ResearchAspects.wandCharger, -4, 2, 3, new ItemStack(IC2BlockRegistry.emtMachines, 1, 0)).setParents("Potentia Generator").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.wandRecharger)); + research = new EMTResearchItem("Industrial Wand Charging Station", "EMT", ResearchAspects.wandCharger, -4, 2, 3, new ItemStack(BlockRegistry.emtMachines, 1, 0)).setParents("Potentia Generator").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.wandRecharger)); } } if (ConfigHandler.thaumiumChainsawResearch == false) { if (ConfigHandler.streamChainsawResearch == false) { text = "1"; - research = new EMTResearchItem("Chainsaw of the Stream", "EMT", ResearchAspects.streamChainsawResearch, -3, -4, 3, new ItemStack(IC2ItemRegistry.streamChainsaw)).setParents("Thaumium Chainsaw").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.streamChainsaw)); + research = new EMTResearchItem("Chainsaw of the Stream", "EMT", ResearchAspects.streamChainsawResearch, -3, -4, 3, new ItemStack(ItemRegistry.streamChainsaw)).setParents("Thaumium Chainsaw").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.streamChainsaw)); } } if (ConfigHandler.thaumiumDrillResearch == false) { if (ConfigHandler.rockbreakerDrillResearch == false) { text = "1"; - research = new EMTResearchItem("Drill of the Rockbreaker", "EMT", ResearchAspects.rockbreakerDrillResearch, 0, -4, 3, new ItemStack(IC2ItemRegistry.rockbreakerDrill)).setParents("Thaumium Drill").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.rockbreakerDrill)); + research = new EMTResearchItem("Drill of the Rockbreaker", "EMT", ResearchAspects.rockbreakerDrillResearch, 0, -4, 3, new ItemStack(ItemRegistry.rockbreakerDrill)).setParents("Thaumium Drill").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.rockbreakerDrill)); } } if (ConfigHandler.tinyUraniumResearch == false) { text = "1"; research = new EMTResearchItem("Tiny Uranium", "EMT", ResearchAspects.tinyUraniumResearch, -5, -5, 1, IC2Items.getItem("Uran238")).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.tinyUranium)); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.tinyUranium)); } if (ConfigHandler.thorHammerResearch == false) { text = "1"; - research = new EMTResearchItem("Mjolnir", "EMT", ResearchAspects.thorHammerResearch, -5, 5, 3, new ItemStack(IC2ItemRegistry.thorHammer)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thorHammer)); + research = new EMTResearchItem("Mjolnir", "EMT", ResearchAspects.thorHammerResearch, -5, 5, 3, new ItemStack(ItemRegistry.thorHammer)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thorHammer)); } if (ConfigHandler.thorHammerResearch == false) { if (ConfigHandler.superchargedThorHammerResearch == false) { text = "1"; - research = new EMTResearchItem("Supercharged Mjolnir", "EMT", ResearchAspects.superchargedThorHammerResearch, -6, 6, 3, new ItemStack(IC2ItemRegistry.electricThorHammer)).setParents("Mjolnir").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.superchargedThorHammer)); + research = new EMTResearchItem("Supercharged Mjolnir", "EMT", ResearchAspects.superchargedThorHammerResearch, -6, 6, 3, new ItemStack(ItemRegistry.electricThorHammer)).setParents("Mjolnir").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.superchargedThorHammer)); } } if (ConfigHandler.compressedSolarsResearch == false) { text = "1"; - research = new EMTResearchItem("Compressed Solars", "EMT", ResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(IC2BlockRegistry.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.compressedSolar), new ResearchPage(IC2RecipeRegistry.doubleCompressedSolar), new ResearchPage(IC2RecipeRegistry.tripleCompressedSolar)); + research = new EMTResearchItem("Compressed Solars", "EMT", ResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(BlockRegistry.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.compressedSolar), new ResearchPage(RecipeRegistry.doubleCompressedSolar), new ResearchPage(RecipeRegistry.tripleCompressedSolar)); } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.solarHelmetResearch == false) { text = "1"; - research = new EMTResearchItem("Solar Helmet of Revealing", "EMT", ResearchAspects.solarHelmetRevealing, -2, -5, 1, new ItemStack(IC2ItemRegistry.solarHelmetRevealing)).setSecondary().setParents("Compressed Solars").setParentsHidden("Quantum Goggles of Revealing").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.solarHelmetRevealing)); + research = new EMTResearchItem("Solar Helmet of Revealing", "EMT", ResearchAspects.solarHelmetRevealing, -2, -5, 1, new ItemStack(ItemRegistry.solarHelmetRevealing)).setSecondary().setParents("Compressed Solars").setParentsHidden("Quantum Goggles of Revealing").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.solarHelmetRevealing)); } } if (ConfigHandler.electricBootsResearch == false) { text = "1"; - research = new EMTResearchItem("Electric Boots of the Traveller", "EMT", ResearchAspects.electricBootsTravel, 2, 0, 1, new ItemStack(IC2ItemRegistry.electricBootsTraveller)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.electricBootsTravel)); + research = new EMTResearchItem("Electric Boots of the Traveller", "EMT", ResearchAspects.electricBootsTravel, 2, 0, 1, new ItemStack(ItemRegistry.electricBootsTraveller)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.electricBootsTravel)); } if (ConfigHandler.electricBootsResearch == false) { if (ConfigHandler.nanoBootsResearch == false) { text = "1"; - research = new EMTResearchItem("Nano Boots of the Traveller", "EMT", ResearchAspects.nanoBootsTravel, 4, 0, 2, new ItemStack(IC2ItemRegistry.nanoBootsTraveller)).setParents("Electric Boots of the Traveller").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.nanoBootsTravel)); + research = new EMTResearchItem("Nano Boots of the Traveller", "EMT", ResearchAspects.nanoBootsTravel, 4, 0, 2, new ItemStack(ItemRegistry.nanoBootsTraveller)).setParents("Electric Boots of the Traveller").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.nanoBootsTravel)); } } @@ -271,130 +270,130 @@ public class IC2Research { if (ConfigHandler.nanoBootsResearch == false) { if (ConfigHandler.quantumBootsResearch == false) { text = "1"; - research = new EMTResearchItem("Quantum Boots of the Traveller", "EMT", ResearchAspects.quantumBootsTravel, 6, 0, 3, new ItemStack(IC2ItemRegistry.quantumBootsTraveller)).setParents("Nano Boots of the Traveller").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.quantumBootsTravel)); + research = new EMTResearchItem("Quantum Boots of the Traveller", "EMT", ResearchAspects.quantumBootsTravel, 6, 0, 3, new ItemStack(ItemRegistry.quantumBootsTraveller)).setParents("Nano Boots of the Traveller").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.quantumBootsTravel)); } } } if (ConfigHandler.electricScribingToolsResearch == false) { text = "1"; - research = new EMTResearchItem("Electric Scribing Tools", "EMT", ResearchAspects.electricScribingTools, -6, -5, 1, new ItemStack(IC2ItemRegistry.electricScribingTools)).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.electricScribingTools)); + research = new EMTResearchItem("Electric Scribing Tools", "EMT", ResearchAspects.electricScribingTools, -6, -5, 1, new ItemStack(ItemRegistry.electricScribingTools)).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.electricScribingTools)); } if (ConfigHandler.etherealProcessorResearch == false) { text = "1"; - research = new EMTResearchItem("Etheral Processor", "EMT", ResearchAspects.etherealProcessor, -1, 2, 2, new ItemStack(IC2BlockRegistry.emtMachines, 1, 1)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.etheralProcessor)); + research = new EMTResearchItem("Etheral Processor", "EMT", ResearchAspects.etherealProcessor, -1, 2, 2, new ItemStack(BlockRegistry.emtMachines, 1, 1)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.etheralProcessor)); } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.waterSolarsResearch == false) { text = "1"; - research = new EMTResearchItem("Water Infused Solar Panels", "EMT", ResearchAspects.waterSolars, -7, -7, 1, new ItemStack(IC2BlockRegistry.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.waterSolar), new ResearchPage(IC2RecipeRegistry.doubleWaterSolar), new ResearchPage(IC2RecipeRegistry.tripleWaterSolar)); + research = new EMTResearchItem("Water Infused Solar Panels", "EMT", ResearchAspects.waterSolars, -7, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.waterSolar), new ResearchPage(RecipeRegistry.doubleWaterSolar), new ResearchPage(RecipeRegistry.tripleWaterSolar)); } } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.darkSolarsResearch == false) { text = "1"; - research = new EMTResearchItem("Entropy Infused Solar Panels", "EMT", ResearchAspects.darkSolars, -8, -6, 1, new ItemStack(IC2BlockRegistry.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.darkSolar), new ResearchPage(IC2RecipeRegistry.doubleDarkSolar), new ResearchPage(IC2RecipeRegistry.tripleDarkSolar)); + research = new EMTResearchItem("Entropy Infused Solar Panels", "EMT", ResearchAspects.darkSolars, -8, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.darkSolar), new ResearchPage(RecipeRegistry.doubleDarkSolar), new ResearchPage(RecipeRegistry.tripleDarkSolar)); } } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.orderSolarsResearch == false) { text = "1"; - research = new EMTResearchItem("Order Infused Solar Panels", "EMT", ResearchAspects.orderSolars, -6, -8, 1, new ItemStack(IC2BlockRegistry.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.orderSolar), new ResearchPage(IC2RecipeRegistry.doubleOrderSolar), new ResearchPage(IC2RecipeRegistry.tripleOrderSolar)); + research = new EMTResearchItem("Order Infused Solar Panels", "EMT", ResearchAspects.orderSolars, -6, -8, 1, new ItemStack(BlockRegistry.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.orderSolar), new ResearchPage(RecipeRegistry.doubleOrderSolar), new ResearchPage(RecipeRegistry.tripleOrderSolar)); } } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.fireSolarsResearch == false) { text = "1"; - research = new EMTResearchItem("Fire Infused Solar Panels", "EMT", ResearchAspects.fireSolars, -5, -7, 1, new ItemStack(IC2BlockRegistry.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.fireSolar), new ResearchPage(IC2RecipeRegistry.doubleFireSolar), new ResearchPage(IC2RecipeRegistry.tripleFireSolar)); + research = new EMTResearchItem("Fire Infused Solar Panels", "EMT", ResearchAspects.fireSolars, -5, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.fireSolar), new ResearchPage(RecipeRegistry.doubleFireSolar), new ResearchPage(RecipeRegistry.tripleFireSolar)); } } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.airSolarsResearch == false) { text = "1"; - research = new EMTResearchItem("Air Infused Solar Panels", "EMT", ResearchAspects.airSolars, -4, -6, 1, new ItemStack(IC2BlockRegistry.emtSolars, 1, 15)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.airSolar), new ResearchPage(IC2RecipeRegistry.doubleAirSolar), new ResearchPage(IC2RecipeRegistry.tripleAirSolar)); + research = new EMTResearchItem("Air Infused Solar Panels", "EMT", ResearchAspects.airSolars, -4, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 15)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.airSolar), new ResearchPage(RecipeRegistry.doubleAirSolar), new ResearchPage(RecipeRegistry.tripleAirSolar)); } } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.earthSolarsResearch == false) { text = "1"; - research = new EMTResearchItem("Earth Infused Solar Panels", "EMT", ResearchAspects.earthSolars, -6, -7, 1, new ItemStack(IC2BlockRegistry.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.earthSolar), new ResearchPage(IC2RecipeRegistry.doubleEarthSolar), new ResearchPage(IC2RecipeRegistry.tripleEarthSolar)); + research = new EMTResearchItem("Earth Infused Solar Panels", "EMT", ResearchAspects.earthSolars, -6, -7, 1, new ItemStack(BlockRegistry.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.earthSolar), new ResearchPage(RecipeRegistry.doubleEarthSolar), new ResearchPage(RecipeRegistry.tripleEarthSolar)); } } if (ConfigHandler.uuMInfusionResearch == false) { text = "1"; - research = new EMTResearchItem("UU-Matter Infusion", "EMT", ResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 16)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.charcoalToCoal), new ResearchPage(IC2RecipeRegistry.glowstoneDustToBlock), new ResearchPage(IC2RecipeRegistry.stoneBricksToIronOre), new ResearchPage(IC2RecipeRegistry.arcaneStoneToCopperOre), new ResearchPage(IC2RecipeRegistry.arcaneStoneBricksToTinOre), new ResearchPage(IC2RecipeRegistry.amberBlockToLeadOre), new ResearchPage(IC2RecipeRegistry.amberBricksToUraniumOre), new ResearchPage(IC2RecipeRegistry.shardToResin), new ResearchPage(IC2RecipeRegistry.shardToRedstone), new ResearchPage(IC2RecipeRegistry.shardToLapis), new ResearchPage(IC2RecipeRegistry.ironToGold), new ResearchPage(IC2RecipeRegistry.goldToDiamond), new ResearchPage(IC2RecipeRegistry.diamondToUranium), new ResearchPage(IC2RecipeRegistry.uraniumToIridium)); + research = new EMTResearchItem("UU-Matter Infusion", "EMT", ResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(ItemRegistry.itemEMTItems, 1, 16)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.charcoalToCoal), new ResearchPage(RecipeRegistry.glowstoneDustToBlock), new ResearchPage(RecipeRegistry.stoneBricksToIronOre), new ResearchPage(RecipeRegistry.arcaneStoneToCopperOre), new ResearchPage(RecipeRegistry.arcaneStoneBricksToTinOre), new ResearchPage(RecipeRegistry.amberBlockToLeadOre), new ResearchPage(RecipeRegistry.amberBricksToUraniumOre), new ResearchPage(RecipeRegistry.shardToResin), new ResearchPage(RecipeRegistry.shardToRedstone), new ResearchPage(RecipeRegistry.shardToLapis), new ResearchPage(RecipeRegistry.ironToGold), new ResearchPage(RecipeRegistry.goldToDiamond), new ResearchPage(RecipeRegistry.diamondToUranium), new ResearchPage(RecipeRegistry.uraniumToIridium)); } if (ConfigHandler.portableNodeResarch == false) { text = "1"; - research = new EMTResearchItem("Portable Node", "EMT", ResearchAspects.portableNode, 2, 5, 3, new ItemStack(BaseBlockRegistry.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.portableNode)); + research = new EMTResearchItem("Portable Node", "EMT", ResearchAspects.portableNode, 2, 5, 3, new ItemStack(BlockRegistry.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.portableNode)); } if (ConfigHandler.electricHoeGrowthResearch == false) { text = "1"; - research = new EMTResearchItem("Electric Hoe of Growth", "EMT", ResearchAspects.electricHoeGrowth, -1, -4, 2, new ItemStack(IC2ItemRegistry.electricHoeGrowth)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.electricHoeGrowth)); + research = new EMTResearchItem("Electric Hoe of Growth", "EMT", ResearchAspects.electricHoeGrowth, -1, -4, 2, new ItemStack(ItemRegistry.electricHoeGrowth)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.electricHoeGrowth)); } if (ConfigHandler.chargeFocusResearch == false) { text = "1"; - research = new EMTResearchItem("Wand Focus: Charging", "EMT", ResearchAspects.chargeFocus, 5, 3, 2, new ItemStack(IC2ItemRegistry.chargeFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.chargeFocus)); + research = new EMTResearchItem("Wand Focus: Charging", "EMT", ResearchAspects.chargeFocus, 5, 3, 2, new ItemStack(ItemRegistry.chargeFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.chargeFocus)); } if (ConfigHandler.wandChargeFocusResearch == false) { text = "1"; - research = new EMTResearchItem("Wand Focus: Wand Charging", "EMT", ResearchAspects.wandChargeFocus, 7, 3, 3, new ItemStack(IC2ItemRegistry.wandChargeFocus)).setParents("Wand Focus: Charging").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.wandChargeFocus)); + research = new EMTResearchItem("Wand Focus: Wand Charging", "EMT", ResearchAspects.wandChargeFocus, 7, 3, 3, new ItemStack(ItemRegistry.wandChargeFocus)).setParents("Wand Focus: Charging").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.wandChargeFocus)); } if (ConfigHandler.inventoryChargingRing == false) { text = "1"; - research = new EMTResearchItem("Inventory Charging Ring", "EMT", ResearchAspects.inventoryChargingRing, 0, -5, 3, new ItemStack(IC2ItemRegistry.emtBauble, 1, 1)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.inventoryChargingRing)); + research = new EMTResearchItem("Inventory Charging Ring", "EMT", ResearchAspects.inventoryChargingRing, 0, -5, 3, new ItemStack(ItemRegistry.emtBauble, 1, 1)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.inventoryChargingRing)); } if (ConfigHandler.armorChargingRing == false) { text = "1"; - research = new EMTResearchItem("Armor Charging Ring", "EMT", ResearchAspects.armorChargingRing, 0, -7, 3, new ItemStack(IC2ItemRegistry.emtBauble, 1, 0)).setSecondary().setParents("Inventory Charging Ring").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.armorChargingRing)); + research = new EMTResearchItem("Armor Charging Ring", "EMT", ResearchAspects.armorChargingRing, 0, -7, 3, new ItemStack(ItemRegistry.emtBauble, 1, 0)).setSecondary().setParents("Inventory Charging Ring").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.armorChargingRing)); } if (ConfigHandler.thaumiumWingResearch == false) { text = "1"; - research = new EMTResearchItem("Thaumium Reinforced Wings", "EMT", ResearchAspects.thaumiumWing, 0, 4, 0, new ItemStack(IC2ItemRegistry.thaumiumWing)).setSecondary().setParents("Feather Wings").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thaumiumWing), new ResearchPage(IC2RecipeRegistry.thaumiumWings)); + research = new EMTResearchItem("Thaumium Reinforced Wings", "EMT", ResearchAspects.thaumiumWing, 0, 4, 0, new ItemStack(ItemRegistry.thaumiumWing)).setSecondary().setParents("Feather Wings").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thaumiumWing), new ResearchPage(RecipeRegistry.thaumiumWings)); } if (ConfigHandler.nanoWingResearch == false) { text = "1"; - research = new EMTResearchItem("Nanosuit Wings", "EMT", ResearchAspects.nanoWing, 0, 6, 2, new ItemStack(IC2ItemRegistry.nanoWing)).setParents("Thaumium Reinforced Wings").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.nanoWings)); + research = new EMTResearchItem("Nanosuit Wings", "EMT", ResearchAspects.nanoWing, 0, 6, 2, new ItemStack(ItemRegistry.nanoWing)).setParents("Thaumium Reinforced Wings").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.nanoWings)); } if (ConfigHandler.quantumWingsResearch == false) { text = "1"; - research = new EMTResearchItem("Quantum Wings", "EMT", ResearchAspects.quantumWing, 0, 8, 3, new ItemStack(IC2ItemRegistry.quantumWing)).setParents("Nanosuit Wings").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.quantumWings)); + research = new EMTResearchItem("Quantum Wings", "EMT", ResearchAspects.quantumWing, 0, 8, 3, new ItemStack(ItemRegistry.quantumWing)).setParents("Nanosuit Wings").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.quantumWings)); } } } diff --git a/src/main/java/tombenpotter/emt/ElectroMagicTools.java b/src/main/java/tombenpotter/emt/ElectroMagicTools.java index 7a2efef..b19bb59 100644 --- a/src/main/java/tombenpotter/emt/ElectroMagicTools.java +++ b/src/main/java/tombenpotter/emt/ElectroMagicTools.java @@ -27,8 +27,8 @@ import net.minecraftforge.common.MinecraftForge; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import tombenpotter.emt.common.commands.CommandOutputs; -import tombenpotter.emt.common.modules.ModuleRegistry; -import tombenpotter.emt.common.modules.base.entities.BaseEntityRegistry; +import tombenpotter.emt.common.Registry; +import tombenpotter.emt.common.entities.BaseEntityRegistry; import tombenpotter.emt.common.util.*; import tombenpotter.emt.proxies.CommonProxy; @@ -53,7 +53,7 @@ public class ElectroMagicTools { ConfigHandler.init(event.getSuggestedConfigurationFile()); FMLCommonHandler.instance().bus().register(new EventHandlerEMT()); - ModuleRegistry.registerModules(); + Registry.register(); EssentiasOutputs.addPrimalOutputs(); EssentiasOutputs.addOutputs(); @@ -83,7 +83,7 @@ public class ElectroMagicTools { public void postInit(FMLPostInitializationEvent event) { ElectroMagicTools.logger.info(localize("console.EMT.postInit.begin")); - ModuleRegistry.registerLateModules(); + Registry.registerLate(); RegistryHandler.registerIc2PostRegistrys(); ElectroMagicTools.logger.info(localize("console.EMT.postInit.end")); diff --git a/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java b/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java index f52a5d6..c99ec5d 100644 --- a/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java +++ b/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java @@ -19,7 +19,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import tombenpotter.emt.ModInformation; import tombenpotter.emt.client.gui.container.ContainerEtheralMacerator; -import tombenpotter.emt.common.modules.ic2.tile.TileEntityEtherealMacerator; +import tombenpotter.emt.common.tile.TileEntityEtherealMacerator; import tombenpotter.emt.common.util.TextHelper; public class GuiEtherealMacerator extends GuiContainer { diff --git a/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java b/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java index ffa4a2b..24da41a 100644 --- a/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java +++ b/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java @@ -19,7 +19,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import tombenpotter.emt.ModInformation; import tombenpotter.emt.client.gui.container.ContainerIndustrialWandRecharge; -import tombenpotter.emt.common.modules.ic2.tile.TileEntityIndustrialWandRecharge; +import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge; import tombenpotter.emt.common.util.TextHelper; public class GuiIndustrialWandRecharger extends GuiContainer { diff --git a/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java b/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java index c785052..3118bc5 100644 --- a/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java +++ b/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java @@ -20,14 +20,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntity; import thaumcraft.common.container.SlotOutput; -import tombenpotter.emt.common.modules.ic2.tile.TileEntityEtherealMacerator; +import tombenpotter.emt.common.tile.TileEntityEtherealMacerator; public class ContainerEtheralMacerator extends Container { TileEntityEtherealMacerator te; public ContainerEtheralMacerator(InventoryPlayer inventory, TileEntity te) { - this.te = ((TileEntityEtherealMacerator) te); + this.te = ((TileEntityEtherealMacerator)te); addSlotToContainer(new Slot(this.te, 0, 56, 26)); addSlotToContainer(new SlotOutput(this.te, 2, 116, 26)); addSlotToContainer(new SlotOutput(this.te, 1, 116, 53)); diff --git a/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java b/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java index 0e34acb..3f8cd7a 100644 --- a/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java +++ b/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java @@ -18,7 +18,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; -import tombenpotter.emt.common.modules.ic2.tile.TileEntityIndustrialWandRecharge; +import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge; public class ContainerIndustrialWandRecharge extends Container { diff --git a/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java b/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java index 0d805dd..71549a9 100644 --- a/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java +++ b/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java @@ -19,7 +19,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.base.entities.EntityLaser; +import tombenpotter.emt.common.entities.EntityLaser; public class RenderLaser extends Render { diff --git a/src/main/java/tombenpotter/emt/common/RecipeRegistry.java b/src/main/java/tombenpotter/emt/common/RecipeRegistry.java new file mode 100644 index 0000000..c3a5d79 --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/RecipeRegistry.java @@ -0,0 +1,465 @@ +/******************************************************************************* + * Copyright (c) 2014 Tombenpotter. + * All rights reserved. + * + * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html + * + * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. + * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. + * http://www.minecraftforum.net/topic/1585216- + ******************************************************************************/ + +package tombenpotter.emt.common; + +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; +import ic2.api.item.IC2Items; +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.Recipes; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.crafting.CrucibleRecipe; +import thaumcraft.api.crafting.InfusionRecipe; +import thaumcraft.api.crafting.ShapedArcaneRecipe; +import thaumcraft.api.crafting.ShapelessArcaneRecipe; +import thaumcraft.common.config.ConfigBlocks; +import thaumcraft.common.config.ConfigItems; +import tombenpotter.emt.ElectroMagicTools; +import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.items.ItemRegistry; +import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.CraftingAspects; +import tombenpotter.emt.common.util.TextHelper; + +import java.util.Iterator; + +public class RecipeRegistry { + + public static ItemStack uuMCell = new ItemStack(ItemRegistry.itemEMTItems, 1, 16); + + private static void registerShapedRecipes() { + + /** Crafting Recipes **/ + ironOmnitool = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ironOmnitool), "X", "Z", "Y", 'X', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', IC2Items.getItem("plateiron")); + diamondChainsaw = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.diamondChainsaw), " X ", "XYX", 'X', new ItemStack(Items.diamond), 'Y', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + ductTape = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 9), "XXX", "YYY", "XXX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 8), 'Y', new ItemStack(Items.paper)); + featherMesh = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 7), "XYX", "YXY", "XYX", 'X', new ItemStack(Items.feather), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 9)); + featherWing = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 12), "XYZ", "XYZ", "XYZ", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 7), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 8), 'Z', new ItemStack(ItemRegistry.itemEMTItems, 1, 11)); + featherWings = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.featherWing), "XX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 12)); + taintedFeathers = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 14), " X ", "XYX", " X ", 'X', new ItemStack(ConfigItems.itemResource, 1, 12), 'Y', new ItemStack(Items.feather)); + + if (!Loader.isModLoaded("gregtech_addon")) { + GameRegistry.addShapedRecipe(IC2Items.getItem("diamondDrill"), " Y ", "YXY", 'Y', new ItemStack(Items.diamond), 'X', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + } else { + ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.modLoaded.GT")); + } + + GameRegistry.addRecipe(IC2Items.getItem("nanoHelmet"), "XYX", "XZX", 'X', IC2Items.getItem("carbonPlate"), 'Y', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(IC2Items.getItem("nightvisionGoggles").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + GameRegistry.addShapedRecipe(IC2Items.getItem("generator"), "X", "Y", "Z", 'X', new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', IC2Items.getItem("machine"), 'Z', new ItemStack(Blocks.furnace)); + GameRegistry.addShapedRecipe(IC2Items.getItem("generator"), "X", "Y", "Z", 'X', IC2Items.getItem("reBattery"), 'Y', IC2Items.getItem("machine"), 'Z', new ItemStack(Blocks.furnace)); + + /** OreDict Crafting Recipes **/ + for (int i = 0; i < OreDictionary.getOres("logWood").size(); i++) { + cardboard = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 11), "XXX", "YYY", "XXX", 'X', new ItemStack(Items.paper), 'Y', OreDictionary.getOres("logWood").get(i)); + } + for (int i = 0; i < OreDictionary.getOres("itemRubber").size(); i++) { + rubberBall = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 10), "XX", "XX", 'X', OreDictionary.getOres("itemRubber").get(i)); + } + + /** Smelting Recipes **/ + GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 1), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); + GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 2), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); + GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 3), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); + GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 4), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); + GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 10), new ItemStack(ItemRegistry.itemEMTItems, 2, 8), 0.0F); + } + + private static void registerShaplessRecipes() { + + } + + private static void registerSmeltingRecipes() { + + } + + public static void registerEarlyRecipes() { + registerShapedRecipes(); + registerShaplessRecipes(); + registerSmeltingRecipes(); + } + + public static void registerUUMInfusionRecipes() { + + ItemStack iridium = IC2Items.getItem("iridiumOre").copy(); + iridium.stackSize = 2; + uraniumToIridium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", iridium, 4, CraftingAspects.uuMatterInfusions, IC2Items.getItem("Uran238"), new ItemStack[]{uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell}); + + ItemStack uranium = IC2Items.getItem("Uran238").copy(); + uranium.stackSize = 2; + diamondToUranium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uranium, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(Items.diamond), new ItemStack[]{uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell}); + + ItemStack diamond = new ItemStack(Items.diamond).copy(); + diamond.stackSize = 1; + goldToDiamond = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", diamond, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.gold_ingot), new ItemStack[]{uuMCell, uuMCell, uuMCell, uuMCell}); + + ItemStack gold = new ItemStack(Items.gold_ingot).copy(); + gold.stackSize = 2; + ironToGold = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", gold, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.iron_ingot), new ItemStack[]{uuMCell, uuMCell, uuMCell}); + + ItemStack ironOre = new ItemStack(Blocks.iron_ore).copy(); + ironOre.stackSize = 16; + stoneBricksToIronOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", ironOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Blocks.stonebrick), new ItemStack[]{uuMCell, uuMCell}); + + /** + * ItemStack copperOre = Items.getItem("copperOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED + **/ + ItemStack copperOre = IC2Items.getItem("crushedCopperOre").copy(); + copperOre.stackSize = 32; + arcaneStoneToCopperOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", copperOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack[]{uuMCell, uuMCell}); + + /** + * ItemStack tinOre = Items.getItem("tinOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED + **/ + ItemStack tinOre = IC2Items.getItem("crushedTinOre").copy(); + tinOre.stackSize = 32; + arcaneStoneBricksToTinOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", tinOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), new ItemStack[]{uuMCell, uuMCell}); + + /** + * ItemStack leadOre = Items.getItem("leadOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED + **/ + ItemStack leadOre = IC2Items.getItem("crushedLeadOre").copy(); + leadOre.stackSize = 32; + amberBlockToLeadOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", leadOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 0), new ItemStack[]{uuMCell, uuMCell}); + + ItemStack uraniumOre = IC2Items.getItem("uraniumOre").copy(); + uraniumOre.stackSize = 8; + amberBricksToUraniumOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uraniumOre, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 1), new ItemStack[]{uuMCell, uuMCell, uuMCell}); + + ItemStack coal = new ItemStack(Items.coal, 1, 0).copy(); + coal.stackSize = 16; + charcoalToCoal = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", coal, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.coal, 1, 1), new ItemStack[]{uuMCell, uuMCell}); + + ItemStack stickyResin = IC2Items.getItem("resin").copy(); + stickyResin.stackSize = 21; + shardToResin = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", stickyResin, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{uuMCell, uuMCell, uuMCell}); + + ItemStack redstone = new ItemStack(Items.redstone).copy(); + redstone.stackSize = 24; + shardToRedstone = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", redstone, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{uuMCell, uuMCell, uuMCell}); + + ItemStack lapisLazuli = new ItemStack(Items.dye, 1, 4).copy(); + lapisLazuli.stackSize = 8; + shardToLapis = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", lapisLazuli, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{uuMCell, uuMCell, uuMCell}); + + ItemStack glowstone = new ItemStack(Blocks.glowstone).copy(); + glowstone.stackSize = 1; + glowstoneDustToBlock = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", glowstone, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.glowstone_dust), new ItemStack[]{uuMCell}); + } + + public static void registerLateRecipes() { + /** Infusion Recipes **/ + + thaumiumDrill = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Drill", new ItemStack(ItemRegistry.thaumiumDrill), 5, CraftingAspects.thaumiumDrillCrafting, new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")}); + + thaumiumChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Chainsaw", new ItemStack(ItemRegistry.thaumiumChainsaw), 5, CraftingAspects.thaumiumChainsawCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")}); + + thaumicQuantumHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Goggles of Revealing", new ItemStack(ItemRegistry.quantumThaumicHelmet), 6, CraftingAspects.thaumicQuantumHelmetCrafting, new ItemStack(ItemRegistry.nanoThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.milk_bucket), new ItemStack(IC2Items.getItem("quantumHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("advancedCircuit")}); + + thaumicNanoHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Goggles of Revealing", new ItemStack(ItemRegistry.nanoThaumicHelmet), 5, CraftingAspects.thaumicNanoHelmetCrafting, new ItemStack(ItemRegistry.electricGoggles, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.gold_ingot), new ItemStack(IC2Items.getItem("nanoHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("electronicCircuit")}); + + thaumiumOmnitool = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("plateobsidian")}); + + diamondOmnitoolToThaumium = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.diamondOmnitool, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Blocks.diamond_block), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("carbonPlate"), IC2Items.getItem("advancedCircuit")}); + + explosionFocus = ThaumcraftApi.addInfusionCraftingRecipe("Explosion Focus", new ItemStack(ItemRegistry.explosionFocus), 6, CraftingAspects.laserFocusCrafting, new ItemStack(ConfigItems.itemFocusHellbat, 1), new ItemStack[]{new ItemStack(IC2Items.getItem("miningLaser").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.arrow), new ItemStack(Items.gunpowder), new ItemStack(Items.firework_charge), new ItemStack(ConfigItems.itemResource, 1, 1)}); + + shieldFocus = ThaumcraftApi.addInfusionCraftingRecipe("Shield Focus", new ItemStack(ItemRegistry.shieldFocus), 4, CraftingAspects.shieldFocusCrafting, new ItemStack(ConfigItems.itemFocusPortableHole, 1), new ItemStack[]{IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"), new ItemStack(Blocks.soul_sand), new ItemStack(Blocks.obsidian), new ItemStack(Blocks.obsidian)}); + + potentiaGenerator = ThaumcraftApi.addInfusionCraftingRecipe("Potentia Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 0), 6, CraftingAspects.potentiaGeneratorCrafting, IC2Items.getItem("semifluidGenerator"), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(ConfigItems.itemFocusTrade), new ItemStack(Blocks.hopper), new ItemStack(ConfigBlocks.blockJar), IC2Items.getItem("mvTransformer"), IC2Items.getItem("advancedMachine"), IC2Items.getItem("orewashingplant"), IC2Items.getItem("scrap")}); + + streamChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Chainsaw of the Stream", new ItemStack(ItemRegistry.streamChainsaw), 6, CraftingAspects.streamChaisnawCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.water_bucket), new ItemStack(ConfigItems.itemAxeElemental), new ItemStack(ConfigBlocks.blockMagicalLog), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade")}); + + rockbreakerDrill = ThaumcraftApi.addInfusionCraftingRecipe("Drill of the Rockbreaker", new ItemStack(ItemRegistry.rockbreakerDrill), 6, CraftingAspects.rockbreakerDrillCrafting, new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.flint_and_steel), new ItemStack(Items.fire_charge), new ItemStack(ConfigItems.itemPickElemental), new ItemStack(ConfigItems.itemShovelElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade")}); + + thorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Mjolnir", new ItemStack(ItemRegistry.thorHammer), 7, CraftingAspects.thorHammerCrafting, new ItemStack(ItemRegistry.taintedThorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemFocusShock), IC2Items.getItem("rubber")}); + + superchargedThorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Supercharged Mjolnir", new ItemStack(ItemRegistry.electricThorHammer), 10, CraftingAspects.superchargedThorHammerCrafting, new ItemStack(ItemRegistry.thorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(Blocks.web), new ItemStack(ConfigItems.itemFocusHellbat), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("nanoSaber").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); + + wandRecharger = ThaumcraftApi.addInfusionCraftingRecipe("Industrial Wand Charging Station", new ItemStack(BlockRegistry.emtMachines, 1, 0), 6, CraftingAspects.wandCharger, new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5), new ItemStack[]{IC2Items.getItem("replicator"), IC2Items.getItem("iridiumPlate"), new ItemStack(Blocks.diamond_block), new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigBlocks.blockJar)}); + + solarHelmetRevealing = ThaumcraftApi.addInfusionCraftingRecipe("Solar Helmet of Revealing", new ItemStack(ItemRegistry.solarHelmetRevealing), 5, CraftingAspects.solarHelmetRevealing, new ItemStack(ItemRegistry.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(BlockRegistry.emtSolars, 1, 1), IC2Items.getItem("glassFiberCableItem"), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, 4)}); + + electricBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Electric Boots of the Traveller", new ItemStack(ItemRegistry.electricBootsTraveller), 2, CraftingAspects.electricBootsTravel, new ItemStack(ConfigItems.itemBootsTraveller), new ItemStack[]{new ItemStack(Items.diamond), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"), IC2Items.getItem("hazmatBoots"), new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); + + nanoBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Nano Boots of the Traveller", new ItemStack(ItemRegistry.nanoBootsTraveller), 2, CraftingAspects.nanoBootsTravel, new ItemStack(ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(IC2Items.getItem("nanoBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); + + quantumBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Boots of the Traveller", new ItemStack(ItemRegistry.quantumBootsTraveller), 2, CraftingAspects.quantumBootsTravel, new ItemStack(ItemRegistry.nanoBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Blocks.diamond_block), new ItemStack(IC2Items.getItem("quantumBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate")}); + + etheralProcessor = ThaumcraftApi.addInfusionCraftingRecipe("Etheral Processor", new ItemStack(BlockRegistry.emtMachines, 1, 1), 3, CraftingAspects.etherealProcessor, IC2Items.getItem("macerator"), new ItemStack[]{IC2Items.getItem("electroFurnace"), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.iron_block), new ItemStack(Blocks.iron_block), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5)}); + + tripleCompressedSolar = ThaumcraftApi.addInfusionCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 2), 2, CraftingAspects.compressedSolars, new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack[]{new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1)}); + + electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", new ItemStack(ItemRegistry.electricHoeGrowth), 4, CraftingAspects.electricHoeGrowth, new ItemStack(ConfigItems.itemHoeElemental), new ItemStack[]{new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("electricHoe").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.dye, 1, 15), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"), new ItemStack(Blocks.sapling, 1, OreDictionary.WILDCARD_VALUE)}); + + chargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Charging", new ItemStack(ItemRegistry.chargeFocus), 4, CraftingAspects.chargeFocus, new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{IC2Items.getItem("generator"), IC2Items.getItem("batBox"), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE)}); + + wandChargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Wand Charging", new ItemStack(ItemRegistry.wandChargeFocus), 5, CraftingAspects.wandChargeFocus, new ItemStack(BlockRegistry.emtMachines, 1, 0), new ItemStack[]{new ItemStack(ItemRegistry.chargeFocus), new ItemStack(IC2Items.getItem("energyPack").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate")}); + + inventoryChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Inventory Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 1), 6, CraftingAspects.inventoryChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[]{new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"), IC2Items.getItem("waterMill"), IC2Items.getItem("solarPanel"), IC2Items.getItem("windMill"), IC2Items.getItem("nuclearReactor")}); + + armorChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Armor Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 0), 6, CraftingAspects.armorChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[]{new ItemStack(ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"), IC2Items.getItem("waterMill"), IC2Items.getItem("solarPanel"), IC2Items.getItem("windMill"), IC2Items.getItem("nuclearReactor")}); + + nanoWings = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Wings", new ItemStack(ItemRegistry.nanoWing), 4, CraftingAspects.nanoWing, new ItemStack(ItemRegistry.thaumiumWing), new ItemStack[]{IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), new ItemStack(IC2Items.getItem("nanoBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1)}); + + quantumWings = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Wings", new ItemStack(ItemRegistry.quantumWing), 6, CraftingAspects.quantumWing, new ItemStack(ItemRegistry.nanoWing, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1)}); + + /** Arcane Worktable Recipes **/ + + diamondOmnitool = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + + ironOmnitoolToDiamond = ThaumcraftApi.addArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, "XAX", "XBX", "XAX", 'X', new ItemStack(Items.diamond), 'A', IC2Items.getItem("advancedCircuit"), 'B', new ItemStack(ItemRegistry.ironOmnitool, 1, OreDictionary.WILDCARD_VALUE)); + + christmasFocus = ThaumcraftApi.addArcaneCraftingRecipe("Kris-tmas Focus", new ItemStack(ItemRegistry.christmasFocus), CraftingAspects.christmasFocusCrafting, "XYX", "YZY", "XYX", 'X', new ItemStack(Blocks.snow), 'Y', new ItemStack(Blocks.pumpkin), 'Z', new ItemStack(ConfigItems.itemFocusFrost)); + + electricGoggles = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", new ItemStack(ItemRegistry.electricGoggles), CraftingAspects.electricGogglesCrafting, " Y ", "AZA", "BXB", 'Z', new ItemStack(ConfigItems.itemGoggles), 'X', IC2Items.getItem("electronicCircuit"), 'Y', new ItemStack(Items.diamond_helmet), 'A', new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'B', Items.repeater); + + shieldBlock = ThaumcraftApi.addArcaneCraftingRecipe("Shield Blocks", new ItemStack(BlockRegistry.shield, 8), CraftingAspects.shieldBlockCrafting, "XYX", "X X", "XYX", 'X', new ItemStack(Blocks.glass), 'Y', new ItemStack(Blocks.obsidian)); + + tinyUranium = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Tiny Uranium", new ItemStack(IC2Items.getItem("smallUran235").getItem(), 7), CraftingAspects.tinyUraniumCrafting, IC2Items.getItem("Uran238")); + + compressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', IC2Items.getItem("solarPanel")); + + doubleCompressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', new ItemStack(BlockRegistry.emtSolars, 1, 0)); + + electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", new ItemStack(ItemRegistry.electricScribingTools), CraftingAspects.electricScribingTools, "YXY", "XZX", "YXY", 'Y', IC2Items.getItem("electronicCircuit"), 'X', new ItemStack(ConfigItems.itemInkwell), 'Z', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + + thaumiumWing = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.itemEMTItems, 1, 15), CraftingAspects.thaumiumWing, "XYZ", "XYZ", "XYZ", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 14), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 5), 'Z', new ItemStack(ItemRegistry.itemEMTItems, 1, 13)); + + thaumiumWings = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.thaumiumWing), CraftingAspects.thaumiumWing, "XX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 15)); + + /** Crucible Recipes **/ + + ignisGenerator = ThaumcraftApi.addCrucibleRecipe("Ignis Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 1), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.ignisGeneratorCrafting); + + auramGenerator = ThaumcraftApi.addCrucibleRecipe("Auram Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 2), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.auramGeneratorCrafting); + + arborGenerator = ThaumcraftApi.addCrucibleRecipe("Arbor Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 3), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.arborGeneratorCrafting); + + aerGenerator = ThaumcraftApi.addCrucibleRecipe("Aer Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 4), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.aerGenerator); + + waterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.waterSolars); + + doubleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.waterSolars); + + tripleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 5), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.waterSolars); + + darkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 6), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.darkSolars); + + doubleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 7), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.darkSolars); + + tripleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 8), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.darkSolars); + + orderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 9), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.orderSolars); + + doubleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 10), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.orderSolars); + + tripleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 11), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.orderSolars); + + fireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 12), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.fireSolars); + + doubleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 13), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.fireSolars); + + tripleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 14), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.fireSolars); + + airSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 15), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.airSolars); + + doubleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 0), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.airSolars); + + tripleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.airSolars); + + earthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 2), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.earthSolars); + + doubleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.earthSolars); + + tripleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.earthSolars); + + portableNode = ThaumcraftApi.addCrucibleRecipe("Portable Node", new ItemStack(BlockRegistry.portableNode), new ItemStack(ConfigItems.itemJarFilled), CraftingAspects.portableNode); + + /** IC2 Stuff related recipes **/ + + /* Ore Clusters Macerator Recipes */ + ItemStack ironClusterRecipe = IC2Items.getItem("smallIronDust").copy(); + ironClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 16)), null, ironClusterRecipe); + + ItemStack goldClusterRecipe = IC2Items.getItem("smallGoldDust").copy(); + goldClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 31)), null, goldClusterRecipe); + + ItemStack copperClusterRecipe = IC2Items.getItem("smallCopperDust").copy(); + copperClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 17)), null, copperClusterRecipe); + + ItemStack tinClusterRecipe = IC2Items.getItem("smallTinDust").copy(); + tinClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 18)), null, tinClusterRecipe); + + ItemStack silverClusterRecipe = IC2Items.getItem("smallSilverDust").copy(); + silverClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 19)), null, silverClusterRecipe); + + ItemStack leadClusterRecipe = IC2Items.getItem("smallLeadDust").copy(); + leadClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 20)), null, leadClusterRecipe); + + /* Thaumium Plates Recipes */ + thaumiumPlate = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 5), "X", "Y", "Z", 'Y', new ItemStack(ConfigItems.itemResource, 1, 2), 'X', new ItemStack(IC2Items.getItem("ForgeHammer").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(Blocks.obsidian)); + Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemResource, 1, 2)), null, new ItemStack(ItemRegistry.itemEMTItems, 1, 5)); + + /* Iron Sheet Recipe */ + Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(IC2Items.getItem("denseplateiron")), null, new ItemStack(ItemRegistry.itemEMTItems, 1, 13)); + + /* Ore Processing for Amber and Cinnabar */ + if (ConfigHandler.removeAmberAndCinnabarMacerating) { + for (Iterator it = Recipes.macerator.getRecipes().keySet().iterator(); it.hasNext(); ) { + IRecipeInput input = it.next(); + if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7))) { + it.remove(); + ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.recipes.amberConflict")); + } + } + + for (Iterator it = Recipes.macerator.getRecipes().keySet().iterator(); it.hasNext(); ) { + IRecipeInput input = it.next(); + if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0))) { + it.remove(); + ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.recipes.cinnabarConflict")); + } + } + } + ItemStack crushedAmberRecipe = new ItemStack(ItemRegistry.itemEMTItems, 1, 1); + crushedAmberRecipe.stackSize = 2; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7)), null, crushedAmberRecipe); + + ItemStack crushedCinnabarRecipe = new ItemStack(ItemRegistry.itemEMTItems, 1, 3); + crushedCinnabarRecipe.stackSize = 2; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0)), null, crushedCinnabarRecipe); + + NBTTagCompound waterAmount = new NBTTagCompound(); + waterAmount.setInteger("amount", 1000); + + ItemStack smallCopperDust = IC2Items.getItem("smallCopperDust"); + smallCopperDust.stackSize = 2; + ItemStack smallTinDust = IC2Items.getItem("smallTinDust"); + smallCopperDust.stackSize = 2; + + Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 1)), waterAmount, new ItemStack[]{new ItemStack(ItemRegistry.itemEMTItems, 1, 2), smallCopperDust, IC2Items.getItem("stoneDust")}); + Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 3)), waterAmount, new ItemStack[]{new ItemStack(ItemRegistry.itemEMTItems, 1, 4), smallTinDust, IC2Items.getItem("stoneDust")}); + + NBTTagCompound heatAmount = new NBTTagCompound(); + heatAmount.setInteger("minHeat", 1000); + + Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 2)), heatAmount, new ItemStack[]{IC2Items.getItem("smallCopperDust"), new ItemStack(ConfigItems.itemResource, 1, 6)}); + Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 4)), heatAmount, new ItemStack[]{IC2Items.getItem("smallTinDust"), new ItemStack(ConfigItems.itemResource, 1, 3)}); + + } + + public static IRecipe ironOmnitool; + public static IRecipe diamondChainsaw; + public static IRecipe ductTape; + public static IRecipe rubberBall; + public static IRecipe featherMesh; + public static IRecipe cardboard; + public static IRecipe featherWing; + public static IRecipe featherWings; + public static IRecipe taintedFeathers; + + public static InfusionRecipe uraniumToIridium; + public static InfusionRecipe diamondToUranium; + public static InfusionRecipe goldToDiamond; + public static InfusionRecipe ironToGold; + public static InfusionRecipe stoneBricksToIronOre; + public static InfusionRecipe arcaneStoneToCopperOre; + public static InfusionRecipe arcaneStoneBricksToTinOre; + public static InfusionRecipe amberBlockToLeadOre; + public static InfusionRecipe amberBricksToUraniumOre; + public static InfusionRecipe charcoalToCoal; + public static InfusionRecipe shardToResin; + public static InfusionRecipe shardToRedstone; + public static InfusionRecipe shardToLapis; + public static InfusionRecipe glowstoneDustToBlock; + + public static InfusionRecipe thaumiumDrill; + public static InfusionRecipe thaumiumChainsaw; + public static InfusionRecipe thaumicQuantumHelmet; + public static InfusionRecipe thaumiumOmnitool; + public static InfusionRecipe thaumicNanoHelmet; + public static InfusionRecipe explosionFocus; + public static InfusionRecipe shieldFocus; + public static InfusionRecipe potentiaGenerator; + public static InfusionRecipe streamChainsaw; + public static InfusionRecipe rockbreakerDrill; + public static InfusionRecipe thorHammer; + public static InfusionRecipe superchargedThorHammer; + public static InfusionRecipe wandRecharger; + public static InfusionRecipe solarHelmetRevealing; + public static InfusionRecipe electricBootsTravel; + public static InfusionRecipe nanoBootsTravel; + public static InfusionRecipe quantumBootsTravel; + public static InfusionRecipe diamondOmnitoolToThaumium; + public static InfusionRecipe etheralProcessor; + public static InfusionRecipe tripleCompressedSolar; + public static InfusionRecipe electricHoeGrowth; + public static InfusionRecipe chargeFocus; + public static InfusionRecipe wandChargeFocus; + public static InfusionRecipe inventoryChargingRing; + public static InfusionRecipe armorChargingRing; + public static InfusionRecipe nanoWings; + public static InfusionRecipe quantumWings; + + public static ShapelessArcaneRecipe diamondOmnitool; + public static ShapelessArcaneRecipe tinyUranium; + public static ShapedArcaneRecipe christmasFocus; + public static ShapedArcaneRecipe electricGoggles; + public static ShapedArcaneRecipe shieldBlock; + public static ShapedArcaneRecipe compressedSolar; + public static ShapedArcaneRecipe doubleCompressedSolar; + public static ShapedArcaneRecipe ironOmnitoolToDiamond; + public static ShapedArcaneRecipe electricScribingTools; + public static ShapedArcaneRecipe thaumiumWing; + public static ShapedArcaneRecipe thaumiumWings; + + public static CrucibleRecipe ignisGenerator; + public static CrucibleRecipe auramGenerator; + public static CrucibleRecipe arborGenerator; + public static CrucibleRecipe aerGenerator; + public static CrucibleRecipe waterSolar; + public static CrucibleRecipe doubleWaterSolar; + public static CrucibleRecipe tripleWaterSolar; + public static CrucibleRecipe darkSolar; + public static CrucibleRecipe doubleDarkSolar; + public static CrucibleRecipe tripleDarkSolar; + public static CrucibleRecipe orderSolar; + public static CrucibleRecipe doubleOrderSolar; + public static CrucibleRecipe tripleOrderSolar; + public static CrucibleRecipe fireSolar; + public static CrucibleRecipe doubleFireSolar; + public static CrucibleRecipe tripleFireSolar; + public static CrucibleRecipe airSolar; + public static CrucibleRecipe doubleAirSolar; + public static CrucibleRecipe tripleAirSolar; + public static CrucibleRecipe earthSolar; + public static CrucibleRecipe doubleEarthSolar; + public static CrucibleRecipe tripleEarthSolar; + public static CrucibleRecipe portableNode; + + public static IRecipe thaumiumPlate; +} diff --git a/src/main/java/tombenpotter/emt/common/Registry.java b/src/main/java/tombenpotter/emt/common/Registry.java new file mode 100644 index 0000000..f741a91 --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/Registry.java @@ -0,0 +1,20 @@ +package tombenpotter.emt.common; + +import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.RecipeRegistry; +import tombenpotter.emt.common.items.ItemRegistry; +import tombenpotter.emt.common.tile.TileRegistry; + +public class Registry{ + public static void register(){ + BlockRegistry.registerBlocks(); + ItemRegistry.registerItems(); + TileRegistry.registerTiles(); + RecipeRegistry.registerEarlyRecipes(); + } + + public static void registerLate(){ + RecipeRegistry.registerLateRecipes(); + RecipeRegistry.registerUUMInfusionRecipes(); + } +} \ No newline at end of file diff --git a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockBase.java b/src/main/java/tombenpotter/emt/common/blocks/BlockBase.java similarity index 79% rename from src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockBase.java rename to src/main/java/tombenpotter/emt/common/blocks/BlockBase.java index d36a860..b34670c 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockBase.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockBase.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.base.blocks; +package tombenpotter.emt.common.blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -10,7 +10,7 @@ public abstract class BlockBase extends Block { public BlockBase(String unlocName, Material material, String textureName, SoundType soundType, float hardness) { super(material); - setBlockName(ModInformation.modid + ".module.base." + unlocName); + setBlockName(ModInformation.modid + ".block." + unlocName); setBlockTextureName(ModInformation.texturePath + ":" + textureName); setCreativeTab(ElectroMagicTools.tabEMT); setStepSound(soundType); @@ -20,7 +20,7 @@ public abstract class BlockBase extends Block { public BlockBase(String unlocName, Material material, SoundType soundType, float hardness) { super(material); - setBlockName(ModInformation.modid + ".module.base." + unlocName); + setBlockName(ModInformation.modid + ".block." + unlocName); setCreativeTab(ElectroMagicTools.tabEMT); setStepSound(soundType); setHardness(hardness); diff --git a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockBaseContainer.java b/src/main/java/tombenpotter/emt/common/blocks/BlockBaseContainer.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockBaseContainer.java rename to src/main/java/tombenpotter/emt/common/blocks/BlockBaseContainer.java index e3e249d..7e90c6a 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockBaseContainer.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockBaseContainer.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.base.blocks; +package tombenpotter.emt.common.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -13,7 +13,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.base.tile.TileEntityEMT; +import tombenpotter.emt.common.tile.TileEntityEMT; public abstract class BlockBaseContainer extends BlockContainer { diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMT.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEMT.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMT.java rename to src/main/java/tombenpotter/emt/common/blocks/BlockEMT.java index 90e3db8..ee978a5 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMT.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEMT.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.ic2.blocks; +package tombenpotter.emt.common.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -11,7 +11,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tombenpotter.emt.common.modules.base.tile.TileEntityEMT; +import tombenpotter.emt.common.tile.TileEntityEMT; public abstract class BlockEMT extends BlockContainer { public IIcon[] top = new IIcon[16]; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTMachines.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTMachines.java rename to src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java index 089ce40..6265fbd 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTMachines.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.blocks; +package tombenpotter.emt.common.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -28,8 +28,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.ic2.tile.TileEntityEtherealMacerator; -import tombenpotter.emt.common.modules.ic2.tile.TileEntityIndustrialWandRecharge; +import tombenpotter.emt.common.tile.TileEntityEtherealMacerator; +import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge; import java.util.List; import java.util.Random; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java similarity index 86% rename from src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars.java rename to src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java index 020d4a0..650da6f 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.blocks; +package tombenpotter.emt.common.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -23,26 +23,26 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityAirSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityCompressedSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityDoubleCompressedSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityTripleCompressedSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.dark.TileEntityDarkSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.dark.TileEntityDoubleDarkSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.dark.TileEntityTripleDarkSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.fire.TileEntityDoubleFireSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.fire.TileEntityFireSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.fire.TileEntityTripleFireSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.order.TileEntityDoubleOrderSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.order.TileEntityOrderSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.order.TileEntityTripleOrderSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.water.TileEntityDoubleWaterSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.water.TileEntityTripleWaterSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.water.TileEntityWaterSolar; +import tombenpotter.emt.common.tile.solars.air.TileEntityAirSolar; +import tombenpotter.emt.common.tile.solars.compressed.TileEntityCompressedSolar; +import tombenpotter.emt.common.tile.solars.compressed.TileEntityDoubleCompressedSolar; +import tombenpotter.emt.common.tile.solars.compressed.TileEntityTripleCompressedSolar; +import tombenpotter.emt.common.tile.solars.dark.TileEntityDarkSolar; +import tombenpotter.emt.common.tile.solars.dark.TileEntityDoubleDarkSolar; +import tombenpotter.emt.common.tile.solars.dark.TileEntityTripleDarkSolar; +import tombenpotter.emt.common.tile.solars.fire.TileEntityDoubleFireSolar; +import tombenpotter.emt.common.tile.solars.fire.TileEntityFireSolar; +import tombenpotter.emt.common.tile.solars.fire.TileEntityTripleFireSolar; +import tombenpotter.emt.common.tile.solars.order.TileEntityDoubleOrderSolar; +import tombenpotter.emt.common.tile.solars.order.TileEntityOrderSolar; +import tombenpotter.emt.common.tile.solars.order.TileEntityTripleOrderSolar; +import tombenpotter.emt.common.tile.solars.water.TileEntityDoubleWaterSolar; +import tombenpotter.emt.common.tile.solars.water.TileEntityTripleWaterSolar; +import tombenpotter.emt.common.tile.solars.water.TileEntityWaterSolar; import java.util.List; -public class BlockEMTSolars extends BlockIC2Container { +public class BlockEMTSolars extends BlockBaseContainer { public BlockEMTSolars() { super("solars", Material.iron, soundTypeMetal, 4.0F); diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars2.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java similarity index 88% rename from src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars2.java rename to src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java index ba668d5..2af4728 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars2.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.blocks; +package tombenpotter.emt.common.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -23,15 +23,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityDoubleAirSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityTripleAirSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityDoubleEarthSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityEarthSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityTripleEarthSolar; +import tombenpotter.emt.common.tile.solars.air.TileEntityDoubleAirSolar; +import tombenpotter.emt.common.tile.solars.air.TileEntityTripleAirSolar; +import tombenpotter.emt.common.tile.solars.earth.TileEntityDoubleEarthSolar; +import tombenpotter.emt.common.tile.solars.earth.TileEntityEarthSolar; +import tombenpotter.emt.common.tile.solars.earth.TileEntityTripleEarthSolar; import java.util.List; -public class BlockEMTSolars2 extends BlockIC2Container { +public class BlockEMTSolars2 extends BlockBaseContainer { public BlockEMTSolars2() { super("solars.2", Material.iron, soundTypeMetal, 4.0F); diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerator.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerator.java similarity index 92% rename from src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerator.java rename to src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerator.java index 5fa08ea..87f4ab5 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerator.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerator.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.ic2.blocks; +package tombenpotter.emt.common.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -10,9 +10,9 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.IEssentiaContainerItem; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.ic2.tile.generators.TileEntityEssentiaGenerator; +import tombenpotter.emt.common.tile.generators.TileEntityEssentiaGenerator; -public class BlockEssentiaGenerator extends BlockIC2Container { +public class BlockEssentiaGenerator extends BlockBaseContainer { public BlockEssentiaGenerator() { super("generator.essentia", Material.iron, soundTypeMetal, 4.0F); diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerators.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerators.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerators.java rename to src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerators.java index 198e936..2853349 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerators.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerators.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.blocks; +package tombenpotter.emt.common.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -22,12 +22,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.ic2.tile.generators.*; +import tombenpotter.emt.common.tile.generators.*; import java.util.List; import java.util.Random; -public class BlockEssentiaGenerators extends BlockIC2Container { +public class BlockEssentiaGenerators extends BlockBaseContainer { public BlockEssentiaGenerators() { super("generator.essentia.2", Material.iron, soundTypeMetal, 4.0F); diff --git a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockPortableNode.java b/src/main/java/tombenpotter/emt/common/blocks/BlockPortableNode.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockPortableNode.java rename to src/main/java/tombenpotter/emt/common/blocks/BlockPortableNode.java index 62f5062..ac50e02 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockPortableNode.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockPortableNode.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.base.blocks; +package tombenpotter.emt.common.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -27,7 +27,7 @@ import net.minecraft.world.World; import thaumcraft.common.blocks.BlockAiry; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.base.tile.TileEntityPortableNode; +import tombenpotter.emt.common.tile.TileEntityPortableNode; import java.util.List; import java.util.Random; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/IC2BlockRegistry.java b/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java similarity index 62% rename from src/main/java/tombenpotter/emt/common/modules/ic2/blocks/IC2BlockRegistry.java rename to src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java index 2c56429..55b39ff 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/IC2BlockRegistry.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java @@ -1,24 +1,22 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - -package tombenpotter.emt.common.modules.ic2.blocks; +package tombenpotter.emt.common.blocks; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.ic2.items.blocks.*; +import tombenpotter.emt.common.blocks.BlockEMTMachines; +import tombenpotter.emt.common.blocks.BlockEMTSolars; +import tombenpotter.emt.common.blocks.BlockEMTSolars2; +import tombenpotter.emt.common.blocks.BlockEssentiaGenerator; +import tombenpotter.emt.common.blocks.BlockEssentiaGenerators; +import tombenpotter.emt.common.items.blocks.ItemBlockEMTMachines; +import tombenpotter.emt.common.items.blocks.ItemBlockEMTSolars; +import tombenpotter.emt.common.items.blocks.ItemBlockEMTSolars2; +import tombenpotter.emt.common.items.blocks.ItemBlockEssentiaGenerator; +import tombenpotter.emt.common.items.blocks.ItemBlockEssentiaGenerators; -public class IC2BlockRegistry { +public class BlockRegistry { + public static Block portableNode; public static Block essentiaGens; public static Block shield; public static Block emtSolars; @@ -26,7 +24,11 @@ public class IC2BlockRegistry { public static Block emtSolars2; public static Block essentiaGenerator; + public static void registerBlocks() { + portableNode = new BlockPortableNode().setBlockName(ModInformation.modid + ".portablenode"); + GameRegistry.registerBlock(portableNode, "PortableNode"); + shield = new BlockShield().setBlockName(ModInformation.modid + ".shield"); GameRegistry.registerBlock(shield, "ShieldBlock"); diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockShield.java b/src/main/java/tombenpotter/emt/common/blocks/BlockShield.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockShield.java rename to src/main/java/tombenpotter/emt/common/blocks/BlockShield.java index ef14454..faad4c8 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockShield.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockShield.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.blocks; +package tombenpotter.emt.common.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockToolRefiller.java b/src/main/java/tombenpotter/emt/common/blocks/BlockToolRefiller.java similarity index 88% rename from src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockToolRefiller.java rename to src/main/java/tombenpotter/emt/common/blocks/BlockToolRefiller.java index cf55a16..f9029de 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockToolRefiller.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockToolRefiller.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.base.blocks; +package tombenpotter.emt.common.blocks; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/entities/BaseEntityRegistry.java b/src/main/java/tombenpotter/emt/common/entities/BaseEntityRegistry.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/modules/base/entities/BaseEntityRegistry.java rename to src/main/java/tombenpotter/emt/common/entities/BaseEntityRegistry.java index a624506..656ce0d 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/entities/BaseEntityRegistry.java +++ b/src/main/java/tombenpotter/emt/common/entities/BaseEntityRegistry.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.base.entities; +package tombenpotter.emt.common.entities; import cpw.mods.fml.common.registry.EntityRegistry; import net.minecraft.entity.Entity; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/entities/EntityArcher.java b/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/base/entities/EntityArcher.java rename to src/main/java/tombenpotter/emt/common/entities/EntityArcher.java index 51a7a3f..65bceb8 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/entities/EntityArcher.java +++ b/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.base.entities; +package tombenpotter.emt.common.entities; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/entities/EntityLaser.java b/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/modules/ic2/entities/EntityLaser.java rename to src/main/java/tombenpotter/emt/common/entities/EntityLaser.java index ad2d1f6..71ffcc9 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/entities/EntityLaser.java +++ b/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.ic2.entities; +package tombenpotter.emt.common.entities; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemBase.java b/src/main/java/tombenpotter/emt/common/items/ItemBase.java similarity index 69% rename from src/main/java/tombenpotter/emt/common/modules/base/items/ItemBase.java rename to src/main/java/tombenpotter/emt/common/items/ItemBase.java index 5913409..d919e8b 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemBase.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemBase.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.base.items; +package tombenpotter.emt.common.items; import net.minecraft.item.Item; import tombenpotter.emt.ElectroMagicTools; @@ -8,14 +8,14 @@ public class ItemBase extends Item { public ItemBase(String unlocName, String textureName) { super(); - setUnlocalizedName(ModInformation.modid + ".module.base." + unlocName); + setUnlocalizedName(ModInformation.modid + ".item." + unlocName); setTextureName(ModInformation.texturePath + ":" + textureName); setCreativeTab(ElectroMagicTools.tabEMT); } public ItemBase(String unlocName) { super(); - setUnlocalizedName(ModInformation.modid + ".module.base." + unlocName); + setUnlocalizedName(ModInformation.modid + ".item." + unlocName); setCreativeTab(ElectroMagicTools.tabEMT); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemBaseBaubles.java b/src/main/java/tombenpotter/emt/common/items/ItemBaseBaubles.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/base/items/ItemBaseBaubles.java rename to src/main/java/tombenpotter/emt/common/items/ItemBaseBaubles.java index 6a1fdf1..4d6f86d 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemBaseBaubles.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemBaseBaubles.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.base.items; +package tombenpotter.emt.common.items; import baubles.api.BaubleType; import baubles.api.IBauble; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemBaseChainsaw.java b/src/main/java/tombenpotter/emt/common/items/ItemBaseChainsaw.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/base/items/ItemBaseChainsaw.java rename to src/main/java/tombenpotter/emt/common/items/ItemBaseChainsaw.java index 7342dfd..e02a657 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemBaseChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemBaseChainsaw.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.base.items; +package tombenpotter.emt.common.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemBaseDrill.java b/src/main/java/tombenpotter/emt/common/items/ItemBaseDrill.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/base/items/ItemBaseDrill.java rename to src/main/java/tombenpotter/emt/common/items/ItemBaseDrill.java index fc5376f..5fa46b6 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemBaseDrill.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemBaseDrill.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.base.items; +package tombenpotter.emt.common.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemBaseOmnitool.java b/src/main/java/tombenpotter/emt/common/items/ItemBaseOmnitool.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/base/items/ItemBaseOmnitool.java rename to src/main/java/tombenpotter/emt/common/items/ItemBaseOmnitool.java index e28c8f5..44f28b2 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemBaseOmnitool.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemBaseOmnitool.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.base.items; +package tombenpotter.emt.common.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemCraftingComponents.java b/src/main/java/tombenpotter/emt/common/items/ItemCraftingComponents.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/modules/base/items/ItemCraftingComponents.java rename to src/main/java/tombenpotter/emt/common/items/ItemCraftingComponents.java index 6dbbf6b..496c631 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemCraftingComponents.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemCraftingComponents.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.base.items; +package tombenpotter.emt.common.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/ItemElectricScribingTools.java b/src/main/java/tombenpotter/emt/common/items/ItemElectricScribingTools.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/ItemElectricScribingTools.java rename to src/main/java/tombenpotter/emt/common/items/ItemElectricScribingTools.java index 002679f..da3676a 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/ItemElectricScribingTools.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemElectricScribingTools.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items; +package tombenpotter.emt.common.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/ItemIC2Baubles.java b/src/main/java/tombenpotter/emt/common/items/ItemIC2Baubles.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/ItemIC2Baubles.java rename to src/main/java/tombenpotter/emt/common/items/ItemIC2Baubles.java index cf86967..2c22041 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/ItemIC2Baubles.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemIC2Baubles.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.ic2.items; +package tombenpotter.emt.common.items; import baubles.api.BaubleType; import baubles.api.IBauble; @@ -19,7 +19,7 @@ import tombenpotter.emt.common.util.ConfigHandler; import java.util.List; import java.util.Random; -public class ItemIC2Baubles extends ItemIC2 implements IBauble { +public class ItemIC2Baubles extends ItemBase implements IBauble { public IIcon[] icon = new IIcon[16]; public static int wornTick; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemMaterials.java b/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/modules/base/items/ItemMaterials.java rename to src/main/java/tombenpotter/emt/common/items/ItemMaterials.java index 8c561e5..81b5b80 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemMaterials.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.base.items; +package tombenpotter.emt.common.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/BaseItemRegistry.java b/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java similarity index 50% rename from src/main/java/tombenpotter/emt/common/modules/base/items/BaseItemRegistry.java rename to src/main/java/tombenpotter/emt/common/items/ItemRegistry.java index 3830ed4..4c1a9f0 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/BaseItemRegistry.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java @@ -1,17 +1,42 @@ -package tombenpotter.emt.common.modules.base.items; +package tombenpotter.emt.common.items; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.ThaumcraftApi; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.base.items.foci.ItemChristmasFocus; -import tombenpotter.emt.common.modules.base.items.tools.*; +import tombenpotter.emt.common.items.armor.ItemFeatherWing; +import tombenpotter.emt.common.items.armor.ItemThaumiumReinforcedWing; +import tombenpotter.emt.common.items.armor.boots.ItemElectricBootsTraveller; +import tombenpotter.emt.common.items.armor.boots.ItemNanoBootsTraveller; +import tombenpotter.emt.common.items.armor.boots.ItemQuantumBootsTraveller; +import tombenpotter.emt.common.items.armor.goggles.ItemElectricGoggles; +import tombenpotter.emt.common.items.armor.goggles.ItemNanoGoggles; +import tombenpotter.emt.common.items.armor.goggles.ItemQuantumGoggles; +import tombenpotter.emt.common.items.armor.goggles.ItemSolarHelmetRevealing; +import tombenpotter.emt.common.items.armor.wings.ItemNanoWing; +import tombenpotter.emt.common.items.armor.wings.ItemQuantumWing; +import tombenpotter.emt.common.items.foci.ItemChargeFocus; +import tombenpotter.emt.common.items.foci.ItemChristmasFocus; +import tombenpotter.emt.common.items.foci.ItemExplosionFocus; +import tombenpotter.emt.common.items.foci.ItemShieldFocus; +import tombenpotter.emt.common.items.foci.ItemWandChargingFocus; +import tombenpotter.emt.common.items.tools.*; +import tombenpotter.emt.common.items.tools.chainsaws.ItemDiamondChainsaw; +import tombenpotter.emt.common.items.tools.chainsaws.ItemStreamChainsaw; +import tombenpotter.emt.common.items.tools.chainsaws.ItemThaumiumChainsaw; +import tombenpotter.emt.common.items.tools.drills.ItemRockbreakerDrill; +import tombenpotter.emt.common.items.tools.drills.ItemThaumiumDrill; +import tombenpotter.emt.common.items.tools.omnitools.ItemOmnitoolDiamond; +import tombenpotter.emt.common.items.tools.omnitools.ItemOmnitoolIron; +import tombenpotter.emt.common.items.tools.omnitools.ItemOmnitoolThaumium; -public class BaseItemRegistry { +public class ItemRegistry { //public static Item woodenDrill, stoneDrill, ironDrill, goldenDrill, diamondDrill, copperDrill, tinDrill, leadDrill, bronzeDrill; //public static Item woodenChainsaw, stoneChainsaw, ironChainsaw, goldenChainsaw, diamondChainsaw, copperChainsaw, tinChainsaw, leadChainsaw, bronzeChainsaw; @@ -20,6 +45,41 @@ public class BaseItemRegistry { public static Item baseBaubles, materials, craftingComponents; public static Item focusChristmas; + + public static Item thaumiumDrill; + public static Item thaumiumChainsaw; + public static Item quantumThaumicHelmet; + public static Item diamondChainsaw; + public static Item ironOmnitool; + public static Item diamondOmnitool; + public static Item thaumiumOmnitool; + public static Item nanoThaumicHelmet; + public static Item explosionFocus; + public static Item christmasFocus; + public static Item shieldFocus; + public static Item electricGoggles; + public static Item streamChainsaw; + public static Item rockbreakerDrill; + public static Item solarHelmetRevealing; + public static Item thorHammer; + public static Item taintedThorHammer; + public static Item electricThorHammer; + public static Item electricBootsTraveller; + public static Item quantumBootsTraveller; + public static Item nanoBootsTraveller; + public static Item electricScribingTools; + public static Item itemEMTItems; + public static Item electricHoeGrowth; + public static Item chargeFocus; + public static Item emtBauble; + public static Item wandChargeFocus; + public static Item featherWing; + public static Item thaumiumWing; + public static Item nanoWing; + public static Item quantumWing; + + public static ItemArmor.ArmorMaterial featherWingMaterial = EnumHelper.addArmorMaterial("FEATEHRWiNG", 1, new int[]{2, 2, 2, 2}, 6); + //public static Item.ToolMaterial copperMaterial = EnumHelper.addToolMaterial("copperToolMaterial", 2, 300, 6.0F, 2.0F, 14); //public static Item.ToolMaterial tinMaterial = EnumHelper.addToolMaterial("tinToolMatierial", 2, 200, 8.0F, 4F, 18); @@ -33,6 +93,79 @@ public class BaseItemRegistry { GameRegistry.registerItem(baseBaubles, "BaseBaubles"); focusChristmas = new ItemChristmasFocus(); GameRegistry.registerItem(focusChristmas, "FocusChristmas"); + + itemEMTItems = new ItemMaterials().setUnlocalizedName(ModInformation.modid + ".emtitems"); + GameRegistry.registerItem(itemEMTItems, "EMTItems"); + emtBauble = new ItemIC2Baubles().setUnlocalizedName(ModInformation.modid + ".emtbauble"); + GameRegistry.registerItem(emtBauble, "EMTBaubles"); + + electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.electric"); + GameRegistry.registerItem(electricGoggles, "ElectricGogglesRevealing"); + nanoThaumicHelmet = new ItemNanoGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.nano"); + GameRegistry.registerItem(nanoThaumicHelmet, "NanosuitGogglesRevealing"); + quantumThaumicHelmet = new ItemQuantumGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.quantum"); + GameRegistry.registerItem(quantumThaumicHelmet, "QuantumGogglesRevealing"); + solarHelmetRevealing = new ItemSolarHelmetRevealing(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.solar"); + GameRegistry.registerItem(solarHelmetRevealing, "SolarHelmetRevealing"); + + electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.electric"); + GameRegistry.registerItem(electricBootsTraveller, "ElectricBootsTraveller"); + nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.nano"); + GameRegistry.registerItem(nanoBootsTraveller, "NanoBootsTraveller"); + quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.quantum"); + GameRegistry.registerItem(quantumBootsTraveller, "QuantumBootsTraveller"); + + electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName(ModInformation.modid + ".scribingtools.electric"); + GameRegistry.registerItem(electricScribingTools, "ElectricScribingTools"); + + featherWing = new ItemFeatherWing(featherWingMaterial, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.feather"); + GameRegistry.registerItem(featherWing, "FeatherWing"); + thaumiumWing = new ItemThaumiumReinforcedWing(ThaumcraftApi.armorMatThaumium, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.thaumium"); + GameRegistry.registerItem(thaumiumWing, "ThaumiumWing"); + nanoWing = new ItemNanoWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.nano"); + GameRegistry.registerItem(nanoWing, "NanosuitWing"); + quantumWing = new ItemQuantumWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.quantum"); + GameRegistry.registerItem(quantumWing, "QuantumWing"); + + thorHammer = new ItemThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer"); + GameRegistry.registerItem(thorHammer, "Mjolnir"); + taintedThorHammer = new ItemThorHammerBroken().setUnlocalizedName(ModInformation.modid + ".hammer.broken"); + GameRegistry.registerItem(taintedThorHammer, "TaintedMjolnir"); + electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer.electric"); + GameRegistry.registerItem(electricThorHammer, "SuperchargedMjolnir"); + + thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName(ModInformation.modid + ".drill.thaumium"); + GameRegistry.registerItem(thaumiumDrill, "ThaumiumDrill"); + + diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.diamond"); + GameRegistry.registerItem(diamondChainsaw, "DiamondChainsaw"); + thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.thaumium"); + GameRegistry.registerItem(thaumiumChainsaw, "ThaumiumChainsaw"); + + ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName(ModInformation.modid + ".omnitool.iron"); + GameRegistry.registerItem(ironOmnitool, "Omnitool"); + diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName(ModInformation.modid + ".omnitool.diamond"); + GameRegistry.registerItem(diamondOmnitool, "Diamond Omnitool"); + thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName(ModInformation.modid + ".omnitool.thaumium"); + GameRegistry.registerItem(thaumiumOmnitool, "ThaumiumOmnitool"); + + streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.stream"); + GameRegistry.registerItem(streamChainsaw, "ChainsawStream"); + rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName(ModInformation.modid + ".drill.rockbreaker"); + GameRegistry.registerItem(rockbreakerDrill, "DrillRockbreaker"); + electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName(ModInformation.modid + ".hoeofgrowth.electric"); + GameRegistry.registerItem(electricHoeGrowth, "ElectricHoeGrowth"); + + explosionFocus = new ItemExplosionFocus(); + GameRegistry.registerItem(explosionFocus, "ExplosionFocus"); + christmasFocus = new ItemChristmasFocus(); + GameRegistry.registerItem(christmasFocus, "ChristmasFocus"); + shieldFocus = new ItemShieldFocus(); + GameRegistry.registerItem(shieldFocus, "ShieldFocus"); + chargeFocus = new ItemChargeFocus(); + GameRegistry.registerItem(chargeFocus, "ChargingFocus"); + wandChargeFocus = new ItemWandChargingFocus(); + GameRegistry.registerItem(wandChargeFocus, "WandChargingFocus"); //woodCarver = new ItemShardCarver(8).setUnlocalizedName(ModInformation.modid + ".carver.wood"); //GameRegistry.registerItem(woodCarver, "woodCarver"); diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemShardCarver.java b/src/main/java/tombenpotter/emt/common/items/ItemShardCarver.java similarity index 86% rename from src/main/java/tombenpotter/emt/common/modules/base/items/ItemShardCarver.java rename to src/main/java/tombenpotter/emt/common/items/ItemShardCarver.java index de6c3c2..987965c 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/ItemShardCarver.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemShardCarver.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.base.items; +package tombenpotter.emt.common.items; import net.minecraft.item.Item; import tombenpotter.emt.ElectroMagicTools; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/armor/ItemFeatherWing.java b/src/main/java/tombenpotter/emt/common/items/armor/ItemFeatherWing.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/modules/base/items/armor/ItemFeatherWing.java rename to src/main/java/tombenpotter/emt/common/items/armor/ItemFeatherWing.java index 293e0c2..b6df29a 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/armor/ItemFeatherWing.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/ItemFeatherWing.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.base.items.armor; +package tombenpotter.emt.common.items.armor; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/armor/ItemThaumiumReinforcedWing.java b/src/main/java/tombenpotter/emt/common/items/armor/ItemThaumiumReinforcedWing.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/base/items/armor/ItemThaumiumReinforcedWing.java rename to src/main/java/tombenpotter/emt/common/items/armor/ItemThaumiumReinforcedWing.java index 5a98a7e..3cfd88b 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/armor/ItemThaumiumReinforcedWing.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/ItemThaumiumReinforcedWing.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.base.items.armor; +package tombenpotter.emt.common.items.armor; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemElectricBootsTraveller.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemElectricBootsTraveller.java rename to src/main/java/tombenpotter/emt/common/items/armor/boots/ItemElectricBootsTraveller.java index abde72f..a6d5628 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemElectricBootsTraveller.java @@ -19,7 +19,7 @@ * http://www.minecraftforum.net/topic/1813058- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.armor.boots; +package tombenpotter.emt.common.items.armor.boots; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemNanoBootsTraveller.java b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemNanoBootsTraveller.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemNanoBootsTraveller.java rename to src/main/java/tombenpotter/emt/common/items/armor/boots/ItemNanoBootsTraveller.java index de9e478..b1a9c90 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemNanoBootsTraveller.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemNanoBootsTraveller.java @@ -19,7 +19,7 @@ * http://www.minecraftforum.net/topic/1813058- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.armor.boots; +package tombenpotter.emt.common.items.armor.boots; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemQuantumBootsTraveller.java b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemQuantumBootsTraveller.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemQuantumBootsTraveller.java rename to src/main/java/tombenpotter/emt/common/items/armor/boots/ItemQuantumBootsTraveller.java index a9740c3..845c515 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemQuantumBootsTraveller.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemQuantumBootsTraveller.java @@ -19,7 +19,7 @@ * http://www.minecraftforum.net/topic/1813058- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.armor.boots; +package tombenpotter.emt.common.items.armor.boots; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemElectricGoggles.java b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemElectricGoggles.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemElectricGoggles.java rename to src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemElectricGoggles.java index 368cf00..fb9ebe5 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemElectricGoggles.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemElectricGoggles.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.armor.goggles; +package tombenpotter.emt.common.items.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemNanoGoggles.java b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemNanoGoggles.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemNanoGoggles.java rename to src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemNanoGoggles.java index fe7eaa0..7693db8 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemNanoGoggles.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemNanoGoggles.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.armor.goggles; +package tombenpotter.emt.common.items.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemQuantumGoggles.java b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemQuantumGoggles.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemQuantumGoggles.java rename to src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemQuantumGoggles.java index 473e66c..46c0550 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemQuantumGoggles.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemQuantumGoggles.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.armor.goggles; +package tombenpotter.emt.common.items.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemSolarHelmetRevealing.java b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemSolarHelmetRevealing.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemSolarHelmetRevealing.java rename to src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemSolarHelmetRevealing.java index fcc3cf1..d30d90f 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemSolarHelmetRevealing.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemSolarHelmetRevealing.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.armor.goggles; +package tombenpotter.emt.common.items.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/wings/ItemNanoWing.java b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/wings/ItemNanoWing.java rename to src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java index 69f75f5..a91059d 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/wings/ItemNanoWing.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.ic2.items.armor.wings; +package tombenpotter.emt.common.items.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,7 +18,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.base.items.armor.ItemThaumiumReinforcedWing; +import tombenpotter.emt.common.items.armor.ItemThaumiumReinforcedWing; import tombenpotter.emt.common.util.ConfigHandler; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/wings/ItemQuantumWing.java b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/wings/ItemQuantumWing.java rename to src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java index b74126b..28d15dc 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/wings/ItemQuantumWing.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.ic2.items.armor.wings; +package tombenpotter.emt.common.items.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTMachines.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTMachines.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTMachines.java rename to src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTMachines.java index 245b8c1..b95d7ed 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTMachines.java +++ b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTMachines.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.blocks; +package tombenpotter.emt.common.items.blocks; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTSolars.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTSolars.java rename to src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars.java index 3c8d5a6..c171985 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTSolars.java +++ b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.blocks; +package tombenpotter.emt.common.items.blocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTSolars2.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars2.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTSolars2.java rename to src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars2.java index c7b9335..0d921ff 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTSolars2.java +++ b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars2.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.blocks; +package tombenpotter.emt.common.items.blocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEssentiaGenerator.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerator.java similarity index 88% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEssentiaGenerator.java rename to src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerator.java index ef2d217..6166996 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEssentiaGenerator.java +++ b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerator.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.ic2.items.blocks; +package tombenpotter.emt.common.items.blocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEssentiaGenerators.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerators.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEssentiaGenerators.java rename to src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerators.java index fae6e6f..252fb0a 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEssentiaGenerators.java +++ b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerators.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.blocks; +package tombenpotter.emt.common.items.blocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemBaseFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemBaseFocus.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemBaseFocus.java rename to src/main/java/tombenpotter/emt/common/items/foci/ItemBaseFocus.java index 5a793b0..e88eff6 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemBaseFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemBaseFocus.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.base.items.foci; +package tombenpotter.emt.common.items.foci; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemChargeFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemChargeFocus.java rename to src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java index c086c42..29942a0 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemChargeFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.foci; +package tombenpotter.emt.common.items.foci; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; @@ -21,7 +21,7 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.modules.base.items.foci.ItemBaseFocus; +import tombenpotter.emt.common.items.foci.ItemBaseFocus; import tombenpotter.emt.common.util.ConfigHandler; public class ItemChargeFocus extends ItemBaseFocus { diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java rename to src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java index ed2691b..aca5748 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.base.items.foci; +package tombenpotter.emt.common.items.foci; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemExplosionFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemExplosionFocus.java rename to src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java index b68f5c4..7715068 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemExplosionFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.base.items.foci; +package tombenpotter.emt.common.items.foci; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -20,7 +20,7 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.modules.base.entities.EntityLaser; +import tombenpotter.emt.common.entities.EntityLaser; public class ItemExplosionFocus extends ItemBaseFocus { diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemShieldFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java similarity index 73% rename from src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemShieldFocus.java rename to src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java index 5deec24..683e00e 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemShieldFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.base.items.foci; +package tombenpotter.emt.common.items.foci; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -23,7 +23,7 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.blocks.BlockRegistry; public class ItemShieldFocus extends ItemBaseFocus { @@ -71,18 +71,18 @@ public class ItemShieldFocus extends ItemBaseFocus { // Player Level if (player.worldObj.isAirBlock(x + 1, y, z) && player.worldObj.isAirBlock(x - 1, y, z) && player.worldObj.isAirBlock(x, y, z + 1) && player.worldObj.isAirBlock(x, y, z - 1)) { - player.worldObj.setBlock(x + 1, y, z, IC2BlockRegistry.shield); - player.worldObj.setBlock(x - 1, y, z, IC2BlockRegistry.shield); - player.worldObj.setBlock(x, y, z + 1, IC2BlockRegistry.shield); - player.worldObj.setBlock(x, y, z - 1, IC2BlockRegistry.shield); + player.worldObj.setBlock(x + 1, y, z, BlockRegistry.shield); + player.worldObj.setBlock(x - 1, y, z, BlockRegistry.shield); + player.worldObj.setBlock(x, y, z + 1, BlockRegistry.shield); + player.worldObj.setBlock(x, y, z - 1, BlockRegistry.shield); } // Above the player if (player.worldObj.isAirBlock(x + 1, y + 1, z) && player.worldObj.isAirBlock(x - 1, y + 1, z) && player.worldObj.isAirBlock(x, y + 1, z + 1) && player.worldObj.isAirBlock(x, y + 1, z - 1)) { - player.worldObj.setBlock(x + 1, y + 1, z, IC2BlockRegistry.shield); - player.worldObj.setBlock(x - 1, y + 1, z, IC2BlockRegistry.shield); - player.worldObj.setBlock(x, y + 1, z + 1, IC2BlockRegistry.shield); - player.worldObj.setBlock(x, y + 1, z - 1, IC2BlockRegistry.shield); + player.worldObj.setBlock(x + 1, y + 1, z, BlockRegistry.shield); + player.worldObj.setBlock(x - 1, y + 1, z, BlockRegistry.shield); + player.worldObj.setBlock(x, y + 1, z + 1, BlockRegistry.shield); + player.worldObj.setBlock(x, y + 1, z - 1, BlockRegistry.shield); } } } @@ -94,7 +94,7 @@ public class ItemShieldFocus extends ItemBaseFocus { int z = MathHelper.floor_double(player.posZ); // Player Level - if ((player.worldObj.getBlock(x + 1, y, z) == IC2BlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y, z) == IC2BlockRegistry.shield) && (player.worldObj.getBlock(x, y, z + 1) == IC2BlockRegistry.shield) && (player.worldObj.getBlock(x, y, z - 1) == IC2BlockRegistry.shield)) { + if ((player.worldObj.getBlock(x + 1, y, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y, z + 1) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y, z - 1) == BlockRegistry.shield)) { player.worldObj.setBlockToAir(x + 1, y, z); player.worldObj.setBlockToAir(x - 1, y, z); player.worldObj.setBlockToAir(x, y, z + 1); @@ -102,7 +102,7 @@ public class ItemShieldFocus extends ItemBaseFocus { } // Above the player - if ((player.worldObj.getBlock(x + 1, y + 1, z) == IC2BlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y + 1, z) == IC2BlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z + 1) == IC2BlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z - 1) == IC2BlockRegistry.shield)) { + if ((player.worldObj.getBlock(x + 1, y + 1, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y + 1, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z + 1) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z - 1) == BlockRegistry.shield)) { player.worldObj.setBlockToAir(x + 1, y + 1, z); player.worldObj.setBlockToAir(x - 1, y + 1, z); player.worldObj.setBlockToAir(x, y + 1, z + 1); diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemWandChargingFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemWandChargingFocus.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemWandChargingFocus.java rename to src/main/java/tombenpotter/emt/common/items/foci/ItemWandChargingFocus.java index 13585a9..b2a0942 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemWandChargingFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemWandChargingFocus.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.ic2.items.foci; +package tombenpotter.emt.common.items.foci; import ic2.api.item.ElectricItem; import net.minecraft.entity.player.EntityPlayer; @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.modules.base.items.foci.ItemBaseFocus; +import tombenpotter.emt.common.items.foci.ItemBaseFocus; import tombenpotter.emt.common.util.ConfigHandler; public class ItemWandChargingFocus extends ItemBaseFocus { diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/ItemElectricHoeGrowth.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/ItemElectricHoeGrowth.java rename to src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java index b4dcf5b..3d7f99b 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/ItemElectricHoeGrowth.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.tools; +package tombenpotter.emt.common.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/ItemElectricThorHammer.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricThorHammer.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/ItemElectricThorHammer.java rename to src/main/java/tombenpotter/emt/common/items/tools/ItemElectricThorHammer.java index 67ba9f4..47c2278 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/ItemElectricThorHammer.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricThorHammer.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.tools; +package tombenpotter.emt.common.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -30,7 +30,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.base.entities.EntityArcher; +import tombenpotter.emt.common.entities.EntityArcher; import tombenpotter.emt.common.util.ConfigHandler; import tombenpotter.emt.common.util.TextHelper; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/tools/ItemThorHammer.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammer.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/base/items/tools/ItemThorHammer.java rename to src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammer.java index 9d94e56..e2938a8 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/tools/ItemThorHammer.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammer.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.base.items.tools; +package tombenpotter.emt.common.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/tools/ItemThorHammerBroken.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammerBroken.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/base/items/tools/ItemThorHammerBroken.java rename to src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammerBroken.java index 3bc5e26..33bcfe7 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/tools/ItemThorHammerBroken.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammerBroken.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.base.items.tools; +package tombenpotter.emt.common.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/tools/ItemVanillaChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaChainsaw.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/modules/base/items/tools/ItemVanillaChainsaw.java rename to src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaChainsaw.java index 64723cd..31d1eb0 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/tools/ItemVanillaChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaChainsaw.java @@ -1,11 +1,11 @@ -package tombenpotter.emt.common.modules.base.items.tools; +package tombenpotter.emt.common.items.tools; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import tombenpotter.emt.common.modules.base.items.ItemBaseChainsaw; +import tombenpotter.emt.common.items.ItemBaseChainsaw; import tombenpotter.emt.common.util.IRefillable; public class ItemVanillaChainsaw extends ItemBaseChainsaw implements IRefillable { diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/tools/ItemVanillaDrill.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaDrill.java similarity index 88% rename from src/main/java/tombenpotter/emt/common/modules/base/items/tools/ItemVanillaDrill.java rename to src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaDrill.java index bfa66a0..f6990f2 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/tools/ItemVanillaDrill.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaDrill.java @@ -1,9 +1,9 @@ -package tombenpotter.emt.common.modules.base.items.tools; +package tombenpotter.emt.common.items.tools; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.base.items.ItemBaseDrill; +import tombenpotter.emt.common.items.ItemBaseDrill; import tombenpotter.emt.common.util.IRefillable; public class ItemVanillaDrill extends ItemBaseDrill implements IRefillable { diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/tools/ItemVanillaOmnitool.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaOmnitool.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/modules/base/items/tools/ItemVanillaOmnitool.java rename to src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaOmnitool.java index e1bd4bc..1c887cf 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/tools/ItemVanillaOmnitool.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaOmnitool.java @@ -1,11 +1,11 @@ -package tombenpotter.emt.common.modules.base.items.tools; +package tombenpotter.emt.common.items.tools; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import tombenpotter.emt.common.modules.base.items.ItemBaseOmnitool; +import tombenpotter.emt.common.items.ItemBaseOmnitool; import tombenpotter.emt.common.util.IRefillable; public class ItemVanillaOmnitool extends ItemBaseOmnitool implements IRefillable{ diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemDiamondChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemDiamondChainsaw.java rename to src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java index fa76762..1e1c000 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemDiamondChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.tools.chainsaws; +package tombenpotter.emt.common.items.tools.chainsaws; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemStreamChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemStreamChainsaw.java rename to src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java index 03d4dcd..3324658 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemStreamChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java @@ -12,7 +12,7 @@ * This class originally belongs to Azanor, but with his permission I took it, and modified it to make it work as I wanted to. ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.tools.chainsaws; +package tombenpotter.emt.common.items.tools.chainsaws; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemThaumiumChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemThaumiumChainsaw.java rename to src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java index db78b90..5dde992 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemThaumiumChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.tools.chainsaws; +package tombenpotter.emt.common.items.tools.chainsaws; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/drills/ItemRockbreakerDrill.java b/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/drills/ItemRockbreakerDrill.java rename to src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java index cea29db..7dcf24e 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/drills/ItemRockbreakerDrill.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java @@ -12,7 +12,7 @@ * This class originally belongs to Azanor, but with his permission I took it, and modified it to make it work as I wanted to. ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.tools.drills; +package tombenpotter.emt.common.items.tools.drills; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/drills/ItemThaumiumDrill.java b/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemThaumiumDrill.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/drills/ItemThaumiumDrill.java rename to src/main/java/tombenpotter/emt/common/items/tools/drills/ItemThaumiumDrill.java index 201d846..e0ee43f 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/drills/ItemThaumiumDrill.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemThaumiumDrill.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.tools.drills; +package tombenpotter.emt.common.items.tools.drills; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolDiamond.java b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolDiamond.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolDiamond.java rename to src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolDiamond.java index a786189..79eef35 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolDiamond.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolDiamond.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.tools.omnitools; +package tombenpotter.emt.common.items.tools.omnitools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolIron.java b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolIron.java rename to src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java index aa4f3df..245f6d4 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolIron.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.tools.omnitools; +package tombenpotter.emt.common.items.tools.omnitools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolThaumium.java b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolThaumium.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolThaumium.java rename to src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolThaumium.java index e043df0..355a3e7 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolThaumium.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolThaumium.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.items.tools.omnitools; +package tombenpotter.emt.common.items.tools.omnitools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java b/src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java deleted file mode 100644 index ea96d41..0000000 --- a/src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java +++ /dev/null @@ -1,56 +0,0 @@ -package tombenpotter.emt.common.modules; - -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.common.modules.base.BaseRecipeRegistry; -import tombenpotter.emt.common.modules.base.blocks.BaseBlockRegistry; -import tombenpotter.emt.common.modules.base.items.BaseItemRegistry; -import tombenpotter.emt.common.modules.base.tile.BaseTileRegistry; -import tombenpotter.emt.common.modules.ic2.IC2RecipeRegistry; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; -import tombenpotter.emt.common.modules.ic2.tile.IC2TileRegistry; -import tombenpotter.emt.common.modules.te.TERecipeRegistry; -import tombenpotter.emt.common.modules.te.blocks.TEBlockRegistry; -import tombenpotter.emt.common.modules.te.items.TEItemRegistry; -import tombenpotter.emt.common.util.ConfigHandler; - -import static tombenpotter.emt.common.util.TextHelper.localize; - -public class ModuleRegistry { - - public static void registerModules() { - - BaseBlockRegistry.registerBaseBlocks(); - BaseItemRegistry.registerItems(); - BaseTileRegistry.registerBaseTiles(); - BaseRecipeRegistry.registerRecipes(); - - if (ConfigHandler.enableIC2Module) { - IC2BlockRegistry.registerBlocks(); - IC2ItemRegistry.registerItems(); - IC2TileRegistry.registerTEs(); - ElectroMagicTools.logger.info(localize("console.EMT.init.recipes")); - IC2RecipeRegistry.registerEarlyRecipes(); - } - - if (ConfigHandler.enableTEModule) { - TEBlockRegistry.registerTEBlocks(); - TEItemRegistry.registerTEItems(); - TERecipeRegistry.registerTERecipes(); - } - } - - public static void registerLateModules() { - - if (ConfigHandler.enableIC2Module) { - ElectroMagicTools.logger.info(localize("console.EMT.postInit.recipes")); - IC2RecipeRegistry.registerLateRecipes(); - ElectroMagicTools.logger.info(localize("console.EMT.postInit.recipes.uumatter")); - IC2RecipeRegistry.registerUUMInfusionRecipes(); - } - - if (ConfigHandler.enableTEModule) { - // do stuff - } - } -} diff --git a/src/main/java/tombenpotter/emt/common/modules/base/BaseItemStacks.java b/src/main/java/tombenpotter/emt/common/modules/base/BaseItemStacks.java deleted file mode 100644 index c80d66a..0000000 --- a/src/main/java/tombenpotter/emt/common/modules/base/BaseItemStacks.java +++ /dev/null @@ -1,79 +0,0 @@ -package tombenpotter.emt.common.modules.base; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import tombenpotter.emt.common.modules.base.items.BaseItemRegistry; - -public class BaseItemStacks { - //public static ItemStack woodenDrill = new ItemStack(BaseItemRegistry.woodenDrill); - //public static ItemStack stoneDrill = new ItemStack(BaseItemRegistry.stoneDrill); - //public static ItemStack ironDrill = new ItemStack(BaseItemRegistry.ironDrill); - //public static ItemStack goldenDrill = new ItemStack(BaseItemRegistry.goldenDrill); - //public static ItemStack diamondDrill = new ItemStack(BaseItemRegistry.diamondDrill); - //public static ItemStack copperDrill = new ItemStack(BaseItemRegistry.copperDrill); - //public static ItemStack tinDrill = new ItemStack(BaseItemRegistry.tinDrill); - //public static ItemStack leadDrill = new ItemStack(BaseItemRegistry.leadDrill); - //public static ItemStack bronzeDrill = new ItemStack(BaseItemRegistry.bronzeDrill); - - //public static ItemStack woodenChainsaw = new ItemStack(BaseItemRegistry.woodenChainsaw); - //public static ItemStack stoneChainsaw = new ItemStack(BaseItemRegistry.stoneChainsaw); - //public static ItemStack ironChainsaw = new ItemStack(BaseItemRegistry.ironChainsaw); - //public static ItemStack goldenChainsaw = new ItemStack(BaseItemRegistry.goldenChainsaw); - //public static ItemStack diamondChainsaw = new ItemStack(BaseItemRegistry.diamondChainsaw); - //public static ItemStack copperChainsaw = new ItemStack(BaseItemRegistry.copperChainsaw); - //public static ItemStack tinChainsaw = new ItemStack(BaseItemRegistry.tinChainsaw); - //public static ItemStack leadChainsaw = new ItemStack(BaseItemRegistry.leadChainsaw); - //public static ItemStack bronzeChainsaw = new ItemStack(BaseItemRegistry.bronzeChainsaw); - - //public static ItemStack ironOmnitool = new ItemStack(BaseItemRegistry.ironOmnitool); - //public static ItemStack goldenOmnitool = new ItemStack(BaseItemRegistry.goldenOmnitool); - //public static ItemStack diamondOmnitool = new ItemStack(BaseItemRegistry.diamondOmnitool); - //public static ItemStack copperOmnitool = new ItemStack(BaseItemRegistry.copperOmnitool); - //public static ItemStack tinOmnitool = new ItemStack(BaseItemRegistry.tinOmnitool); - //public static ItemStack leadOmnitool = new ItemStack(BaseItemRegistry.leadOmnitool); - //public static ItemStack bronzeOmnitool = new ItemStack(BaseItemRegistry.bronzeOmnitool); - - public static ItemStack woodenDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 0); - public static ItemStack stoneDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 1); - public static ItemStack ironDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 2); - public static ItemStack goldenDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 3); - public static ItemStack diamondDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 4); - public static ItemStack copperDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 5); - public static ItemStack tinDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 6); - public static ItemStack leadDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 7); - public static ItemStack bronzeDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 8); - - public static ItemStack woodenChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 9); - public static ItemStack stoneChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 10); - public static ItemStack ironChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 11); - public static ItemStack goldenChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 12); - public static ItemStack diamondChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 13); - public static ItemStack copperChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 14); - public static ItemStack tinChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 15); - public static ItemStack leadChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 16); - public static ItemStack bronzeChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 17); - - public static ItemStack ironOmnitoolTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 18); - public static ItemStack goldenOmnitoolTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 19); - public static ItemStack diamondOmnitoolTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 20); - public static ItemStack copperOmnitoolTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 21); - public static ItemStack tinOmnitoolTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 22); - public static ItemStack leadOmnitoolTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 23); - public static ItemStack bronzeOmnitoolTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 24); - - public static ItemStack woodenShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 25); - public static ItemStack stoneShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 26); - public static ItemStack ironShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 27); - public static ItemStack goldenShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 28); - public static ItemStack obsidianShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 29); - public static ItemStack copperShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 30); - public static ItemStack tinShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 31); - public static ItemStack leadShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 32); - public static ItemStack bronzeShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 33); - - //public static ItemStack woodenCarver = new ItemStack(BaseItemRegistry.woodCarver, 1, OreDictionary.WILDCARD_VALUE); - //public static ItemStack stoneCarver = new ItemStack(BaseItemRegistry.stoneCarver, 1, OreDictionary.WILDCARD_VALUE); - //public static ItemStack ironCarver = new ItemStack(BaseItemRegistry.ironCarver, 1, OreDictionary.WILDCARD_VALUE); - //public static ItemStack obsidianCarver = new ItemStack(BaseItemRegistry.obsidianCarver, 1, OreDictionary.WILDCARD_VALUE); - //public static ItemStack diamondCarver = new ItemStack(BaseItemRegistry.obsidianCarver, 1, OreDictionary.WILDCARD_VALUE); -} diff --git a/src/main/java/tombenpotter/emt/common/modules/base/BaseRecipeRegistry.java b/src/main/java/tombenpotter/emt/common/modules/base/BaseRecipeRegistry.java deleted file mode 100644 index 08883b2..0000000 --- a/src/main/java/tombenpotter/emt/common/modules/base/BaseRecipeRegistry.java +++ /dev/null @@ -1,188 +0,0 @@ -package tombenpotter.emt.common.modules.base; - -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.oredict.OreDictionary; - -public class BaseRecipeRegistry { - - public static IRecipe woodenDrill, stoneDrill, ironDrill, goldenDrill, diamondDrill, copperDrill, tinDrill, leadDrill, bronzeDrill; - public static IRecipe woodenChainsaw, stoneChainsaw, ironChainsaw, goldenChainsaw, diamondChainsaw, copperChainsaw, tinChainsaw, leadChainsaw, bronzeChainsaw; - public static IRecipe ironOmnitool, goldenOmnitool, diamondOmnitool, copperOmnitool, tinOmnitool, leadOmnitool, bronzeOmnitool; - public static IRecipe woodenDrillTop, stoneDrillTop, ironDrillTop, goldenDrillTop, diamondDrillTop, copperDrillTop, tinDrillTop, leadDrillTop, bronzeDrillTop; - public static IRecipe woodenChainsawTop, stoneChainsawTop, ironChainsawTop, goldenChainsawTop, diamondChainsawTop, copperChainsawTop, tinChainsawTop, leadChainsawTop, bronzeChainsawTop; - public static IRecipe woodenCarver, stoneCarver, ironCarver, obsidianCarver, diamondCarver; - - public static void registerRecipes() { - addMiscRecipes(); - addCarversRecipes(); - addShardsRecipes(); - addDrillTopRecipes(); - addDrillRecipe(); - addChainsawTopRecipes(); - addChainsawRecipes(); - } - - public static void addMiscRecipes() { - } - - public static void addCarversRecipes() { - //for (int i = 0; i < OreDictionary.getOres("logWood").size(); i++) { - // woodenCarver = GameRegistry.addShapedRecipe(BaseItemStacks.woodenCarver, " X ", "YYY", 'X', Items.flint, 'Y', OreDictionary.getOres("logWood").get(i)); - //} - //stoneCarver = GameRegistry.addShapedRecipe(BaseItemStacks.stoneCarver, " X ", "YYY", 'X', Items.flint, 'Y', Blocks.stone); - //ironCarver = GameRegistry.addShapedRecipe(BaseItemStacks.ironCarver, " X ", "YYY", 'X', BaseItemStacks.ironShard, 'Y', Blocks.stone); - //obsidianCarver = GameRegistry.addShapedRecipe(BaseItemStacks.obsidianCarver, " X ", "YYY", 'X', BaseItemStacks.ironShard, 'Y', Blocks.obsidian); - //diamondCarver = GameRegistry.addShapedRecipe(BaseItemStacks.ironCarver, " X ", "YYY", "ZZZ", 'X', BaseItemStacks.obsidianShard, 'Y', Items.diamond, 'Z', Blocks.obsidian); - } - - public static void addShardsRecipes() { - addCarverRecipe(BaseItemStacks.woodenShard, "logWood"); - addCarverRecipe(BaseItemStacks.stoneShard, "stone"); - addCarverRecipe(BaseItemStacks.ironShard, "ingotIron"); - addCarverRecipe(BaseItemStacks.goldenShard, "ingotGold"); - addCarverRecipe(BaseItemStacks.obsidianShard, new ItemStack(Blocks.obsidian)); - - if (isOreRegistered("ingotCopper")) - addCarverRecipe(BaseItemStacks.copperShard, "ingotCopper"); - if (isOreRegistered("ingotTin")) - addCarverRecipe(BaseItemStacks.tinShard, "ingotTin"); - if (isOreRegistered("ingotLead")) - addCarverRecipe(BaseItemStacks.leadShard, "ingotLead"); - if (isOreRegistered("ingotBronze")) - addCarverRecipe(BaseItemStacks.bronzeShard, "ingotBronze"); - } - - public static void addDrillTopRecipes() { - woodenDrillTop = drillTopRecipe(BaseItemStacks.woodenDrillTop, "plankWood", BaseItemStacks.woodenShard); - stoneDrillTop = drillTopRecipe(BaseItemStacks.stoneDrillTop, "stone", BaseItemStacks.stoneShard); - ironDrillTop = drillTopRecipe(BaseItemStacks.ironDrillTop, "ingotIron", BaseItemStacks.ironShard); - goldenDrillTop = drillTopRecipe(BaseItemStacks.goldenDrillTop, "ingotGold", BaseItemStacks.goldenShard); - diamondDrillTop = drillTopRecipe(BaseItemStacks.diamondDrillTop, "gemDiamond", BaseItemStacks.obsidianShard); - - if (isOreRegistered("ingotCopper")) - copperDrillTop = drillTopRecipe(BaseItemStacks.copperDrillTop, "ingotCopper", BaseItemStacks.copperShard); - if (isOreRegistered("ingotTin")) - tinDrillTop = drillTopRecipe(BaseItemStacks.tinDrillTop, "ingotTin", BaseItemStacks.tinShard); - if (isOreRegistered("ingotLead")) - leadDrillTop = drillTopRecipe(BaseItemStacks.leadDrillTop, "ingotLead", BaseItemStacks.leadShard); - if (isOreRegistered("ingotBronze")) - bronzeDrillTop = drillTopRecipe(BaseItemStacks.bronzeDrillTop, "ingotBronze", BaseItemStacks.bronzeShard); - } - - public static void addChainsawTopRecipes() { - woodenChainsawTop = chainsawTopRecipe(BaseItemStacks.woodenChainsawTop, "plankWood", BaseItemStacks.woodenShard); - stoneChainsawTop = chainsawTopRecipe(BaseItemStacks.stoneChainsawTop, "stone", BaseItemStacks.stoneShard); - ironChainsawTop = chainsawTopRecipe(BaseItemStacks.ironChainsawTop, "ingotIron", BaseItemStacks.ironShard); - goldenChainsawTop = chainsawTopRecipe(BaseItemStacks.goldenChainsawTop, "ingotGold", BaseItemStacks.goldenShard); - diamondChainsawTop = chainsawTopRecipe(BaseItemStacks.diamondChainsawTop, "gemDiamond", BaseItemStacks.obsidianShard); - - if (isOreRegistered("ingotCopper")) - copperChainsawTop = chainsawTopRecipe(BaseItemStacks.copperChainsawTop, "ingotCopper", BaseItemStacks.copperShard); - if (isOreRegistered("ingotTin")) - tinChainsawTop = chainsawTopRecipe(BaseItemStacks.tinChainsawTop, "ingotTin", BaseItemStacks.tinShard); - if (isOreRegistered("ingotLead")) - leadChainsawTop = chainsawTopRecipe(BaseItemStacks.leadChainsawTop, "ingotLead", BaseItemStacks.leadShard); - if (isOreRegistered("ingotBronze")) - bronzeChainsawTop = chainsawTopRecipe(BaseItemStacks.bronzeChainsawTop, "ingotBronze", BaseItemStacks.bronzeShard); - } - - public static void addDrillRecipe() { - //woodenDrill = toolRecipe(BaseItemStacks.woodenDrill, BaseItemStacks.woodenDrillTop, "plankWood", "stickWood"); - //stoneDrill = toolRecipe(BaseItemStacks.stoneDrill, BaseItemStacks.stoneDrillTop, "stone", "cobblestone"); - //ironDrill = toolRecipe(BaseItemStacks.ironDrill, BaseItemStacks.ironDrillTop, "ingotIron", new ItemStack(Items.leather)); - //goldenDrill = toolRecipe(BaseItemStacks.goldenDrill, BaseItemStacks.goldenDrillTop, "ingotGold", new ItemStack(Blocks.obsidian)); - //diamondDrill = toolRecipe(BaseItemStacks.diamondDrill, BaseItemStacks.diamondDrillTop, "gemDiamond", "ingotGold"); - // - //if (isOreRegistered("ingotCopper") && isOreRegistered("ingotTin")) - // copperDrill = toolRecipe(BaseItemStacks.copperDrill, BaseItemStacks.copperDrillTop, "ingotCopper", "ingotTin"); - //if (isOreRegistered("ingotTin")) - // tinDrill = toolRecipe(BaseItemStacks.tinDrill, BaseItemStacks.tinDrillTop, "ingotTin", "ingotGold"); - //if (isOreRegistered("ingotLead")) - // leadDrill = toolRecipe(BaseItemStacks.leadDrill, BaseItemStacks.leadDrillTop, "ingotLead", "ingotIron"); - //if (isOreRegistered("ingotBronze")) - // bronzeDrill = toolRecipe(BaseItemStacks.bronzeDrill, BaseItemStacks.bronzeDrillTop, "ingotBronze", new ItemStack(Blocks.obsidian)); - } - - public static void addChainsawRecipes() { - //woodenChainsaw = toolRecipe(BaseItemStacks.woodenChainsaw, BaseItemStacks.woodenChainsawTop, "plankWood", "stickWood"); - //stoneChainsaw = toolRecipe(BaseItemStacks.stoneChainsaw, BaseItemStacks.stoneChainsawTop, "stone", "cobblestone"); - //ironChainsaw = toolRecipe(BaseItemStacks.ironChainsaw, BaseItemStacks.ironChainsawTop, "ingotIron", new ItemStack(Items.leather)); - //goldenChainsaw = toolRecipe(BaseItemStacks.goldenChainsaw, BaseItemStacks.goldenChainsawTop, "ingotGold", new ItemStack(Blocks.obsidian)); - //diamondChainsaw = toolRecipe(BaseItemStacks.diamondChainsaw, BaseItemStacks.diamondChainsawTop, "gemDiamond", "ingotGold"); - // - //if (isOreRegistered("ingotCopper") && isOreRegistered("ingotTin")) - // copperChainsaw = toolRecipe(BaseItemStacks.copperChainsaw, BaseItemStacks.copperChainsawTop, "ingotCopper", "ingotTin"); - //if (isOreRegistered("ingotTin")) - // tinChainsaw = toolRecipe(BaseItemStacks.tinChainsaw, BaseItemStacks.tinChainsawTop, "ingotTin", "ingotGold"); - //if (isOreRegistered("ingotLead")) - // leadChainsaw = toolRecipe(BaseItemStacks.leadChainsaw, BaseItemStacks.leadChainsawTop, "ingotLead", "ingotIron"); - //if (isOreRegistered("ingotBronze")) - // bronzeChainsaw = toolRecipe(BaseItemStacks.bronzeChainsaw, BaseItemStacks.bronzeChainsawTop, "ingotBronze", new ItemStack(Blocks.obsidian)); - } - - public static IRecipe toolRecipe(ItemStack output, ItemStack X, String Y, ItemStack Z) { - if (isOreRegistered(Y)) { - for (int i = 0; i < OreDictionary.getOres(Y).size(); i++) { - return GameRegistry.addShapedRecipe(output, " X ", " Y ", "YZY", 'X', X, 'Y', OreDictionary.getOres(Y).get(i), 'Z', Z); - } - } - return null; - } - - public static IRecipe toolRecipe(ItemStack output, ItemStack X, String Y, String Z) { - if (isOreRegistered(Y) && isOreRegistered(Z)) { - for (int i = 0; i < OreDictionary.getOres(Y).size(); i++) { - for (int j = 0; j < OreDictionary.getOres(Z).size(); j++) { - return GameRegistry.addShapedRecipe(output, " X ", " Y ", "YZY", 'X', X, 'Y', OreDictionary.getOres(Y).get(j), 'Z', OreDictionary.getOres(Z).get(i)); - } - } - } - return null; - } - - public static IRecipe drillTopRecipe(ItemStack output, String X, ItemStack Y) { - if (isOreRegistered(X)) { - for (int i = 0; i < OreDictionary.getOres(X).size(); i++) { - return GameRegistry.addShapedRecipe(output, " Y ", "XXX", 'X', OreDictionary.getOres(X).get(i), 'Y', Y); - } - } - return null; - } - - public static IRecipe chainsawTopRecipe(ItemStack output, String X, ItemStack Y) { - if (isOreRegistered(X)) { - for (int i = 0; i < OreDictionary.getOres(X).size(); i++) { - return GameRegistry.addShapedRecipe(output, " Y ", "XYX", "XYX", 'X', OreDictionary.getOres(X).get(i), 'Y', Y); - } - } - return null; - } - - public static void addCarverRecipe(ItemStack output, ItemStack input) { - //GameRegistry.addShapelessRecipe(output, BaseItemStacks.woodenCarver, input); - //GameRegistry.addShapelessRecipe(output, BaseItemStacks.stoneCarver, input); - //GameRegistry.addShapelessRecipe(output, BaseItemStacks.ironCarver, input); - //GameRegistry.addShapelessRecipe(output, BaseItemStacks.obsidianCarver, input); - //GameRegistry.addShapelessRecipe(output, BaseItemStacks.diamondCarver, input); - } - - public static void addCarverRecipe(ItemStack output, String input) { - //if (isOreRegistered(input)) { - // for (int i = 0; i < OreDictionary.getOres(input).size(); i++) { - // GameRegistry.addShapelessRecipe(output, BaseItemStacks.woodenCarver, OreDictionary.getOres(input).get(i)); - // GameRegistry.addShapelessRecipe(output, BaseItemStacks.stoneCarver, OreDictionary.getOres(input).get(i)); - // GameRegistry.addShapelessRecipe(output, BaseItemStacks.ironCarver, OreDictionary.getOres(input).get(i)); - // GameRegistry.addShapelessRecipe(output, BaseItemStacks.obsidianCarver, OreDictionary.getOres(input).get(i)); - // GameRegistry.addShapelessRecipe(output, BaseItemStacks.diamondCarver, OreDictionary.getOres(input).get(i)); - // } - //} - } - - public static boolean isOreRegistered(String ore) { - return !OreDictionary.getOres(ore).isEmpty(); - } -} diff --git a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BaseBlockRegistry.java b/src/main/java/tombenpotter/emt/common/modules/base/blocks/BaseBlockRegistry.java deleted file mode 100644 index c0bc322..0000000 --- a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BaseBlockRegistry.java +++ /dev/null @@ -1,15 +0,0 @@ -package tombenpotter.emt.common.modules.base.blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import tombenpotter.emt.ModInformation; - -public class BaseBlockRegistry { - - public static Block portableNode; - - public static void registerBaseBlocks() { - portableNode = new BlockPortableNode().setBlockName(ModInformation.modid + ".portablenode"); - GameRegistry.registerBlock(portableNode, "PortableNode"); - } -} diff --git a/src/main/java/tombenpotter/emt/common/modules/base/entities/EntityLaser.java b/src/main/java/tombenpotter/emt/common/modules/base/entities/EntityLaser.java deleted file mode 100644 index a64e579..0000000 --- a/src/main/java/tombenpotter/emt/common/modules/base/entities/EntityLaser.java +++ /dev/null @@ -1,350 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - -package tombenpotter.emt.common.modules.base.entities; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.IProjectile; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; - -import java.util.List; - -public class EntityLaser extends Entity implements IProjectile { - - private int xTile = -1; - private int yTile = -1; - private int zTile = -1; - private Block inTile; - private int inData; - private boolean inGround; - - public Entity shootingEntity; - private int ticksInGround; - private int ticksInAir; - - public EntityLaser(World par1World) { - super(par1World); - this.renderDistanceWeight = 10.0D; - this.setSize(0.5F, 0.5F); - } - - public EntityLaser(World par1World, double par2, double par4, double par6) { - super(par1World); - this.renderDistanceWeight = 10.0D; - this.setSize(0.5F, 0.5F); - this.setPosition(par2, par4, par6); - this.yOffset = 0.0F; - } - - public EntityLaser(World par1World, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase, float par4, float par5) { - super(par1World); - this.renderDistanceWeight = 10.0D; - this.shootingEntity = par2EntityLivingBase; - - this.posY = par2EntityLivingBase.posY + (double) par2EntityLivingBase.getEyeHeight() - 0.10000000149011612D; - double d0 = par3EntityLivingBase.posX - par2EntityLivingBase.posX; - double d1 = par3EntityLivingBase.boundingBox.minY + (double) (par3EntityLivingBase.height / 3.0F) - this.posY; - double d2 = par3EntityLivingBase.posZ - par2EntityLivingBase.posZ; - double d3 = (double) MathHelper.sqrt_double(d0 * d0 + d2 * d2); - - if (d3 >= 1.0E-7D) { - float f2 = (float) (Math.atan2(d2, d0) * 180.0D / Math.PI) - 90.0F; - float f3 = (float) (-(Math.atan2(d1, d3) * 180.0D / Math.PI)); - double d4 = d0 / d3; - double d5 = d2 / d3; - this.setLocationAndAngles(par2EntityLivingBase.posX + d4, this.posY, par2EntityLivingBase.posZ + d5, f2, f3); - this.yOffset = 0.0F; - float f4 = (float) d3 * 0.2F; - this.setThrowableHeading(d0, d1 + (double) f4, d2, par4, par5); - } - } - - public EntityLaser(World par1World, EntityLivingBase par2EntityLivingBase, float par3) { - super(par1World); - this.renderDistanceWeight = 10.0D; - this.shootingEntity = par2EntityLivingBase; - - this.setSize(0.5F, 0.5F); - this.setLocationAndAngles(par2EntityLivingBase.posX, par2EntityLivingBase.posY + (double) par2EntityLivingBase.getEyeHeight(), par2EntityLivingBase.posZ, par2EntityLivingBase.rotationYaw, par2EntityLivingBase.rotationPitch); - this.posX -= (double) (MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F); - this.posY -= 0.10000000149011612D; - this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F); - this.setPosition(this.posX, this.posY, this.posZ); - this.yOffset = 0.0F; - this.motionX = (double) (-MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI)); - this.motionZ = (double) (MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI)); - this.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * (float) Math.PI)); - this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, par3 * 1.5F, 1.0F); - } - - protected void entityInit() { - this.dataWatcher.addObject(16, Byte.valueOf((byte) 0)); - } - - public void setThrowableHeading(double par1, double par3, double par5, float par7, float par8) { - float f2 = MathHelper.sqrt_double(par1 * par1 + par3 * par3 + par5 * par5); - par1 /= (double) f2; - par3 /= (double) f2; - par5 /= (double) f2; - par1 += this.rand.nextGaussian() * (double) (this.rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * (double) par8; - par3 += this.rand.nextGaussian() * (double) (this.rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * (double) par8; - par5 += this.rand.nextGaussian() * (double) (this.rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * (double) par8; - par1 *= (double) par7; - par3 *= (double) par7; - par5 *= (double) par7; - this.motionX = par1; - this.motionY = par3; - this.motionZ = par5; - float f3 = MathHelper.sqrt_double(par1 * par1 + par5 * par5); - this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(par1, par5) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(par3, (double) f3) * 180.0D / Math.PI); - this.ticksInGround = 0; - } - - @SideOnly(Side.CLIENT) - public void setPositionAndRotation2(double par1, double par3, double par5, float par7, float par8, int par9) { - this.setPosition(par1, par3, par5); - this.setRotation(par7, par8); - } - - @SideOnly(Side.CLIENT) - public void setVelocity(double par1, double par3, double par5) { - this.motionX = par1; - this.motionY = par3; - this.motionZ = par5; - - if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(par1 + par5); - this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(par1, par5) / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(par3, (double) f) / Math.PI); - this.prevRotationPitch = this.rotationPitch; - this.prevRotationYaw = this.rotationYaw; - this.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, this.rotationPitch); - this.ticksInGround = 0; - } - } - - @SuppressWarnings("rawtypes") - public void onUpdate() { - super.onUpdate(); - - if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f) * 180.0D / Math.PI); - } - - Block block = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile); - if (block.getMaterial() != Material.air) { - block.setBlockBoundsBasedOnState(this.worldObj, this.xTile, this.yTile, this.zTile); - AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile); - - if (axisalignedbb != null && axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ))) { - this.inGround = true; - } - } - Block i = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile); - - i.setBlockBoundsBasedOnState(this.worldObj, this.xTile, this.yTile, this.zTile); - AxisAlignedBB axisalignedbb = i.getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile); - - if (axisalignedbb != null && axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ))) { - this.inGround = true; - } - - if (this.inGround) { - Block j = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile); - int k = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 3, true); - this.setDead(); - if (j == this.inTile && k == this.inData) { - ++this.ticksInGround; - - if (this.ticksInGround == 1200) { - this.setDead(); - } - } else { - this.inGround = false; - this.motionX *= (double) (this.rand.nextFloat() * 0.2F); - this.motionY *= (double) (this.rand.nextFloat() * 0.2F); - this.motionZ *= (double) (this.rand.nextFloat() * 0.2F); - this.ticksInGround = 0; - this.ticksInAir = 0; - } - } else { - ++this.ticksInAir; - Vec3 vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); - Vec3 vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(vec31, vec3, false, true, false); - vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); - vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - - if (movingobjectposition != null) { - vec3 = Vec3.createVectorHelper(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); - } - - Entity entity = null; - List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); - double d0 = 0.0D; - int l; - float f1; - - for (l = 0; l < list.size(); ++l) { - Entity entity1 = (Entity) list.get(l); - - if (entity1.canBeCollidedWith() && (entity1 != this.shootingEntity || this.ticksInAir >= 5)) { - f1 = 0.3F; - AxisAlignedBB axisalignedbb1 = entity1.boundingBox.expand((double) f1, (double) f1, (double) f1); - MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(vec3, vec31); - - if (movingobjectposition1 != null) { - double d1 = vec3.distanceTo(movingobjectposition1.hitVec); - - if (d1 < d0 || d0 == 0.0D) { - entity = entity1; - d0 = d1; - } - } - } - } - - if (entity != null) { - movingobjectposition = new MovingObjectPosition(entity); - } - - if (movingobjectposition != null && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer) { - EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit; - - if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) { - movingobjectposition = null; - } - } - - float f2; - float f3; - - if (movingobjectposition != null) { - if (movingobjectposition.entityHit != null) { - f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); - - { - this.motionX *= -0.10000000149011612D; - this.motionY *= -0.10000000149011612D; - this.motionZ *= -0.10000000149011612D; - this.rotationYaw += 180.0F; - this.prevRotationYaw += 180.0F; - this.ticksInAir = 0; - } - } else { - this.xTile = movingobjectposition.blockX; - this.yTile = movingobjectposition.blockY; - this.zTile = movingobjectposition.blockZ; - this.inTile = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile); - this.inData = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile); - this.motionX = (double) ((float) (movingobjectposition.hitVec.xCoord - this.posX)); - this.motionY = (double) ((float) (movingobjectposition.hitVec.yCoord - this.posY)); - this.motionZ = (double) ((float) (movingobjectposition.hitVec.zCoord - this.posZ)); - f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); - this.posX -= this.motionX / (double) f2 * 0.05000000074505806D; - this.posY -= this.motionY / (double) f2 * 0.05000000074505806D; - this.posZ -= this.motionZ / (double) f2 * 0.05000000074505806D; - this.playSound("random.bowhit", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); - this.inGround = true; - } - } - - this.posX += this.motionX; - this.posY += this.motionY; - this.posZ += this.motionZ; - f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - - for (this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f2) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { - ; - } - - while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { - this.prevRotationPitch += 360.0F; - } - - while (this.rotationYaw - this.prevRotationYaw < -180.0F) { - this.prevRotationYaw -= 360.0F; - } - - while (this.rotationYaw - this.prevRotationYaw >= 180.0F) { - this.prevRotationYaw += 360.0F; - } - - this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; - this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; - float f4 = 0.99F; - f1 = 0.05F; - - if (this.isInWater()) { - for (int j1 = 0; j1 < 4; ++j1) { - f3 = 0.25F; - this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double) f3, this.posY - this.motionY * (double) f3, this.posZ - this.motionZ * (double) f3, this.motionX, this.motionY, this.motionZ); - } - - f4 = 0.8F; - } - - this.motionX *= (double) f4; - this.motionY *= (double) f4; - this.motionZ *= (double) f4; - this.motionY -= (double) f1; - this.setPosition(this.posX, this.posY, this.posZ); - } - } - - public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) { - par1NBTTagCompound.setShort("xTile", (short) this.xTile); - par1NBTTagCompound.setShort("yTile", (short) this.yTile); - par1NBTTagCompound.setShort("zTile", (short) this.zTile); - par1NBTTagCompound.setByte("inTile", (byte) Block.getIdFromBlock(this.inTile)); - par1NBTTagCompound.setByte("inData", (byte) this.inData); - par1NBTTagCompound.setByte("inGround", (byte) (this.inGround ? 1 : 0)); - } - - public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) { - this.xTile = par1NBTTagCompound.getShort("xTile"); - this.yTile = par1NBTTagCompound.getShort("yTile"); - this.zTile = par1NBTTagCompound.getShort("zTile"); - this.inTile = Block.getBlockById(par1NBTTagCompound.getByte("inTile") & 255); - this.inData = par1NBTTagCompound.getByte("inData") & 255; - this.inGround = par1NBTTagCompound.getByte("inGround") == 1; - } - - public void onCollide(Entity par1Entity) { - if (!this.worldObj.isRemote) - ; - { - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 3, true); - } - } - - @SideOnly(Side.CLIENT) - public float getShadowSize() { - return 0.0F; - } -} diff --git a/src/main/java/tombenpotter/emt/common/modules/base/tile/BaseTileRegistry.java b/src/main/java/tombenpotter/emt/common/modules/base/tile/BaseTileRegistry.java deleted file mode 100644 index b0b037b..0000000 --- a/src/main/java/tombenpotter/emt/common/modules/base/tile/BaseTileRegistry.java +++ /dev/null @@ -1,10 +0,0 @@ -package tombenpotter.emt.common.modules.base.tile; - -import cpw.mods.fml.common.registry.GameRegistry; - -public class BaseTileRegistry { - - public static void registerBaseTiles() { - GameRegistry.registerTileEntity(TileEntityPortableNode.class, "tileentityportablenode"); - } -} diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/IC2RecipeRegistry.java b/src/main/java/tombenpotter/emt/common/modules/ic2/IC2RecipeRegistry.java deleted file mode 100644 index 800d234..0000000 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/IC2RecipeRegistry.java +++ /dev/null @@ -1,465 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - -package tombenpotter.emt.common.modules.ic2; - -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; -import ic2.api.item.IC2Items; -import ic2.api.recipe.IRecipeInput; -import ic2.api.recipe.RecipeInputItemStack; -import ic2.api.recipe.Recipes; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.crafting.CrucibleRecipe; -import thaumcraft.api.crafting.InfusionRecipe; -import thaumcraft.api.crafting.ShapedArcaneRecipe; -import thaumcraft.api.crafting.ShapelessArcaneRecipe; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.config.ConfigItems; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.common.modules.base.blocks.BaseBlockRegistry; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.CraftingAspects; -import tombenpotter.emt.common.util.TextHelper; - -import java.util.Iterator; - -public class IC2RecipeRegistry { - - public static ItemStack uuMCell = new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 16); - - private static void registerShapedRecipes() { - - /** Crafting Recipes **/ - ironOmnitool = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.ironOmnitool), "X", "Z", "Y", 'X', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', IC2Items.getItem("plateiron")); - diamondChainsaw = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.diamondChainsaw), " X ", "XYX", 'X', new ItemStack(Items.diamond), 'Y', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE)); - ductTape = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 9), "XXX", "YYY", "XXX", 'X', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 8), 'Y', new ItemStack(Items.paper)); - featherMesh = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 7), "XYX", "YXY", "XYX", 'X', new ItemStack(Items.feather), 'Y', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 9)); - featherWing = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 12), "XYZ", "XYZ", "XYZ", 'X', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 7), 'Y', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 8), 'Z', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 11)); - featherWings = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.featherWing), "XX", 'X', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 12)); - taintedFeathers = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 14), " X ", "XYX", " X ", 'X', new ItemStack(ConfigItems.itemResource, 1, 12), 'Y', new ItemStack(Items.feather)); - - if (!Loader.isModLoaded("gregtech_addon")) { - GameRegistry.addShapedRecipe(IC2Items.getItem("diamondDrill"), " Y ", "YXY", 'Y', new ItemStack(Items.diamond), 'X', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); - } else { - ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.modLoaded.GT")); - } - - GameRegistry.addRecipe(IC2Items.getItem("nanoHelmet"), "XYX", "XZX", 'X', IC2Items.getItem("carbonPlate"), 'Y', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(IC2Items.getItem("nightvisionGoggles").getItem(), 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addShapedRecipe(IC2Items.getItem("generator"), "X", "Y", "Z", 'X', new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', IC2Items.getItem("machine"), 'Z', new ItemStack(Blocks.furnace)); - GameRegistry.addShapedRecipe(IC2Items.getItem("generator"), "X", "Y", "Z", 'X', IC2Items.getItem("reBattery"), 'Y', IC2Items.getItem("machine"), 'Z', new ItemStack(Blocks.furnace)); - - /** OreDict Crafting Recipes **/ - for (int i = 0; i < OreDictionary.getOres("logWood").size(); i++) { - cardboard = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 11), "XXX", "YYY", "XXX", 'X', new ItemStack(Items.paper), 'Y', OreDictionary.getOres("logWood").get(i)); - } - for (int i = 0; i < OreDictionary.getOres("itemRubber").size(); i++) { - rubberBall = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 10), "XX", "XX", 'X', OreDictionary.getOres("itemRubber").get(i)); - } - - /** Smelting Recipes **/ - GameRegistry.addSmelting(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 1), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); - GameRegistry.addSmelting(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 2), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); - GameRegistry.addSmelting(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 3), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); - GameRegistry.addSmelting(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 4), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); - GameRegistry.addSmelting(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 10), new ItemStack(IC2ItemRegistry.itemEMTItems, 2, 8), 0.0F); - } - - private static void registerShaplessRecipes() { - - } - - private static void registerSmeltingRecipes() { - - } - - public static void registerEarlyRecipes() { - registerShapedRecipes(); - registerShaplessRecipes(); - registerSmeltingRecipes(); - } - - public static void registerUUMInfusionRecipes() { - - ItemStack iridium = IC2Items.getItem("iridiumOre").copy(); - iridium.stackSize = 2; - uraniumToIridium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", iridium, 4, CraftingAspects.uuMatterInfusions, IC2Items.getItem("Uran238"), new ItemStack[]{uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell}); - - ItemStack uranium = IC2Items.getItem("Uran238").copy(); - uranium.stackSize = 2; - diamondToUranium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uranium, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(Items.diamond), new ItemStack[]{uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell}); - - ItemStack diamond = new ItemStack(Items.diamond).copy(); - diamond.stackSize = 1; - goldToDiamond = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", diamond, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.gold_ingot), new ItemStack[]{uuMCell, uuMCell, uuMCell, uuMCell}); - - ItemStack gold = new ItemStack(Items.gold_ingot).copy(); - gold.stackSize = 2; - ironToGold = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", gold, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.iron_ingot), new ItemStack[]{uuMCell, uuMCell, uuMCell}); - - ItemStack ironOre = new ItemStack(Blocks.iron_ore).copy(); - ironOre.stackSize = 16; - stoneBricksToIronOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", ironOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Blocks.stonebrick), new ItemStack[]{uuMCell, uuMCell}); - - /** - * ItemStack copperOre = Items.getItem("copperOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED - **/ - ItemStack copperOre = IC2Items.getItem("crushedCopperOre").copy(); - copperOre.stackSize = 32; - arcaneStoneToCopperOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", copperOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack[]{uuMCell, uuMCell}); - - /** - * ItemStack tinOre = Items.getItem("tinOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED - **/ - ItemStack tinOre = IC2Items.getItem("crushedTinOre").copy(); - tinOre.stackSize = 32; - arcaneStoneBricksToTinOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", tinOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), new ItemStack[]{uuMCell, uuMCell}); - - /** - * ItemStack leadOre = Items.getItem("leadOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED - **/ - ItemStack leadOre = IC2Items.getItem("crushedLeadOre").copy(); - leadOre.stackSize = 32; - amberBlockToLeadOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", leadOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 0), new ItemStack[]{uuMCell, uuMCell}); - - ItemStack uraniumOre = IC2Items.getItem("uraniumOre").copy(); - uraniumOre.stackSize = 8; - amberBricksToUraniumOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uraniumOre, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 1), new ItemStack[]{uuMCell, uuMCell, uuMCell}); - - ItemStack coal = new ItemStack(Items.coal, 1, 0).copy(); - coal.stackSize = 16; - charcoalToCoal = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", coal, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.coal, 1, 1), new ItemStack[]{uuMCell, uuMCell}); - - ItemStack stickyResin = IC2Items.getItem("resin").copy(); - stickyResin.stackSize = 21; - shardToResin = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", stickyResin, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{uuMCell, uuMCell, uuMCell}); - - ItemStack redstone = new ItemStack(Items.redstone).copy(); - redstone.stackSize = 24; - shardToRedstone = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", redstone, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{uuMCell, uuMCell, uuMCell}); - - ItemStack lapisLazuli = new ItemStack(Items.dye, 1, 4).copy(); - lapisLazuli.stackSize = 8; - shardToLapis = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", lapisLazuli, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{uuMCell, uuMCell, uuMCell}); - - ItemStack glowstone = new ItemStack(Blocks.glowstone).copy(); - glowstone.stackSize = 1; - glowstoneDustToBlock = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", glowstone, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.glowstone_dust), new ItemStack[]{uuMCell}); - } - - public static void registerLateRecipes() { - /** Infusion Recipes **/ - - thaumiumDrill = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Drill", new ItemStack(IC2ItemRegistry.thaumiumDrill), 5, CraftingAspects.thaumiumDrillCrafting, new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")}); - - thaumiumChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Chainsaw", new ItemStack(IC2ItemRegistry.thaumiumChainsaw), 5, CraftingAspects.thaumiumChainsawCrafting, new ItemStack(IC2ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")}); - - thaumicQuantumHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Goggles of Revealing", new ItemStack(IC2ItemRegistry.quantumThaumicHelmet), 6, CraftingAspects.thaumicQuantumHelmetCrafting, new ItemStack(IC2ItemRegistry.nanoThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.milk_bucket), new ItemStack(IC2Items.getItem("quantumHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("advancedCircuit")}); - - thaumicNanoHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Goggles of Revealing", new ItemStack(IC2ItemRegistry.nanoThaumicHelmet), 5, CraftingAspects.thaumicNanoHelmetCrafting, new ItemStack(IC2ItemRegistry.electricGoggles, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.gold_ingot), new ItemStack(IC2Items.getItem("nanoHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("electronicCircuit")}); - - thaumiumOmnitool = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(IC2ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(IC2ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(IC2ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("plateobsidian")}); - - diamondOmnitoolToThaumium = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(IC2ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(IC2ItemRegistry.diamondOmnitool, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Blocks.diamond_block), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("carbonPlate"), IC2Items.getItem("advancedCircuit")}); - - explosionFocus = ThaumcraftApi.addInfusionCraftingRecipe("Explosion Focus", new ItemStack(IC2ItemRegistry.explosionFocus), 6, CraftingAspects.laserFocusCrafting, new ItemStack(ConfigItems.itemFocusHellbat, 1), new ItemStack[]{new ItemStack(IC2Items.getItem("miningLaser").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.arrow), new ItemStack(Items.gunpowder), new ItemStack(Items.firework_charge), new ItemStack(ConfigItems.itemResource, 1, 1)}); - - shieldFocus = ThaumcraftApi.addInfusionCraftingRecipe("Shield Focus", new ItemStack(IC2ItemRegistry.shieldFocus), 4, CraftingAspects.shieldFocusCrafting, new ItemStack(ConfigItems.itemFocusPortableHole, 1), new ItemStack[]{IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"), new ItemStack(Blocks.soul_sand), new ItemStack(Blocks.obsidian), new ItemStack(Blocks.obsidian)}); - - potentiaGenerator = ThaumcraftApi.addInfusionCraftingRecipe("Potentia Generator", new ItemStack(IC2BlockRegistry.essentiaGens, 1, 0), 6, CraftingAspects.potentiaGeneratorCrafting, IC2Items.getItem("semifluidGenerator"), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(ConfigItems.itemFocusTrade), new ItemStack(Blocks.hopper), new ItemStack(ConfigBlocks.blockJar), IC2Items.getItem("mvTransformer"), IC2Items.getItem("advancedMachine"), IC2Items.getItem("orewashingplant"), IC2Items.getItem("scrap")}); - - streamChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Chainsaw of the Stream", new ItemStack(IC2ItemRegistry.streamChainsaw), 6, CraftingAspects.streamChaisnawCrafting, new ItemStack(IC2ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.water_bucket), new ItemStack(ConfigItems.itemAxeElemental), new ItemStack(ConfigBlocks.blockMagicalLog), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade")}); - - rockbreakerDrill = ThaumcraftApi.addInfusionCraftingRecipe("Drill of the Rockbreaker", new ItemStack(IC2ItemRegistry.rockbreakerDrill), 6, CraftingAspects.rockbreakerDrillCrafting, new ItemStack(IC2ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.flint_and_steel), new ItemStack(Items.fire_charge), new ItemStack(ConfigItems.itemPickElemental), new ItemStack(ConfigItems.itemShovelElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade")}); - - thorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Mjolnir", new ItemStack(IC2ItemRegistry.thorHammer), 7, CraftingAspects.thorHammerCrafting, new ItemStack(IC2ItemRegistry.taintedThorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 6), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemFocusShock), IC2Items.getItem("rubber")}); - - superchargedThorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Supercharged Mjolnir", new ItemStack(IC2ItemRegistry.electricThorHammer), 10, CraftingAspects.superchargedThorHammerCrafting, new ItemStack(IC2ItemRegistry.thorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 6), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 6), new ItemStack(Blocks.web), new ItemStack(ConfigItems.itemFocusHellbat), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("nanoSaber").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); - - wandRecharger = ThaumcraftApi.addInfusionCraftingRecipe("Industrial Wand Charging Station", new ItemStack(IC2BlockRegistry.emtMachines, 1, 0), 6, CraftingAspects.wandCharger, new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5), new ItemStack[]{IC2Items.getItem("replicator"), IC2Items.getItem("iridiumPlate"), new ItemStack(Blocks.diamond_block), new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigBlocks.blockJar)}); - - solarHelmetRevealing = ThaumcraftApi.addInfusionCraftingRecipe("Solar Helmet of Revealing", new ItemStack(IC2ItemRegistry.solarHelmetRevealing), 5, CraftingAspects.solarHelmetRevealing, new ItemStack(IC2ItemRegistry.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), IC2Items.getItem("glassFiberCableItem"), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, 4)}); - - electricBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Electric Boots of the Traveller", new ItemStack(IC2ItemRegistry.electricBootsTraveller), 2, CraftingAspects.electricBootsTravel, new ItemStack(ConfigItems.itemBootsTraveller), new ItemStack[]{new ItemStack(Items.diamond), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"), IC2Items.getItem("hazmatBoots"), new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); - - nanoBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Nano Boots of the Traveller", new ItemStack(IC2ItemRegistry.nanoBootsTraveller), 2, CraftingAspects.nanoBootsTravel, new ItemStack(IC2ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(IC2Items.getItem("nanoBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); - - quantumBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Boots of the Traveller", new ItemStack(IC2ItemRegistry.quantumBootsTraveller), 2, CraftingAspects.quantumBootsTravel, new ItemStack(IC2ItemRegistry.nanoBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Blocks.diamond_block), new ItemStack(IC2Items.getItem("quantumBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate")}); - - etheralProcessor = ThaumcraftApi.addInfusionCraftingRecipe("Etheral Processor", new ItemStack(IC2BlockRegistry.emtMachines, 1, 1), 3, CraftingAspects.etherealProcessor, IC2Items.getItem("macerator"), new ItemStack[]{IC2Items.getItem("electroFurnace"), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.iron_block), new ItemStack(Blocks.iron_block), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5)}); - - tripleCompressedSolar = ThaumcraftApi.addInfusionCraftingRecipe("Compressed Solars", new ItemStack(IC2BlockRegistry.emtSolars, 1, 2), 2, CraftingAspects.compressedSolars, new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack[]{new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1)}); - - electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", new ItemStack(IC2ItemRegistry.electricHoeGrowth), 4, CraftingAspects.electricHoeGrowth, new ItemStack(ConfigItems.itemHoeElemental), new ItemStack[]{new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("electricHoe").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.dye, 1, 15), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"), new ItemStack(Blocks.sapling, 1, OreDictionary.WILDCARD_VALUE)}); - - chargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Charging", new ItemStack(IC2ItemRegistry.chargeFocus), 4, CraftingAspects.chargeFocus, new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{IC2Items.getItem("generator"), IC2Items.getItem("batBox"), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE)}); - - wandChargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Wand Charging", new ItemStack(IC2ItemRegistry.wandChargeFocus), 5, CraftingAspects.wandChargeFocus, new ItemStack(IC2BlockRegistry.emtMachines, 1, 0), new ItemStack[]{new ItemStack(IC2ItemRegistry.chargeFocus), new ItemStack(IC2Items.getItem("energyPack").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate")}); - - inventoryChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Inventory Charging Ring", new ItemStack(IC2ItemRegistry.emtBauble, 1, 1), 6, CraftingAspects.inventoryChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[]{new ItemStack(IC2ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"), IC2Items.getItem("waterMill"), IC2Items.getItem("solarPanel"), IC2Items.getItem("windMill"), IC2Items.getItem("nuclearReactor")}); - - armorChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Armor Charging Ring", new ItemStack(IC2ItemRegistry.emtBauble, 1, 0), 6, CraftingAspects.armorChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[]{new ItemStack(IC2ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"), IC2Items.getItem("waterMill"), IC2Items.getItem("solarPanel"), IC2Items.getItem("windMill"), IC2Items.getItem("nuclearReactor")}); - - nanoWings = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Wings", new ItemStack(IC2ItemRegistry.nanoWing), 4, CraftingAspects.nanoWing, new ItemStack(IC2ItemRegistry.thaumiumWing), new ItemStack[]{IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), new ItemStack(IC2Items.getItem("nanoBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1)}); - - quantumWings = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Wings", new ItemStack(IC2ItemRegistry.quantumWing), 6, CraftingAspects.quantumWing, new ItemStack(IC2ItemRegistry.nanoWing, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1)}); - - /** Arcane Worktable Recipes **/ - - diamondOmnitool = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(IC2ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, new ItemStack(IC2ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); - - ironOmnitoolToDiamond = ThaumcraftApi.addArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(IC2ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, "XAX", "XBX", "XAX", 'X', new ItemStack(Items.diamond), 'A', IC2Items.getItem("advancedCircuit"), 'B', new ItemStack(IC2ItemRegistry.ironOmnitool, 1, OreDictionary.WILDCARD_VALUE)); - - christmasFocus = ThaumcraftApi.addArcaneCraftingRecipe("Kris-tmas Focus", new ItemStack(IC2ItemRegistry.christmasFocus), CraftingAspects.christmasFocusCrafting, "XYX", "YZY", "XYX", 'X', new ItemStack(Blocks.snow), 'Y', new ItemStack(Blocks.pumpkin), 'Z', new ItemStack(ConfigItems.itemFocusFrost)); - - electricGoggles = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", new ItemStack(IC2ItemRegistry.electricGoggles), CraftingAspects.electricGogglesCrafting, " Y ", "AZA", "BXB", 'Z', new ItemStack(ConfigItems.itemGoggles), 'X', IC2Items.getItem("electronicCircuit"), 'Y', new ItemStack(Items.diamond_helmet), 'A', new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'B', Items.repeater); - - shieldBlock = ThaumcraftApi.addArcaneCraftingRecipe("Shield Blocks", new ItemStack(IC2BlockRegistry.shield, 8), CraftingAspects.shieldBlockCrafting, "XYX", "X X", "XYX", 'X', new ItemStack(Blocks.glass), 'Y', new ItemStack(Blocks.obsidian)); - - tinyUranium = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Tiny Uranium", new ItemStack(IC2Items.getItem("smallUran235").getItem(), 7), CraftingAspects.tinyUraniumCrafting, IC2Items.getItem("Uran238")); - - compressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(IC2BlockRegistry.emtSolars, 1, 0), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', IC2Items.getItem("solarPanel")); - - doubleCompressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', new ItemStack(IC2BlockRegistry.emtSolars, 1, 0)); - - electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", new ItemStack(IC2ItemRegistry.electricScribingTools), CraftingAspects.electricScribingTools, "YXY", "XZX", "YXY", 'Y', IC2Items.getItem("electronicCircuit"), 'X', new ItemStack(ConfigItems.itemInkwell), 'Z', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)); - - thaumiumWing = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 15), CraftingAspects.thaumiumWing, "XYZ", "XYZ", "XYZ", 'X', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 14), 'Y', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), 'Z', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 13)); - - thaumiumWings = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(IC2ItemRegistry.thaumiumWing), CraftingAspects.thaumiumWing, "XX", 'X', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 15)); - - /** Crucible Recipes **/ - - ignisGenerator = ThaumcraftApi.addCrucibleRecipe("Ignis Generator", new ItemStack(IC2BlockRegistry.essentiaGens, 1, 1), new ItemStack(IC2BlockRegistry.essentiaGens, 1, 0), CraftingAspects.ignisGeneratorCrafting); - - auramGenerator = ThaumcraftApi.addCrucibleRecipe("Auram Generator", new ItemStack(IC2BlockRegistry.essentiaGens, 1, 2), new ItemStack(IC2BlockRegistry.essentiaGens, 1, 0), CraftingAspects.auramGeneratorCrafting); - - arborGenerator = ThaumcraftApi.addCrucibleRecipe("Arbor Generator", new ItemStack(IC2BlockRegistry.essentiaGens, 1, 3), new ItemStack(IC2BlockRegistry.essentiaGens, 1, 0), CraftingAspects.arborGeneratorCrafting); - - aerGenerator = ThaumcraftApi.addCrucibleRecipe("Aer Generator", new ItemStack(IC2BlockRegistry.essentiaGens, 1, 4), new ItemStack(IC2BlockRegistry.essentiaGens, 1, 0), CraftingAspects.aerGenerator); - - waterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 3), new ItemStack(IC2BlockRegistry.emtSolars, 1, 0), CraftingAspects.waterSolars); - - doubleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 4), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), CraftingAspects.waterSolars); - - tripleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 5), new ItemStack(IC2BlockRegistry.emtSolars, 1, 2), CraftingAspects.waterSolars); - - darkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 6), new ItemStack(IC2BlockRegistry.emtSolars, 1, 0), CraftingAspects.darkSolars); - - doubleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 7), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), CraftingAspects.darkSolars); - - tripleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 8), new ItemStack(IC2BlockRegistry.emtSolars, 1, 2), CraftingAspects.darkSolars); - - orderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 9), new ItemStack(IC2BlockRegistry.emtSolars, 1, 0), CraftingAspects.orderSolars); - - doubleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 10), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), CraftingAspects.orderSolars); - - tripleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 11), new ItemStack(IC2BlockRegistry.emtSolars, 1, 2), CraftingAspects.orderSolars); - - fireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 12), new ItemStack(IC2BlockRegistry.emtSolars, 1, 0), CraftingAspects.fireSolars); - - doubleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 13), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), CraftingAspects.fireSolars); - - tripleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 14), new ItemStack(IC2BlockRegistry.emtSolars, 1, 2), CraftingAspects.fireSolars); - - airSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 15), new ItemStack(IC2BlockRegistry.emtSolars, 1, 0), CraftingAspects.airSolars); - - doubleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars2, 1, 0), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), CraftingAspects.airSolars); - - tripleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars2, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 2), CraftingAspects.airSolars); - - earthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars2, 1, 2), new ItemStack(IC2BlockRegistry.emtSolars, 1, 0), CraftingAspects.earthSolars); - - doubleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars2, 1, 3), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), CraftingAspects.earthSolars); - - tripleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars2, 1, 4), new ItemStack(IC2BlockRegistry.emtSolars, 1, 2), CraftingAspects.earthSolars); - - portableNode = ThaumcraftApi.addCrucibleRecipe("Portable Node", new ItemStack(BaseBlockRegistry.portableNode), new ItemStack(ConfigItems.itemJarFilled), CraftingAspects.portableNode); - - /** IC2 Stuff related recipes **/ - - /* Ore Clusters Macerator Recipes */ - ItemStack ironClusterRecipe = IC2Items.getItem("smallIronDust").copy(); - ironClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 16)), null, ironClusterRecipe); - - ItemStack goldClusterRecipe = IC2Items.getItem("smallGoldDust").copy(); - goldClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 31)), null, goldClusterRecipe); - - ItemStack copperClusterRecipe = IC2Items.getItem("smallCopperDust").copy(); - copperClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 17)), null, copperClusterRecipe); - - ItemStack tinClusterRecipe = IC2Items.getItem("smallTinDust").copy(); - tinClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 18)), null, tinClusterRecipe); - - ItemStack silverClusterRecipe = IC2Items.getItem("smallSilverDust").copy(); - silverClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 19)), null, silverClusterRecipe); - - ItemStack leadClusterRecipe = IC2Items.getItem("smallLeadDust").copy(); - leadClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 20)), null, leadClusterRecipe); - - /* Thaumium Plates Recipes */ - thaumiumPlate = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), "X", "Y", "Z", 'Y', new ItemStack(ConfigItems.itemResource, 1, 2), 'X', new ItemStack(IC2Items.getItem("ForgeHammer").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(Blocks.obsidian)); - Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemResource, 1, 2)), null, new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5)); - - /* Iron Sheet Recipe */ - Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(IC2Items.getItem("denseplateiron")), null, new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 13)); - - /* Ore Processing for Amber and Cinnabar */ - if (ConfigHandler.removeAmberAndCinnabarMacerating) { - for (Iterator it = Recipes.macerator.getRecipes().keySet().iterator(); it.hasNext(); ) { - IRecipeInput input = it.next(); - if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7))) { - it.remove(); - ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.recipes.amberConflict")); - } - } - - for (Iterator it = Recipes.macerator.getRecipes().keySet().iterator(); it.hasNext(); ) { - IRecipeInput input = it.next(); - if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0))) { - it.remove(); - ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.recipes.cinnabarConflict")); - } - } - } - ItemStack crushedAmberRecipe = new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 1); - crushedAmberRecipe.stackSize = 2; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7)), null, crushedAmberRecipe); - - ItemStack crushedCinnabarRecipe = new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 3); - crushedCinnabarRecipe.stackSize = 2; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0)), null, crushedCinnabarRecipe); - - NBTTagCompound waterAmount = new NBTTagCompound(); - waterAmount.setInteger("amount", 1000); - - ItemStack smallCopperDust = IC2Items.getItem("smallCopperDust"); - smallCopperDust.stackSize = 2; - ItemStack smallTinDust = IC2Items.getItem("smallTinDust"); - smallCopperDust.stackSize = 2; - - Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 1)), waterAmount, new ItemStack[]{new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 2), smallCopperDust, IC2Items.getItem("stoneDust")}); - Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 3)), waterAmount, new ItemStack[]{new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 4), smallTinDust, IC2Items.getItem("stoneDust")}); - - NBTTagCompound heatAmount = new NBTTagCompound(); - heatAmount.setInteger("minHeat", 1000); - - Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 2)), heatAmount, new ItemStack[]{IC2Items.getItem("smallCopperDust"), new ItemStack(ConfigItems.itemResource, 1, 6)}); - Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 4)), heatAmount, new ItemStack[]{IC2Items.getItem("smallTinDust"), new ItemStack(ConfigItems.itemResource, 1, 3)}); - - } - - public static IRecipe ironOmnitool; - public static IRecipe diamondChainsaw; - public static IRecipe ductTape; - public static IRecipe rubberBall; - public static IRecipe featherMesh; - public static IRecipe cardboard; - public static IRecipe featherWing; - public static IRecipe featherWings; - public static IRecipe taintedFeathers; - - public static InfusionRecipe uraniumToIridium; - public static InfusionRecipe diamondToUranium; - public static InfusionRecipe goldToDiamond; - public static InfusionRecipe ironToGold; - public static InfusionRecipe stoneBricksToIronOre; - public static InfusionRecipe arcaneStoneToCopperOre; - public static InfusionRecipe arcaneStoneBricksToTinOre; - public static InfusionRecipe amberBlockToLeadOre; - public static InfusionRecipe amberBricksToUraniumOre; - public static InfusionRecipe charcoalToCoal; - public static InfusionRecipe shardToResin; - public static InfusionRecipe shardToRedstone; - public static InfusionRecipe shardToLapis; - public static InfusionRecipe glowstoneDustToBlock; - - public static InfusionRecipe thaumiumDrill; - public static InfusionRecipe thaumiumChainsaw; - public static InfusionRecipe thaumicQuantumHelmet; - public static InfusionRecipe thaumiumOmnitool; - public static InfusionRecipe thaumicNanoHelmet; - public static InfusionRecipe explosionFocus; - public static InfusionRecipe shieldFocus; - public static InfusionRecipe potentiaGenerator; - public static InfusionRecipe streamChainsaw; - public static InfusionRecipe rockbreakerDrill; - public static InfusionRecipe thorHammer; - public static InfusionRecipe superchargedThorHammer; - public static InfusionRecipe wandRecharger; - public static InfusionRecipe solarHelmetRevealing; - public static InfusionRecipe electricBootsTravel; - public static InfusionRecipe nanoBootsTravel; - public static InfusionRecipe quantumBootsTravel; - public static InfusionRecipe diamondOmnitoolToThaumium; - public static InfusionRecipe etheralProcessor; - public static InfusionRecipe tripleCompressedSolar; - public static InfusionRecipe electricHoeGrowth; - public static InfusionRecipe chargeFocus; - public static InfusionRecipe wandChargeFocus; - public static InfusionRecipe inventoryChargingRing; - public static InfusionRecipe armorChargingRing; - public static InfusionRecipe nanoWings; - public static InfusionRecipe quantumWings; - - public static ShapelessArcaneRecipe diamondOmnitool; - public static ShapelessArcaneRecipe tinyUranium; - public static ShapedArcaneRecipe christmasFocus; - public static ShapedArcaneRecipe electricGoggles; - public static ShapedArcaneRecipe shieldBlock; - public static ShapedArcaneRecipe compressedSolar; - public static ShapedArcaneRecipe doubleCompressedSolar; - public static ShapedArcaneRecipe ironOmnitoolToDiamond; - public static ShapedArcaneRecipe electricScribingTools; - public static ShapedArcaneRecipe thaumiumWing; - public static ShapedArcaneRecipe thaumiumWings; - - public static CrucibleRecipe ignisGenerator; - public static CrucibleRecipe auramGenerator; - public static CrucibleRecipe arborGenerator; - public static CrucibleRecipe aerGenerator; - public static CrucibleRecipe waterSolar; - public static CrucibleRecipe doubleWaterSolar; - public static CrucibleRecipe tripleWaterSolar; - public static CrucibleRecipe darkSolar; - public static CrucibleRecipe doubleDarkSolar; - public static CrucibleRecipe tripleDarkSolar; - public static CrucibleRecipe orderSolar; - public static CrucibleRecipe doubleOrderSolar; - public static CrucibleRecipe tripleOrderSolar; - public static CrucibleRecipe fireSolar; - public static CrucibleRecipe doubleFireSolar; - public static CrucibleRecipe tripleFireSolar; - public static CrucibleRecipe airSolar; - public static CrucibleRecipe doubleAirSolar; - public static CrucibleRecipe tripleAirSolar; - public static CrucibleRecipe earthSolar; - public static CrucibleRecipe doubleEarthSolar; - public static CrucibleRecipe tripleEarthSolar; - public static CrucibleRecipe portableNode; - - public static IRecipe thaumiumPlate; -} diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockIC2.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockIC2.java deleted file mode 100644 index e12f2ab..0000000 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockIC2.java +++ /dev/null @@ -1,28 +0,0 @@ -package tombenpotter.emt.common.modules.ic2.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; - -public class BlockIC2 extends Block { - - public BlockIC2(String unlocName, Material material, String textureName, SoundType soundType, float hardness) { - super(material); - - setBlockName(ModInformation.modid + ".module.ic2." + unlocName); - setBlockTextureName(ModInformation.texturePath + ":" + textureName); - setCreativeTab(ElectroMagicTools.tabEMT); - setStepSound(soundType); - setHardness(hardness); - } - - public BlockIC2(String unlocName, Material material, SoundType soundType, float hardness) { - super(material); - - setBlockName(ModInformation.modid + ".module.ic2." + unlocName); - setCreativeTab(ElectroMagicTools.tabEMT); - setStepSound(soundType); - setHardness(hardness); - } -} diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockIC2Container.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockIC2Container.java deleted file mode 100644 index 44b2ccd..0000000 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockIC2Container.java +++ /dev/null @@ -1,93 +0,0 @@ -package tombenpotter.emt.common.modules.ic2.blocks; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.base.tile.TileEntityEMT; - -public class BlockIC2Container extends BlockContainer { - - public IIcon[] top = new IIcon[16]; - public IIcon[] bottom = new IIcon[16]; - public IIcon[] side = new IIcon[16]; - public IIcon[] frontOff = new IIcon[16]; - public IIcon[] frontOn = new IIcon[16]; - - public BlockIC2Container(String unlocName, Material material, Block.SoundType soundType, float hardness) { - super(material); - - setBlockName(ModInformation.modid + ".module.ic2." + unlocName); - setCreativeTab(ElectroMagicTools.tabEMT); - setStepSound(soundType); - setHardness(hardness); - } - - @Override - public TileEntity createNewTileEntity(World var1, int var2) { - return null; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess access, int x, int y, int z, int side) { - TileEntityEMT tile = (TileEntityEMT) access.getTileEntity(x, y, z); - int i = access.getBlockMetadata(x, y, z); - - if (side == 0) { - return this.bottom[i]; - } else if (side == 1) { - return this.top[i]; - } else if (side != tile.facing) { - return this.side[i]; - } else if (tile.isOn) { - return this.frontOn[i]; - } else { - return this.frontOff[i]; - } - } - - @Override - public IIcon getIcon(int side, int meta) { - if (side < 1) { - return this.bottom[meta]; - } - if (side == 1) { - return this.top[meta]; - } - if (side == 3) { - return this.frontOff[meta]; - } - return this.side[meta]; - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack itemStack) { - int facing = MathHelper.floor_double(entity.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - TileEntityEMT tile = (TileEntityEMT) world.getTileEntity(x, y, z); - - if (facing == 0) - tile.facing = 2; - else if (facing == 1) - tile.facing = 5; - else if (facing == 2) - tile.facing = 3; - else if (facing == 3) - tile.facing = 4; - } - - @Override - public int damageDropped(int meta) { - return meta; - } -} diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/entities/IC2EntityRegistry.java b/src/main/java/tombenpotter/emt/common/modules/ic2/entities/IC2EntityRegistry.java deleted file mode 100644 index 97ed6dc..0000000 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/entities/IC2EntityRegistry.java +++ /dev/null @@ -1,5 +0,0 @@ -package tombenpotter.emt.common.modules.ic2.entities; - -public class IC2EntityRegistry { - -} diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/IC2ItemRegistry.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/IC2ItemRegistry.java deleted file mode 100644 index f0bf634..0000000 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/IC2ItemRegistry.java +++ /dev/null @@ -1,161 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - -package tombenpotter.emt.common.modules.ic2.items; - -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; -import net.minecraftforge.common.util.EnumHelper; -import thaumcraft.api.ThaumcraftApi; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.ic2.items.armor.boots.ItemElectricBootsTraveller; -import tombenpotter.emt.common.modules.ic2.items.armor.boots.ItemNanoBootsTraveller; -import tombenpotter.emt.common.modules.ic2.items.armor.boots.ItemQuantumBootsTraveller; -import tombenpotter.emt.common.modules.ic2.items.armor.goggles.ItemElectricGoggles; -import tombenpotter.emt.common.modules.ic2.items.armor.goggles.ItemNanoGoggles; -import tombenpotter.emt.common.modules.ic2.items.armor.goggles.ItemQuantumGoggles; -import tombenpotter.emt.common.modules.ic2.items.armor.goggles.ItemSolarHelmetRevealing; -import tombenpotter.emt.common.modules.ic2.items.armor.wings.ItemNanoWing; -import tombenpotter.emt.common.modules.ic2.items.armor.wings.ItemQuantumWing; -import tombenpotter.emt.common.modules.ic2.items.foci.ItemChargeFocus; -import tombenpotter.emt.common.modules.ic2.items.foci.ItemWandChargingFocus; -import tombenpotter.emt.common.modules.ic2.items.tools.ItemElectricHoeGrowth; -import tombenpotter.emt.common.modules.ic2.items.tools.ItemElectricThorHammer; -import tombenpotter.emt.common.modules.ic2.items.tools.chainsaws.ItemDiamondChainsaw; -import tombenpotter.emt.common.modules.ic2.items.tools.chainsaws.ItemStreamChainsaw; -import tombenpotter.emt.common.modules.ic2.items.tools.chainsaws.ItemThaumiumChainsaw; -import tombenpotter.emt.common.modules.ic2.items.tools.drills.ItemRockbreakerDrill; -import tombenpotter.emt.common.modules.ic2.items.tools.drills.ItemThaumiumDrill; -import tombenpotter.emt.common.modules.ic2.items.tools.omnitools.ItemOmnitoolDiamond; -import tombenpotter.emt.common.modules.ic2.items.tools.omnitools.ItemOmnitoolIron; -import tombenpotter.emt.common.modules.ic2.items.tools.omnitools.ItemOmnitoolThaumium; -import tombenpotter.emt.common.modules.base.items.ItemMaterials; -import tombenpotter.emt.common.modules.base.items.armor.ItemFeatherWing; -import tombenpotter.emt.common.modules.base.items.armor.ItemThaumiumReinforcedWing; -import tombenpotter.emt.common.modules.base.items.foci.ItemChristmasFocus; -import tombenpotter.emt.common.modules.base.items.foci.ItemExplosionFocus; -import tombenpotter.emt.common.modules.base.items.foci.ItemShieldFocus; -import tombenpotter.emt.common.modules.base.items.tools.ItemThorHammer; -import tombenpotter.emt.common.modules.base.items.tools.ItemThorHammerBroken; - -public class IC2ItemRegistry { - - public static Item thaumiumDrill; - public static Item thaumiumChainsaw; - public static Item quantumThaumicHelmet; - public static Item diamondChainsaw; - public static Item ironOmnitool; - public static Item diamondOmnitool; - public static Item thaumiumOmnitool; - public static Item nanoThaumicHelmet; - public static Item explosionFocus; - public static Item christmasFocus; - public static Item shieldFocus; - public static Item electricGoggles; - public static Item streamChainsaw; - public static Item rockbreakerDrill; - public static Item solarHelmetRevealing; - public static Item thorHammer; - public static Item taintedThorHammer; - public static Item electricThorHammer; - public static Item electricBootsTraveller; - public static Item quantumBootsTraveller; - public static Item nanoBootsTraveller; - public static Item electricScribingTools; - public static Item itemEMTItems; - public static Item electricHoeGrowth; - public static Item chargeFocus; - public static Item emtBauble; - public static Item wandChargeFocus; - public static Item featherWing; - public static Item thaumiumWing; - public static Item nanoWing; - public static Item quantumWing; - - public static ItemArmor.ArmorMaterial featherWingMaterial = EnumHelper.addArmorMaterial("FEATEHRWiNG", 1, new int[]{2, 2, 2, 2}, 6); - - public static void registerItems() { - itemEMTItems = new ItemMaterials().setUnlocalizedName(ModInformation.modid + ".emtitems"); - GameRegistry.registerItem(itemEMTItems, "EMTItems"); - emtBauble = new ItemIC2Baubles().setUnlocalizedName(ModInformation.modid + ".emtbauble"); - GameRegistry.registerItem(emtBauble, "EMTBaubles"); - - electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.electric"); - GameRegistry.registerItem(electricGoggles, "ElectricGogglesRevealing"); - nanoThaumicHelmet = new ItemNanoGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.nano"); - GameRegistry.registerItem(nanoThaumicHelmet, "NanosuitGogglesRevealing"); - quantumThaumicHelmet = new ItemQuantumGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.quantum"); - GameRegistry.registerItem(quantumThaumicHelmet, "QuantumGogglesRevealing"); - solarHelmetRevealing = new ItemSolarHelmetRevealing(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.solar"); - GameRegistry.registerItem(solarHelmetRevealing, "SolarHelmetRevealing"); - - electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.electric"); - GameRegistry.registerItem(electricBootsTraveller, "ElectricBootsTraveller"); - nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.nano"); - GameRegistry.registerItem(nanoBootsTraveller, "NanoBootsTraveller"); - quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.quantum"); - GameRegistry.registerItem(quantumBootsTraveller, "QuantumBootsTraveller"); - - electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName(ModInformation.modid + ".scribingtools.electric"); - GameRegistry.registerItem(electricScribingTools, "ElectricScribingTools"); - - featherWing = new ItemFeatherWing(featherWingMaterial, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.feather"); - GameRegistry.registerItem(featherWing, "FeatherWing"); - thaumiumWing = new ItemThaumiumReinforcedWing(ThaumcraftApi.armorMatThaumium, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.thaumium"); - GameRegistry.registerItem(thaumiumWing, "ThaumiumWing"); - nanoWing = new ItemNanoWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.nano"); - GameRegistry.registerItem(nanoWing, "NanosuitWing"); - quantumWing = new ItemQuantumWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.quantum"); - GameRegistry.registerItem(quantumWing, "QuantumWing"); - - thorHammer = new ItemThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer"); - GameRegistry.registerItem(thorHammer, "Mjolnir"); - taintedThorHammer = new ItemThorHammerBroken().setUnlocalizedName(ModInformation.modid + ".hammer.broken"); - GameRegistry.registerItem(taintedThorHammer, "TaintedMjolnir"); - electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer.electric"); - GameRegistry.registerItem(electricThorHammer, "SuperchargedMjolnir"); - - thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName(ModInformation.modid + ".drill.thaumium"); - GameRegistry.registerItem(thaumiumDrill, "ThaumiumDrill"); - - diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.diamond"); - GameRegistry.registerItem(diamondChainsaw, "DiamondChainsaw"); - thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.thaumium"); - GameRegistry.registerItem(thaumiumChainsaw, "ThaumiumChainsaw"); - - ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName(ModInformation.modid + ".omnitool.iron"); - GameRegistry.registerItem(ironOmnitool, "Omnitool"); - diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName(ModInformation.modid + ".omnitool.diamond"); - GameRegistry.registerItem(diamondOmnitool, "Diamond Omnitool"); - thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName(ModInformation.modid + ".omnitool.thaumium"); - GameRegistry.registerItem(thaumiumOmnitool, "ThaumiumOmnitool"); - - streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.stream"); - GameRegistry.registerItem(streamChainsaw, "ChainsawStream"); - rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName(ModInformation.modid + ".drill.rockbreaker"); - GameRegistry.registerItem(rockbreakerDrill, "DrillRockbreaker"); - electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName(ModInformation.modid + ".hoeofgrowth.electric"); - GameRegistry.registerItem(electricHoeGrowth, "ElectricHoeGrowth"); - - explosionFocus = new ItemExplosionFocus(); - GameRegistry.registerItem(explosionFocus, "ExplosionFocus"); - christmasFocus = new ItemChristmasFocus(); - GameRegistry.registerItem(christmasFocus, "ChristmasFocus"); - shieldFocus = new ItemShieldFocus(); - GameRegistry.registerItem(shieldFocus, "ShieldFocus"); - chargeFocus = new ItemChargeFocus(); - GameRegistry.registerItem(chargeFocus, "ChargingFocus"); - wandChargeFocus = new ItemWandChargingFocus(); - GameRegistry.registerItem(wandChargeFocus, "WandChargingFocus"); - } -} diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/ItemIC2.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/ItemIC2.java deleted file mode 100644 index b74ab0e..0000000 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/ItemIC2.java +++ /dev/null @@ -1,23 +0,0 @@ -package tombenpotter.emt.common.modules.ic2.items; - -import net.minecraft.item.Item; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; - -public class ItemIC2 extends Item { - - public ItemIC2(String unlocName, String textureName) { - super(); - - setUnlocalizedName(ModInformation.modid + ".module.ic2." + unlocName); - setTextureName(ModInformation.texturePath + ":" + textureName); - setCreativeTab(ElectroMagicTools.tabEMT); - } - - public ItemIC2(String unlocName) { - super(); - - setUnlocalizedName(ModInformation.modid + ".module.ic2." + unlocName); - setCreativeTab(ElectroMagicTools.tabEMT); - } -} diff --git a/src/main/java/tombenpotter/emt/common/modules/base/tile/TileEntityEMT.java b/src/main/java/tombenpotter/emt/common/tile/TileEntityEMT.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/modules/base/tile/TileEntityEMT.java rename to src/main/java/tombenpotter/emt/common/tile/TileEntityEMT.java index f168dc6..4de4a8d 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/tile/TileEntityEMT.java +++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityEMT.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.base.tile; +package tombenpotter.emt.common.tile; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEtherealMacerator.java b/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEtherealMacerator.java rename to src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java index 22f7d1e..d86db0b 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEtherealMacerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile; +package tombenpotter.emt.common.tile; import ic2.api.item.IC2Items; import ic2.api.tile.IWrenchable; @@ -25,8 +25,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.common.config.ConfigItems; -import tombenpotter.emt.common.modules.base.tile.TileEntityEMT; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.tile.TileEntityEMT; +import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityEtherealMacerator extends TileEntityEMT implements ISidedInventory, IWrenchable { @@ -277,7 +277,7 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtMachines, 1, 1); + return new ItemStack(BlockRegistry.emtMachines, 1, 1); } @Override diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityIndustrialWandRecharge.java b/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityIndustrialWandRecharge.java rename to src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java index 6c436c5..4de8972 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityIndustrialWandRecharge.java +++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile; +package tombenpotter.emt.common.tile; import ic2.api.energy.prefab.BasicSink; import net.minecraft.entity.player.EntityPlayer; @@ -20,7 +20,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.modules.base.tile.TileEntityEMT; +import tombenpotter.emt.common.tile.TileEntityEMT; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements IInventory { diff --git a/src/main/java/tombenpotter/emt/common/modules/base/tile/TileEntityPortableNode.java b/src/main/java/tombenpotter/emt/common/tile/TileEntityPortableNode.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/modules/base/tile/TileEntityPortableNode.java rename to src/main/java/tombenpotter/emt/common/tile/TileEntityPortableNode.java index 05f9a4d..9ed0058 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/tile/TileEntityPortableNode.java +++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityPortableNode.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.base.tile; +package tombenpotter.emt.common.tile; import thaumcraft.api.nodes.NodeModifier; import thaumcraft.api.nodes.NodeType; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/tile/TileEntityToolRefiller.java b/src/main/java/tombenpotter/emt/common/tile/TileEntityToolRefiller.java similarity index 55% rename from src/main/java/tombenpotter/emt/common/modules/base/tile/TileEntityToolRefiller.java rename to src/main/java/tombenpotter/emt/common/tile/TileEntityToolRefiller.java index d70532e..a2c5243 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/tile/TileEntityToolRefiller.java +++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityToolRefiller.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.base.tile; +package tombenpotter.emt.common.tile; public class TileEntityToolRefiller extends TileEntityEMT { } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TileRegistry.java b/src/main/java/tombenpotter/emt/common/tile/TileRegistry.java similarity index 53% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TileRegistry.java rename to src/main/java/tombenpotter/emt/common/tile/TileRegistry.java index ffc0ad8..260c34d 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TileRegistry.java +++ b/src/main/java/tombenpotter/emt/common/tile/TileRegistry.java @@ -1,45 +1,38 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - -package tombenpotter.emt.common.modules.ic2.tile; +package tombenpotter.emt.common.tile; +import tombenpotter.emt.common.tile.generators.TileEntityAerGenerator; +import tombenpotter.emt.common.tile.generators.TileEntityArborGenerator; +import tombenpotter.emt.common.tile.generators.TileEntityAuramGenerator; +import tombenpotter.emt.common.tile.generators.TileEntityEssentiaGenerator; +import tombenpotter.emt.common.tile.generators.TileEntityIgnisGenerator; +import tombenpotter.emt.common.tile.generators.TileEntityPotentiaGenerator; +import tombenpotter.emt.common.tile.solars.air.TileEntityAirSolar; +import tombenpotter.emt.common.tile.solars.air.TileEntityDoubleAirSolar; +import tombenpotter.emt.common.tile.solars.air.TileEntityTripleAirSolar; +import tombenpotter.emt.common.tile.solars.compressed.TileEntityCompressedSolar; +import tombenpotter.emt.common.tile.solars.compressed.TileEntityDoubleCompressedSolar; +import tombenpotter.emt.common.tile.solars.compressed.TileEntityTripleCompressedSolar; +import tombenpotter.emt.common.tile.solars.dark.TileEntityDarkSolar; +import tombenpotter.emt.common.tile.solars.dark.TileEntityDoubleDarkSolar; +import tombenpotter.emt.common.tile.solars.dark.TileEntityTripleDarkSolar; +import tombenpotter.emt.common.tile.solars.earth.TileEntityDoubleEarthSolar; +import tombenpotter.emt.common.tile.solars.earth.TileEntityEarthSolar; +import tombenpotter.emt.common.tile.solars.earth.TileEntityTripleEarthSolar; +import tombenpotter.emt.common.tile.solars.fire.TileEntityDoubleFireSolar; +import tombenpotter.emt.common.tile.solars.fire.TileEntityFireSolar; +import tombenpotter.emt.common.tile.solars.fire.TileEntityTripleFireSolar; +import tombenpotter.emt.common.tile.solars.order.TileEntityDoubleOrderSolar; +import tombenpotter.emt.common.tile.solars.order.TileEntityOrderSolar; +import tombenpotter.emt.common.tile.solars.order.TileEntityTripleOrderSolar; +import tombenpotter.emt.common.tile.solars.water.TileEntityDoubleWaterSolar; +import tombenpotter.emt.common.tile.solars.water.TileEntityTripleWaterSolar; +import tombenpotter.emt.common.tile.solars.water.TileEntityWaterSolar; import cpw.mods.fml.common.registry.GameRegistry; -import tombenpotter.emt.common.modules.ic2.tile.generators.*; -import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityAirSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityDoubleAirSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityTripleAirSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityCompressedSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityDoubleCompressedSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityTripleCompressedSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.dark.TileEntityDarkSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.dark.TileEntityDoubleDarkSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.dark.TileEntityTripleDarkSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityDoubleEarthSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityEarthSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityTripleEarthSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.fire.TileEntityDoubleFireSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.fire.TileEntityFireSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.fire.TileEntityTripleFireSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.order.TileEntityDoubleOrderSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.order.TileEntityOrderSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.order.TileEntityTripleOrderSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.water.TileEntityDoubleWaterSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.water.TileEntityTripleWaterSolar; -import tombenpotter.emt.common.modules.ic2.tile.solars.water.TileEntityWaterSolar; -public class IC2TileRegistry { - - public static void registerTEs() { +public class TileRegistry { + public static void registerTiles() { + GameRegistry.registerTileEntity(TileEntityPortableNode.class, "tileentityportablenode"); GameRegistry.registerTileEntity(TileEntityPotentiaGenerator.class, "tileentitypotentiagenerator"); GameRegistry.registerTileEntity(TileEntityIgnisGenerator.class, "tileentityignisgenerator"); GameRegistry.registerTileEntity(TileEntityAuramGenerator.class, "tileentityauramgenerator"); diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityAerGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAerGenerator.java similarity index 82% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityAerGenerator.java rename to src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAerGenerator.java index e6f9231..8ee0ae0 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityAerGenerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAerGenerator.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.ic2.tile.generators; +package tombenpotter.emt.common.tile.generators; import thaumcraft.api.aspects.Aspect; import tombenpotter.emt.common.util.EssentiasOutputs; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityArborGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityArborGenerator.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityArborGenerator.java rename to src/main/java/tombenpotter/emt/common/tile/generators/TileEntityArborGenerator.java index ce3d023..934d44d 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityArborGenerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityArborGenerator.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.generators; +package tombenpotter.emt.common.tile.generators; import thaumcraft.api.aspects.Aspect; import tombenpotter.emt.common.util.EssentiasOutputs; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityAuramGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAuramGenerator.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityAuramGenerator.java rename to src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAuramGenerator.java index 34de2e9..88e0c34 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityAuramGenerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAuramGenerator.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.generators; +package tombenpotter.emt.common.tile.generators; import thaumcraft.api.aspects.Aspect; import tombenpotter.emt.common.util.EssentiasOutputs; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityBaseGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityBaseGenerator.java similarity index 92% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityBaseGenerator.java rename to src/main/java/tombenpotter/emt/common/tile/generators/TileEntityBaseGenerator.java index 52b192d..dd4e5ca 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityBaseGenerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityBaseGenerator.java @@ -1,11 +1,11 @@ -package tombenpotter.emt.common.modules.ic2.tile.generators; +package tombenpotter.emt.common.tile.generators; import ic2.api.energy.prefab.BasicSource; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.lib.events.EssentiaHandler; -import tombenpotter.emt.common.modules.base.tile.TileEntityEMT; +import tombenpotter.emt.common.tile.TileEntityEMT; import tombenpotter.emt.common.util.ConfigHandler; public abstract class TileEntityBaseGenerator extends TileEntityEMT { diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityEssentiaGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityEssentiaGenerator.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityEssentiaGenerator.java rename to src/main/java/tombenpotter/emt/common/tile/generators/TileEntityEssentiaGenerator.java index 604d0a2..54fc0fa 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityEssentiaGenerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityEssentiaGenerator.java @@ -1,11 +1,11 @@ -package tombenpotter.emt.common.modules.ic2.tile.generators; +package tombenpotter.emt.common.tile.generators; import ic2.api.energy.prefab.BasicSource; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.lib.events.EssentiaHandler; -import tombenpotter.emt.common.modules.base.tile.TileEntityEMT; +import tombenpotter.emt.common.tile.TileEntityEMT; import tombenpotter.emt.common.util.ConfigHandler; import tombenpotter.emt.common.util.EssentiasOutputs; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityIgnisGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityIgnisGenerator.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityIgnisGenerator.java rename to src/main/java/tombenpotter/emt/common/tile/generators/TileEntityIgnisGenerator.java index bbd52c8..985db52 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityIgnisGenerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityIgnisGenerator.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.generators; +package tombenpotter.emt.common.tile.generators; import thaumcraft.api.aspects.Aspect; import tombenpotter.emt.common.util.EssentiasOutputs; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityPotentiaGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityPotentiaGenerator.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityPotentiaGenerator.java rename to src/main/java/tombenpotter/emt/common/tile/generators/TileEntityPotentiaGenerator.java index a047324..9ed3f2c 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityPotentiaGenerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityPotentiaGenerator.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.generators; +package tombenpotter.emt.common.tile.generators; import thaumcraft.api.aspects.Aspect; import tombenpotter.emt.common.util.EssentiasOutputs; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/TileEntitySolarBase.java b/src/main/java/tombenpotter/emt/common/tile/solars/TileEntitySolarBase.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/TileEntitySolarBase.java rename to src/main/java/tombenpotter/emt/common/tile/solars/TileEntitySolarBase.java index 0d2ef1e..15bfc46 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/TileEntitySolarBase.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/TileEntitySolarBase.java @@ -1,10 +1,10 @@ -package tombenpotter.emt.common.modules.ic2.tile.solars; +package tombenpotter.emt.common.tile.solars; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import tombenpotter.emt.common.modules.base.tile.TileEntityEMT; +import tombenpotter.emt.common.tile.TileEntityEMT; import java.util.Random; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java similarity index 82% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityAirSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java index db2a7f1..c48017d 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.air; +package tombenpotter.emt.common.tile.solars.air; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityAirSolar extends TileEntitySolarBase { @@ -35,6 +35,6 @@ public class TileEntityAirSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 15); + return new ItemStack(BlockRegistry.emtSolars, 1, 15); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityDoubleAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java similarity index 84% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityDoubleAirSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java index e251c65..a3f687c 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityDoubleAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java @@ -10,11 +10,11 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.air; +package tombenpotter.emt.common.tile.solars.air; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleAirSolar extends TileEntityAirSolar { @@ -25,6 +25,6 @@ public class TileEntityDoubleAirSolar extends TileEntityAirSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars2, 1, 0); + return new ItemStack(BlockRegistry.emtSolars2, 1, 0); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityTripleAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java similarity index 84% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityTripleAirSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java index e055998..2c61590 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityTripleAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java @@ -10,11 +10,11 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.air; +package tombenpotter.emt.common.tile.solars.air; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleAirSolar extends TileEntityAirSolar { @@ -25,6 +25,6 @@ public class TileEntityTripleAirSolar extends TileEntityAirSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars2, 1, 1); + return new ItemStack(BlockRegistry.emtSolars2, 1, 1); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityCompressedSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java similarity index 79% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityCompressedSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java index abac9f1..ae5be2b 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.compressed; +package tombenpotter.emt.common.tile.solars.compressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityCompressedSolar extends TileEntitySolarBase { @@ -26,6 +26,6 @@ public class TileEntityCompressedSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 0); + return new ItemStack(BlockRegistry.emtSolars, 1, 0); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityDoubleCompressedSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java similarity index 79% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityDoubleCompressedSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java index 667dc0a..9fd7e32 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityDoubleCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.compressed; +package tombenpotter.emt.common.tile.solars.compressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleCompressedSolar extends TileEntitySolarBase { @@ -26,6 +26,6 @@ public class TileEntityDoubleCompressedSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 1); + return new ItemStack(BlockRegistry.emtSolars, 1, 1); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityTripleCompressedSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java similarity index 79% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityTripleCompressedSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java index 6951560..153c6fe 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityTripleCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.compressed; +package tombenpotter.emt.common.tile.solars.compressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleCompressedSolar extends TileEntitySolarBase { @@ -26,6 +26,6 @@ public class TileEntityTripleCompressedSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 2); + return new ItemStack(BlockRegistry.emtSolars, 1, 2); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityDarkSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java similarity index 82% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityDarkSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java index d0f7e87..7020c4e 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.dark; +package tombenpotter.emt.common.tile.solars.dark; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDarkSolar extends TileEntitySolarBase { @@ -33,6 +33,6 @@ public class TileEntityDarkSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 6); + return new ItemStack(BlockRegistry.emtSolars, 1, 6); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityDoubleDarkSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java similarity index 84% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityDoubleDarkSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java index 71da59d..bb09fb7 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityDoubleDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java @@ -10,11 +10,11 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.dark; +package tombenpotter.emt.common.tile.solars.dark; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleDarkSolar extends TileEntityDarkSolar { @@ -25,6 +25,6 @@ public class TileEntityDoubleDarkSolar extends TileEntityDarkSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 7); + return new ItemStack(BlockRegistry.emtSolars, 1, 7); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityTripleDarkSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java similarity index 84% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityTripleDarkSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java index c3d0953..459da91 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityTripleDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java @@ -10,11 +10,11 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.dark; +package tombenpotter.emt.common.tile.solars.dark; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleDarkSolar extends TileEntityDarkSolar { @@ -25,6 +25,6 @@ public class TileEntityTripleDarkSolar extends TileEntityDarkSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 8); + return new ItemStack(BlockRegistry.emtSolars, 1, 8); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityDoubleEarthSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java similarity index 84% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityDoubleEarthSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java index 5a30c3d..2f0cef9 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityDoubleEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java @@ -10,11 +10,11 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.earth; +package tombenpotter.emt.common.tile.solars.earth; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleEarthSolar extends TileEntityEarthSolar { @@ -25,6 +25,6 @@ public class TileEntityDoubleEarthSolar extends TileEntityEarthSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars2, 1, 3); + return new ItemStack(BlockRegistry.emtSolars2, 1, 3); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityEarthSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java similarity index 82% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityEarthSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java index c266aeb..3aab9de 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.earth; +package tombenpotter.emt.common.tile.solars.earth; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityEarthSolar extends TileEntitySolarBase { @@ -35,6 +35,6 @@ public class TileEntityEarthSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars2, 1, 2); + return new ItemStack(BlockRegistry.emtSolars2, 1, 2); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityTripleEarthSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java similarity index 84% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityTripleEarthSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java index bf7993e..4499b3c 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityTripleEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java @@ -10,11 +10,11 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.earth; +package tombenpotter.emt.common.tile.solars.earth; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleEarthSolar extends TileEntityEarthSolar { @@ -25,6 +25,6 @@ public class TileEntityTripleEarthSolar extends TileEntityEarthSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars2, 1, 4); + return new ItemStack(BlockRegistry.emtSolars2, 1, 4); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityDoubleFireSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java similarity index 84% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityDoubleFireSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java index f6e57dd..dff97e1 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityDoubleFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java @@ -10,11 +10,11 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.fire; +package tombenpotter.emt.common.tile.solars.fire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleFireSolar extends TileEntityFireSolar { @@ -25,6 +25,6 @@ public class TileEntityDoubleFireSolar extends TileEntityFireSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 13); + return new ItemStack(BlockRegistry.emtSolars, 1, 13); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityFireSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java similarity index 85% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityFireSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java index 47ec993..1912151 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.fire; +package tombenpotter.emt.common.tile.solars.fire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityFireSolar extends TileEntitySolarBase { @@ -43,6 +43,6 @@ public class TileEntityFireSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 12); + return new ItemStack(BlockRegistry.emtSolars, 1, 12); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityTripleFireSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java similarity index 84% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityTripleFireSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java index 5646d1d..23f8c97 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityTripleFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java @@ -10,11 +10,11 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.fire; +package tombenpotter.emt.common.tile.solars.fire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleFireSolar extends TileEntityFireSolar { @@ -25,6 +25,6 @@ public class TileEntityTripleFireSolar extends TileEntityFireSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 14); + return new ItemStack(BlockRegistry.emtSolars, 1, 14); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityDoubleOrderSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java similarity index 84% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityDoubleOrderSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java index 50a8f77..fa204cf 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityDoubleOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java @@ -10,11 +10,11 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.order; +package tombenpotter.emt.common.tile.solars.order; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleOrderSolar extends TileEntityOrderSolar { @@ -25,6 +25,6 @@ public class TileEntityDoubleOrderSolar extends TileEntityOrderSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 10); + return new ItemStack(BlockRegistry.emtSolars, 1, 10); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityOrderSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java similarity index 81% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityOrderSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java index 7e28118..4a84d04 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.order; +package tombenpotter.emt.common.tile.solars.order; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityOrderSolar extends TileEntitySolarBase { @@ -33,6 +33,6 @@ public class TileEntityOrderSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 9); + return new ItemStack(BlockRegistry.emtSolars, 1, 9); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityTripleOrderSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java similarity index 84% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityTripleOrderSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java index 8fa8405..12f9e3f 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityTripleOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java @@ -10,11 +10,11 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.order; +package tombenpotter.emt.common.tile.solars.order; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleOrderSolar extends TileEntityOrderSolar { @@ -25,6 +25,6 @@ public class TileEntityTripleOrderSolar extends TileEntityOrderSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 11); + return new ItemStack(BlockRegistry.emtSolars, 1, 11); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityDoubleWaterSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java similarity index 84% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityDoubleWaterSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java index a31427c..a24effa 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityDoubleWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java @@ -10,11 +10,11 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.water; +package tombenpotter.emt.common.tile.solars.water; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleWaterSolar extends TileEntityWaterSolar { @@ -25,6 +25,6 @@ public class TileEntityDoubleWaterSolar extends TileEntityWaterSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 4); + return new ItemStack(BlockRegistry.emtSolars, 1, 4); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityTripleWaterSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java similarity index 84% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityTripleWaterSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java index 47e9cf2..075979f 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityTripleWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java @@ -10,11 +10,11 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.water; +package tombenpotter.emt.common.tile.solars.water; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleWaterSolar extends TileEntityWaterSolar { @@ -25,6 +25,6 @@ public class TileEntityTripleWaterSolar extends TileEntityWaterSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 5); + return new ItemStack(BlockRegistry.emtSolars, 1, 5); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityWaterSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java similarity index 83% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityWaterSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java index 25f2ff3..ce62a7f 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.modules.ic2.tile.solars.water; +package tombenpotter.emt.common.tile.solars.water; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityWaterSolar extends TileEntitySolarBase { @@ -33,6 +33,6 @@ public class TileEntityWaterSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2BlockRegistry.emtSolars, 1, 3); + return new ItemStack(BlockRegistry.emtSolars, 1, 3); } } diff --git a/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java b/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java index b373616..68995f2 100644 --- a/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java +++ b/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java @@ -15,7 +15,7 @@ package tombenpotter.emt.common.util; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; +import tombenpotter.emt.common.items.ItemRegistry; public class CreativeTabEMT extends CreativeTabs { @@ -26,7 +26,7 @@ public class CreativeTabEMT extends CreativeTabs { @Override public ItemStack getIconItemStack() { - return new ItemStack(IC2ItemRegistry.thorHammer); + return new ItemStack(ItemRegistry.thorHammer); } @Override diff --git a/src/main/java/tombenpotter/emt/common/util/DungeonChestGenerator.java b/src/main/java/tombenpotter/emt/common/util/DungeonChestGenerator.java index 1ff98e0..40fe7b2 100644 --- a/src/main/java/tombenpotter/emt/common/util/DungeonChestGenerator.java +++ b/src/main/java/tombenpotter/emt/common/util/DungeonChestGenerator.java @@ -3,16 +3,16 @@ package tombenpotter.emt.common.util; import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; -import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; +import tombenpotter.emt.common.items.ItemRegistry; public class DungeonChestGenerator { public static void generateLoot() { if (!ConfigHandler.thorHammerResearch) { - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(IC2ItemRegistry.taintedThorHammer), 0, 1, ConfigHandler.chanceTaintedMjolnir)); + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ItemRegistry.taintedThorHammer), 0, 1, ConfigHandler.chanceTaintedMjolnir)); } if (!ConfigHandler.oneRingSpawn) { - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(IC2ItemRegistry.emtBauble, 1, 2), 0, 1, ConfigHandler.chanceOneRing)); + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ItemRegistry.emtBauble, 1, 2), 0, 1, ConfigHandler.chanceOneRing)); } } } diff --git a/src/main/java/tombenpotter/emt/common/util/EntityEventHandler.java b/src/main/java/tombenpotter/emt/common/util/EntityEventHandler.java index efb6b65..092d6cc 100644 --- a/src/main/java/tombenpotter/emt/common/util/EntityEventHandler.java +++ b/src/main/java/tombenpotter/emt/common/util/EntityEventHandler.java @@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.event.entity.living.LivingDropsEvent; import thaumcraft.common.entities.monster.EntityTaintChicken; -import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; +import tombenpotter.emt.common.items.ItemRegistry; public class EntityEventHandler { @@ -17,11 +17,11 @@ public class EntityEventHandler { if (event.entityLiving instanceof EntityCreeper) { EntityCreeper creeper = (EntityCreeper) event.entityLiving; if (creeper.getPowered()) { - event.entityLiving.entityDropItem(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 6), 1); + event.entityLiving.entityDropItem(new ItemStack(ItemRegistry.itemEMTItems, 1, 6), 1); } } if (event.entityLiving instanceof EntityTaintChicken) { - event.entityLiving.entityDropItem(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 14), 1); + event.entityLiving.entityDropItem(new ItemStack(ItemRegistry.itemEMTItems, 1, 14), 1); } } } diff --git a/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java index ee76e26..2d1b433 100644 --- a/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java +++ b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java @@ -23,8 +23,8 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent; import thaumcraft.common.entities.monster.EntityTaintChicken; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; -import tombenpotter.emt.common.modules.base.items.ItemShardCarver; +import tombenpotter.emt.common.items.ItemRegistry; +import tombenpotter.emt.common.items.ItemShardCarver; public class EventHandlerEMT { @@ -34,19 +34,19 @@ public class EventHandlerEMT { if (event.entityLiving instanceof EntityCreeper) { EntityCreeper creeper = (EntityCreeper) event.entityLiving; if (creeper.getPowered()) { - event.drops.add(new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 6))); + event.drops.add(new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, new ItemStack(ItemRegistry.itemEMTItems, 1, 6))); } } if (event.entityLiving instanceof EntityTaintChicken) { - event.drops.add(new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 14))); + event.drops.add(new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, new ItemStack(ItemRegistry.itemEMTItems, 1, 14))); } } if (event.entityLiving instanceof EntityCreeper) { - event.entityLiving.entityDropItem(new ItemStack(IC2ItemRegistry.itemEMTItems, 6), 1); + event.entityLiving.entityDropItem(new ItemStack(ItemRegistry.itemEMTItems, 6), 1); } if (event.entityLiving instanceof EntityTaintChicken) { - event.entityLiving.entityDropItem(new ItemStack(IC2ItemRegistry.itemEMTItems, 14), 1); + event.entityLiving.entityDropItem(new ItemStack(ItemRegistry.itemEMTItems, 14), 1); } } diff --git a/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java b/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java index 8291ee7..8e48abd 100644 --- a/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java +++ b/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java @@ -1,11 +1,11 @@ package tombenpotter.emt.common.util; -import tombenpotter.emt.common.modules.ic2.IC2Research; +import tombenpotter.emt.EMTResearch; public class RegistryHandler { public static void registerIc2PostRegistrys() { - IC2Research.addResearchTab(); - IC2Research.addResearch(); + EMTResearch.addResearchTab(); + EMTResearch.addResearch(); } } diff --git a/src/main/java/tombenpotter/emt/proxies/ClientProxy.java b/src/main/java/tombenpotter/emt/proxies/ClientProxy.java index 33bd21e..fc76928 100644 --- a/src/main/java/tombenpotter/emt/proxies/ClientProxy.java +++ b/src/main/java/tombenpotter/emt/proxies/ClientProxy.java @@ -15,8 +15,8 @@ package tombenpotter.emt.proxies; import cpw.mods.fml.client.registry.RenderingRegistry; import tombenpotter.emt.client.renderer.RenderArcher; import tombenpotter.emt.client.renderer.RenderLaser; -import tombenpotter.emt.common.modules.base.entities.EntityArcher; -import tombenpotter.emt.common.modules.base.entities.EntityLaser; +import tombenpotter.emt.common.entities.EntityArcher; +import tombenpotter.emt.common.entities.EntityLaser; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/tombenpotter/emt/proxies/CommonProxy.java b/src/main/java/tombenpotter/emt/proxies/CommonProxy.java index ebc0d98..dc1293d 100644 --- a/src/main/java/tombenpotter/emt/proxies/CommonProxy.java +++ b/src/main/java/tombenpotter/emt/proxies/CommonProxy.java @@ -20,8 +20,8 @@ import tombenpotter.emt.client.gui.GuiEtherealMacerator; import tombenpotter.emt.client.gui.GuiIndustrialWandRecharger; import tombenpotter.emt.client.gui.container.ContainerEtheralMacerator; import tombenpotter.emt.client.gui.container.ContainerIndustrialWandRecharge; -import tombenpotter.emt.common.modules.ic2.tile.TileEntityEtherealMacerator; -import tombenpotter.emt.common.modules.ic2.tile.TileEntityIndustrialWandRecharge; +import tombenpotter.emt.common.tile.TileEntityEtherealMacerator; +import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge; public class CommonProxy implements IGuiHandler {